Ticket #4828: Linker.c.diff

tmp/

@@ -99 +99 @@
 #elif defined(darwin_HOST_OS)
 #  define OBJFORMAT_MACHO
 #  include <regex.h>
+#  include <mach/machine.h>
+#  include <mach-o/fat.h>
 #  include <mach-o/loader.h>
 #  include <mach-o/nlist.h>
 #  include <mach-o/reloc.h>
@@ -1690 +1692 @@
     char *fileName;
     size_t fileNameSize;
     int isObject, isGnuIndex;
-    char tmp[12];
+    char tmp[20];
     char *gnuFileIndex;
     int gnuFileIndexSize;
-#if !defined(USE_MMAP) && defined(darwin_HOST_OS)
+#if defined(darwin_HOST_OS)
+    int i;
+    uint32_t nfat_arch, nfat_offset, cputype, cpusubtype;
+#if !defined(USE_MMAP)
     int misalignment;
 #endif
+#endif
 
     IF_DEBUG(linker, debugBelch("loadArchive: Loading archive `%s'\n", path));
 
@@ -1709 +1715 @@
     if (!f)
         barf("loadObj: can't read `%s'", path);
 
+    /* Check if this is an archive by looking for the magic "!<arch>\n"
+     * string.  Usually, if this fails, we barf and quit.  On Darwin however,
+     * we may have a fat archive, which contains archives for more than
+     * one architecture.  Fat archives start with the magic number 0xcafebabe,
+     * always stored big endian.  If we find a fat_header, we scan through
+     * the fat_arch structs, searching through for one for our host
+     * architecture.  If a matching struct is found, we read the offset
+     * of our archive data (nfat_offset) and seek forward nfat_offset bytes
+     * from the start of the file.
+     *
+     * A subtlety is that all of the members of the fat_header and fat_arch
+     * structs are stored big endian, so we need to call byte order
+     * conversion functions.
+     *
+     * If we find the appropriate architecture in a fat archive, we gobble
+     * its magic "!<arch>\n" string and continue processing just as if
+     * we had a single architecture archive.
+     */
+
     n = fread ( tmp, 1, 8, f );
