Changeset 96367 in vbox

Timestamp:

Aug 19, 2022 10:12:14 PM (2 years ago)

Author:

vboxsync

Message:

bldprogs/genalias,IPRT/Makefile.kmk: Adjustments for targeting win.x86 on a win.amd64 host. bugref:10261

Location:

trunk/src

Files:

• VBox/Runtime/Makefile.kmk (modified) (1 diff)
• bldprogs/genalias.cpp (modified) (6 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1744 +1744 @@
         $$(call MSG_GENERATE,$(target),$$@,)
         $$(QUIET)$$(MKDIR) -p -- "$$($(target)_0_OUTDIR)/genalias/"
-        $$(QUIET)$$(VBOX_GENALIAS) -f $$(if-expr "$(bld_trg)" == "win",coff,$$(if-expr "$(bld_trg)" == "darwin",macho,omf)) \
+        $$(QUIET)$$(VBOX_GENALIAS) -f $$(if-expr "$(bld_trg)" == "win",coff.$(bld_trg_arch),$$(if-expr "$(bld_trg)" == "darwin",macho,omf)) \
                 -D "$$($(target)_0_OUTDIR)/genalias/" $$($(target)_2_VBOX_NOCRT_ALIASES) \
                 $$($(target)_VBOX_NOCRT_ALIASES) \

trunk/src/bldprogs/genalias.cpp

@@ -29 +29 @@
 #include <assert.h>
 
-#define GENALIAS_UNDERSCORED 0
+
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
+#if defined(RT_OS_DARWIN) || (defined(RT_ARCH_X86) && (defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)))
+# define GENALIAS_UNDERSCORED 1
+#else
+# define GENALIAS_UNDERSCORED 0
+#endif
 
 
@@ -128 +136 @@
 }
 
-static int WriteAliasObjectCOFF(FILE *pOutput, const char *pszAlias, const char *pszReal)
+static int WriteAliasObjectCOFF(FILE *pOutput, const char *pszAlias, const char *pszReal, bool fUnderscored)
 {
 #pragma pack(1)
@@ -143 +151 @@
     struct CoffShdr
     {
-        char    Name[8];
+        char        Name[8];
         uint32_t    VirtualSize;
         uint32_t    VirtualAddress;
@@ -222 +230 @@
     /* The alias symbol. */
     memset(&Sym, 0, sizeof(Sym));
-    Sym.u.s.Offset = GENALIAS_UNDERSCORED + cchReal + 1 + 4;
+    Sym.u.s.Offset = fUnderscored + cchReal + 1 + 4;
     Sym.SectionNumber = IMAGE_SYM_UNDEFINED;
     Sym.Type = IMAGE_SYM_TYPE_NULL;
@@ -238 +246 @@
 
     /* the string table. */
-    u32 = 4 + cchReal + 1 + cchAlias + 1 + GENALIAS_UNDERSCORED * 2;
+    u32 = 4 + cchReal + 1 + cchAlias + 1 + fUnderscored * 2;
     if (fwrite(&u32, 4, 1, pOutput) != 1)
         return -2;
-#if GENALIAS_UNDERSCORED
-    if (fputc('_', pOutput) == EOF)
-        return -2;
-#endif
+    if (fUnderscored)
+        if (fputc('_', pOutput) == EOF)
+            return -2;
     if (fwrite(pszReal, cchReal + 1, 1, pOutput) != 1)
         return -2;
-#if GENALIAS_UNDERSCORED
-    if (fputc('_', pOutput) == EOF)
-        return -2;
-#endif
+    if (fUnderscored)
+        if (fputc('_', pOutput) == EOF)
+            return -2;
     if (fwrite(pszAlias, cchAlias + 1, 1, pOutput) != 1)
         return -2;
     return 0;
 }
+
+static int WriteAliasObjectTargetCOFF(FILE *pOutput, const char *pszAlias, const char *pszReal)
+{
+    return WriteAliasObjectCOFF(pOutput, pszAlias, pszReal, GENALIAS_UNDERSCORED);
+}
+
+static int WriteAliasObjectX86COFF(FILE *pOutput, const char *pszAlias, const char *pszReal)
+{
+    return WriteAliasObjectCOFF(pOutput, pszAlias, pszReal, true  /*fUnderscored*/);
+}
+
+static int WriteAliasObjectAmd64COFF(FILE *pOutput, const char *pszAlias, const char *pszReal)
+{
+    return WriteAliasObjectCOFF(pOutput, pszAlias, pszReal, false /*fUnderscored*/);
+}
+
 
 static int WriteAliasObjectELF(FILE *pOutput, const char *pszAlias, const char *pszReal)
@@ -388 +410 @@
         pfnWriter = WriteAliasObjectAOUT;
     else if (!strcmp(argv[2], "coff"))
-        pfnWriter = WriteAliasObjectCOFF;
+        pfnWriter = WriteAliasObjectTargetCOFF;
+    else if (!strcmp(argv[2], "coff.x86"))
+        pfnWriter = WriteAliasObjectX86COFF;
+    else if (!strcmp(argv[2], "coff.amd64"))
+        pfnWriter = WriteAliasObjectAmd64COFF;
     else if (!strcmp(argv[2], "elf"))
         pfnWriter = WriteAliasObjectELF;