Author: sthibault Date: 2011-06-30 17:56:58 +0000 (Thu, 30 Jun 2011) New Revision: 4774
Modified: glibc-package/trunk/debian/patches/hurd-i386/submitted-ldsodefs.h.diff Log: Update patches/hurd-i386/submitted-ldsodefs.h.diff according to binutils decision Modified: glibc-package/trunk/debian/patches/hurd-i386/submitted-ldsodefs.h.diff =================================================================== --- glibc-package/trunk/debian/patches/hurd-i386/submitted-ldsodefs.h.diff 2011-06-30 07:53:57 UTC (rev 4773) +++ glibc-package/trunk/debian/patches/hurd-i386/submitted-ldsodefs.h.diff 2011-06-30 17:56:58 UTC (rev 4774) @@ -1,13 +1,12 @@ http://sourceware.org/ml/libc-alpha/2011-06/msg00087.html -binutils started emitting ELF files with ELFOSABI_LINUX due to GNU-specific -ELF extensions. We need to accept loading such binaries on hurd-i386. This -does it for the binutils-defined ELFOSABI_HURD, but maybe we will just rename -ELFOSABI_LINUX into ELFOSABI_GNU actually, so this is disabled for now. +binutils started emitting ELF files with ELFOSABI_GNU due to GNU-specific +ELF extensions. We need to accept loading such binaries on hurd-i386 too. 2011-06-19 Samuel Thibault <samuel.thiba...@ens-lyon.org> - * elf/elf.h (ELFOSABI_HURD): Define macro. + * elf/elf.h (ELFOSABI_GNU): Define macro. + (ELFOSABI_LINUX): Comment that it is just an alias for ELFOSABI_GNU. * sysdeps/mach/hurd/ldsodefs.h: New file, defines VALID_ELF_HEADER, VALID_ELF_OSABI, VALID_ELF_ABIVERSION, MORE_ELF_HEADER_DATA, declares _dl_non_dynamic_init. @@ -16,14 +15,16 @@ * sysdeps/mach/hurd/i386/init-first.c (_dl_non_dynamic_init): Likewise. diff --git a/elf/elf.h b/elf/elf.h -index acb7762..4ef9bb6 100644 +index acb7762..cad15cd 100644 --- a/elf/elf.h +++ b/elf/elf.h -@@ -143,6 +143,7 @@ typedef struct +@@ -142,7 +142,8 @@ typedef struct + #define ELFOSABI_SYSV 0 /* Alias. */ #define ELFOSABI_HPUX 1 /* HP-UX */ #define ELFOSABI_NETBSD 2 /* NetBSD. */ - #define ELFOSABI_LINUX 3 /* Linux. */ -+#define ELFOSABI_HURD 4 /* GNU/Hurd. */ +-#define ELFOSABI_LINUX 3 /* Linux. */ ++#define ELFOSABI_GNU 3 /* GNU. */ ++#define ELFOSABI_LINUX 3 /* Alias for ELFOSABI_GNU. */ #define ELFOSABI_SOLARIS 6 /* Sun Solaris. */ #define ELFOSABI_AIX 7 /* IBM AIX. */ #define ELFOSABI_IRIX 8 /* SGI Irix. */ @@ -81,9 +82,9 @@ +#define VALID_ELF_HEADER(hdr,exp,size) (memcmp (hdr, exp, size) == 0 \ + || memcmp (hdr, expected2, size) == 0) +#define VALID_ELF_OSABI(osabi) (osabi == ELFOSABI_SYSV \ -+ || osabi == ELFOSABI_HURD) ++ || osabi == ELFOSABI_GNU) +#define VALID_ELF_ABIVERSION(osabi,ver) \ -+ (ver == 0 || (osabi == ELFOSABI_HURD && ver < LIBC_ABI_MAX)) ++ (ver == 0 || (osabi == ELFOSABI_GNU && ver < LIBC_ABI_MAX)) +#define MORE_ELF_HEADER_DATA \ + static const unsigned char expected2[EI_PAD] = \ + { \ @@ -94,7 +95,7 @@ + [EI_CLASS] = ELFW(CLASS), \ + [EI_DATA] = byteorder, \ + [EI_VERSION] = EV_CURRENT, \ -+ [EI_OSABI] = ELFOSABI_HURD \ ++ [EI_OSABI] = ELFOSABI_GNU \ + } + +#endif /* ldsodefs.h */ -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1qclu2-0005zj...@vasks.debian.org