-    if (strncmp(tmp, "!<arch>\n", 8) != 0)
-        barf("loadArchive: Not an archive: `%s'", path);
+    if (strncmp(tmp, "!<arch>\n", 8) != 0) {
+
+#if defined(darwin_HOST_OS)
+        /* Not a standard archive, look for a fat archive magic number: */
+#if defined(i386_HOST_ARCH) || defined(x86_64_HOST_ARCH)
+        if ((*(uint32_t *)tmp) == FAT_CIGAM) {
+            nfat_arch = ntohl(*(uint32_t *)(tmp + 4));
+            IF_DEBUG(linker, debugBelch("loadArchive: found little endian fat archive containing %d architectures\n", nfat_arch));
+            nfat_offset = 0;
+            
+            for (i = 0; (i < (int)nfat_arch) && (nfat_offset == 0); i++) {
+                /* search for the right x86 arch */
+                n = fread( tmp, 1, 20, f );
+                cputype = ntohl(*(uint32_t *)tmp);
+                cpusubtype = ntohl(*(uint32_t *)(tmp + 4));
+
+#if defined(i386_HOST_ARCH)
+                if (cputype == CPU_TYPE_X86 && cpusubtype == CPU_SUBTYPE_X86_ALL) {
+                        IF_DEBUG(linker, debugBelch("loadArchive: found an x86 (32 bit) archive in a fat archive\n"));                             nfat_offset = ntohl(*(uint32_t *)(tmp + 8));
+                }
+#endif
+
+#if defined(x86_64_HOST_ARCH)
+                if (cputype == CPU_TYPE_X86_64 && cpusubtype == CPU_SUBTYPE_X86_64_ALL) {
+                        IF_DEBUG(linker, debugBelch("loadArchive: found a x86_64 `archive in a fat archive\n"));                                   nfat_offset = ntohl(*(uint32_t *)(tmp + 8));
+                }
+#endif
+            }
+
+            if (nfat_offset == 0) {
+                barf ("loadArchive: searched %d architectures, but no host arch found", nfat_arch);
+            } else {
+                n = fseek( f, nfat_offset, SEEK_SET );
+                n = fread ( tmp, 1, 8, f );
+                if (strncmp(tmp, "!<arch>\n", 8) != 0) {
+                    barf("loadArchive: couldn't find archive in `%s' at offset %d", path, nfat_offset);
+                }
+            }
+
+        }
+        else
+#endif
+
+#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
+        if ((*(uint32_t *)tmp) == FAT_MAGIC) {
+            nfat_arch = ntohl(*(uint32_t *)(tmp + 4));
+            IF_DEBUG(linker, debugBelch("loadArchive: found big endian fat archive containing %d architectures\n", nfat_arch));
+            nfat_offset = 0;
+
+            for (i = 0; (i < (int)nfat_arch) && (nfat_offset == 0); i++) {
+                /* search for the right ppc arch */
+                n = fread( tmp, 1, 20, f );
+                cputype = ntohl(*(uint32_t *)tmp);
+                cpusubtype = ntohl(*(uint32_t *)(tmp + 4));
+
+#if defined(powerpc_HOST_ARCH)
+                if (cputype == CPU_TYPE_POWERPC && cpusubtype == CPU_SUBTYPE_POWERPC_ALL) {
+                    IF_DEBUG(linker, debugBelch("loadArchive: found a PowerPC 32 bit archive in a fat archive\n"));
+                    nfat_offset = ntohl(*(uint32_t *)(tmp + 8));
+                }
+#endif
+
+#if defined(powerpc64_HOST_ARCH)
+                if (cputype == CPU_TYPE_POWERPC64 && cpusubtype == CPU_SUBTYPE_POWERPC_ALL) {
+                    IF_DEBUG(linker, debugBelch("loadArchive: found a PowerPC 64 bit archive in a fat archive\n"));
+                    nfat_offset = ntohl(*(uint32_t *)(tmp + 8));
+                }
+#endif
+            }
+
+            if (nfat_offset == 0) {
+                barf ("loadArchive: searched %d architectures, but no host arch found", nfat_arch);
+            } else {
+                n = fseek( f, nfat_offset, SEEK_SET );
+                n = fread ( tmp, 1, 8, f );
+                if (strncmp(tmp, "!<arch>\n", 8) != 0) {
+                    barf("loadArchive: couldn't find archive in `%s' at offset %d", path, nfat_offset);
+                }
+            }
+        }
+        else
+#endif
+#endif
+                barf("loadArchive: Not an archive: `%s'", path);
+    }
 
     while(1) {
         n = fread ( fileName, 1, 16, f );
@@ -4650 +4758 @@
         }
 
         IF_DEBUG(linker,
-                 debugBelch("relocateSection: length = %d, thing = %d, baseValue = %p\n",
-                            reloc->r_length, thing, baseValue));
+                 debugBelch("relocateSection: length = %d, thing = 0x%lx, baseValue = %p\n",
+                            reloc->r_length, (unsigned long)thing, (void *)baseValue));
 
         if (type == X86_64_RELOC_GOT
            || type == X86_64_RELOC_GOT_LOAD)
@@ -4674 +4782 @@
             IF_DEBUG(linker, debugBelch("               : type  = %d\n", symbol->n_type));
             IF_DEBUG(linker, debugBelch("               : sect  = %d\n", symbol->n_sect));
             IF_DEBUG(linker, debugBelch("               : desc  = %d\n", symbol->n_desc));
-            IF_DEBUG(linker, debugBelch("               : value = %d\n", symbol->n_value));
+            IF_DEBUG(linker, debugBelch("               : value = %p\n", (void *)symbol->n_value));
             if ((symbol->n_type & N_TYPE) == N_SECT) {
                 value = relocateAddress(oc, nSections, sections,
                                         symbol->n_value);
-                IF_DEBUG(linker, debugBelch("relocateSection, defined external symbol %s, relocated address %p\n", nm, value));
+                IF_DEBUG(linker, debugBelch("relocateSection, defined external symbol %s, relocated address %p\n", nm, (void *)value));
             }
             else {
                 value = (uint64_t) lookupSymbol(nm);
-                IF_DEBUG(linker, debugBelch("relocateSection: external symbol %s, address %p\n", nm, value));
+                IF_DEBUG(linker, debugBelch("relocateSection: external symbol %s, address %p\n", nm, (void *)value));
             }
         }
         else
@@ -4692 +4800 @@
                   + (uint64_t) image;
         }
       
-        IF_DEBUG(linker, debugBelch("relocateSection: value = %p\n", value));
+        IF_DEBUG(linker, debugBelch("relocateSection: value = %p\n", (void *)value));
 
         if (type == X86_64_RELOC_BRANCH)
         {