1.1 --- a/binutils/binutils.patch Tue Jul 31 09:41:21 2012 +0200
1.2 +++ b/binutils/binutils.patch Tue Jul 31 10:02:47 2012 +0200
1.3 @@ -8,9 +8,9 @@
1.4 linker under Solaris 10/amd64.
1.5
1.6 Index: include/elf/common.h
1.7 ---- include/elf/common.h.orig 2010-05-18 05:31:06.000000000 +0200
1.8 -+++ include/elf/common.h 2010-12-09 16:48:56.000000000 +0100
1.9 -@@ -474,6 +474,9 @@
1.10 +--- include/elf/common.h.orig 2011-07-22 22:22:36.000000000 +0200
1.11 ++++ include/elf/common.h 2011-11-22 21:09:42.000000000 +0100
1.12 +@@ -475,6 +475,9 @@
1.13 #define SHT_SUNW_verdef 0x6ffffffd /* Versions defined by file */
1.14 #define SHT_SUNW_verneed 0x6ffffffe /* Versions needed by file */
1.15 #define SHT_SUNW_versym 0x6fffffff /* Symbol versions */
1.16 @@ -21,9 +21,9 @@
1.17 #define SHT_GNU_verdef SHT_SUNW_verdef
1.18 #define SHT_GNU_verneed SHT_SUNW_verneed
1.19 Index: bfd/elf.c
1.20 ---- bfd/elf.c.orig 2010-10-29 14:10:24.000000000 +0200
1.21 -+++ bfd/elf.c 2010-12-09 16:48:57.000000000 +0100
1.22 -@@ -1884,6 +1884,11 @@
1.23 +--- bfd/elf.c.orig 2011-07-03 15:37:06.000000000 +0200
1.24 ++++ bfd/elf.c 2011-11-22 21:09:42.000000000 +0100
1.25 +@@ -1907,6 +1907,11 @@
1.26 elf_tdata (abfd)->dynverref_hdr = *hdr;
1.27 return _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex);
1.28
1.29 @@ -35,7 +35,7 @@
1.30 case SHT_SHLIB:
1.31 return TRUE;
1.32
1.33 -@@ -5036,6 +5041,12 @@
1.34 +@@ -5103,6 +5108,12 @@
1.35 else
1.36 i_ehdrp->e_type = ET_REL;
1.37
1.38 @@ -49,16 +49,18 @@
1.39 {
1.40 case bfd_arch_unknown:
1.41 Index: bfd/elf64-x86-64.c
1.42 ---- bfd/elf64-x86-64.c.orig 2010-10-21 14:29:02.000000000 +0200
1.43 -+++ bfd/elf64-x86-64.c 2010-12-09 16:48:57.000000000 +0100
1.44 -@@ -360,7 +360,11 @@
1.45 +--- bfd/elf64-x86-64.c.orig 2011-11-21 10:29:25.000000000 +0100
1.46 ++++ bfd/elf64-x86-64.c 2011-11-22 21:12:41.000000000 +0100
1.47 +@@ -512,8 +512,13 @@
1.48 /* The name of the dynamic interpreter. This is put in the .interp
1.49 section. */
1.50
1.51 +#if defined(OPENPKG_OS_SOLARIS)
1.52 -+#define ELF_DYNAMIC_INTERPRETER "/lib/amd64/ld.so.1"
1.53 ++#define ELF64_DYNAMIC_INTERPRETER "/lib/amd64/ld.so.1"
1.54 ++#define ELF32_DYNAMIC_INTERPRETER "/lib/ld32.so.1"
1.55 +#else
1.56 - #define ELF_DYNAMIC_INTERPRETER "/lib/ld64.so.1"
1.57 + #define ELF64_DYNAMIC_INTERPRETER "/lib/ld64.so.1"
1.58 + #define ELF32_DYNAMIC_INTERPRETER "/lib/ld32.so.1"
1.59 +#endif
1.60
1.61 /* If ELIMINATE_COPY_RELOCS is non-zero, the linker will try to avoid
1.62 @@ -66,30 +68,11 @@
1.63
1.64 -----------------------------------------------------------------------------
1.65
1.66 -Support FreeBSD >= 4.10 by fixing platform detection.
1.67 -
1.68 -Index: bfd/configure
1.69 ---- bfd/configure.orig 2010-12-08 09:37:34.000000000 +0100
1.70 -+++ bfd/configure 2010-12-09 16:48:57.000000000 +0100
1.71 -@@ -13876,6 +13876,10 @@
1.72 - i[3-7]86-*-bsdi)
1.73 - COREFILE=
1.74 - ;;
1.75 -+ i[3456]86-*-freebsd4.1[0-9]*)
1.76 -+ COREFILE=''
1.77 -+ TRAD_HEADER='"hosts/i386bsd.h"'
1.78 -+ ;;
1.79 - i[3-7]86-*-bsd* | i[3-7]86-*-freebsd[123] | i[3-7]86-*-freebsd[123]\.* | i[3-7]86-*-freebsd4\.[01234] | i[3-7]86-*-freebsd4\.[01234]\.* | i[3-7]86-*-freebsd*aout*)
1.80 - COREFILE=trad-core.lo
1.81 - TRAD_HEADER='"hosts/i386bsd.h"'
1.82 -
1.83 ------------------------------------------------------------------------------
1.84 -
1.85 Fight problems with --disable-nls under Solaris
1.86
1.87 Index: gas/asintl.h
1.88 --- gas/asintl.h.orig 2007-07-03 13:01:02.000000000 +0200
1.89 -+++ gas/asintl.h 2010-12-09 16:48:57.000000000 +0100
1.90 ++++ gas/asintl.h 2011-11-22 21:09:42.000000000 +0100
1.91 @@ -20,6 +20,11 @@
1.92 Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
1.93 02110-1301, USA. */
1.94 @@ -103,8 +86,8 @@
1.95 # ifndef ENABLE_NLS
1.96 /* The Solaris version of locale.h always includes libintl.h. If we have
1.97 Index: ld/ld.h
1.98 ---- ld/ld.h.orig 2009-11-26 14:45:25.000000000 +0100
1.99 -+++ ld/ld.h 2010-12-09 16:48:57.000000000 +0100
1.100 +--- ld/ld.h.orig 2011-07-16 09:58:40.000000000 +0200
1.101 ++++ ld/ld.h 2011-11-22 21:09:42.000000000 +0100
1.102 @@ -23,6 +23,11 @@
1.103 #ifndef LD_H
1.104 #define LD_H
1.105 @@ -118,9 +101,9 @@
1.106 #endif
1.107 #ifndef SEEK_CUR
1.108 Index: ld/Makefile.in
1.109 ---- ld/Makefile.in.orig 2010-11-05 11:34:22.000000000 +0100
1.110 -+++ ld/Makefile.in 2010-12-09 16:48:57.000000000 +0100
1.111 -@@ -360,7 +360,7 @@
1.112 +--- ld/Makefile.in.orig 2011-07-22 22:22:37.000000000 +0200
1.113 ++++ ld/Makefile.in 2011-11-22 21:09:42.000000000 +0100
1.114 +@@ -366,7 +366,7 @@
1.115 # We put the scripts in the directory $(scriptdir)/ldscripts.
1.116 # We can't put the scripts in $(datadir) because the SEARCH_DIR
1.117 # directives need to be different for native and cross linkers.
1.118 @@ -136,7 +119,7 @@
1.119
1.120 Index: libiberty/fibheap.c
1.121 --- libiberty/fibheap.c.orig 2009-05-29 05:01:15.000000000 +0200
1.122 -+++ libiberty/fibheap.c 2010-12-09 16:48:57.000000000 +0100
1.123 ++++ libiberty/fibheap.c 2011-11-22 21:09:42.000000000 +0100
1.124 @@ -34,8 +34,11 @@
1.125 #include "libiberty.h"
1.126 #include "fibheap.h"
1.127 @@ -161,9 +144,9 @@
1.128 any problems and this message really confused, just disable it for now.
1.129
1.130 Index: bfd/elf-eh-frame.c
1.131 ---- bfd/elf-eh-frame.c.orig 2010-04-09 16:40:15.000000000 +0200
1.132 -+++ bfd/elf-eh-frame.c 2010-12-09 16:48:57.000000000 +0100
1.133 -@@ -909,9 +909,11 @@
1.134 +--- bfd/elf-eh-frame.c.orig 2011-06-20 15:18:47.000000000 +0200
1.135 ++++ bfd/elf-eh-frame.c 2011-11-22 21:09:42.000000000 +0100
1.136 +@@ -913,9 +913,11 @@
1.137 goto success;
1.138
1.139 free_no_table:
1.140 @@ -175,4 +158,3 @@
1.141 hdr_info->table = FALSE;
1.142 if (sec_info)
1.143 free (sec_info);
1.144 -
