rpms/spu-binutils/devel binutils-2.19.50.0.1-build-id.patch, NONE, 1.1 binutils-2.19.50.0.1-ia64-lib64.patch, NONE, 1.1 binutils-2.19.50.0.1-libtool-lib64.patch, NONE, 1.1 binutils-2.19.50.0.1-linkonce-r-discard.patch, NONE, 1.1 binutils-2.19.50.0.1-output-format.sed, NONE, 1.1 binutils-2.19.50.0.1-ppc64-pie.patch, NONE, 1.1 binutils-2.19.50.0.1-set-long-long.patch, NONE, 1.1 binutils-2.19.50.0.1-symbolic-envvar-revert.patch, NONE, 1.1 binutils-2.19.50.0.1-version.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 spu-binutils.spec, 1.7, 1.8

Jochen Roth jroth at fedoraproject.org
Mon Dec 1 15:39:58 UTC 2008


Author: jroth

Update of /cvs/pkgs/rpms/spu-binutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10548

Modified Files:
	.cvsignore sources spu-binutils.spec 
Added Files:
	binutils-2.19.50.0.1-build-id.patch 
	binutils-2.19.50.0.1-ia64-lib64.patch 
	binutils-2.19.50.0.1-libtool-lib64.patch 
	binutils-2.19.50.0.1-linkonce-r-discard.patch 
	binutils-2.19.50.0.1-output-format.sed 
	binutils-2.19.50.0.1-ppc64-pie.patch 
	binutils-2.19.50.0.1-set-long-long.patch 
	binutils-2.19.50.0.1-symbolic-envvar-revert.patch 
	binutils-2.19.50.0.1-version.patch 
Log Message:
Rebase sources on 2.19.50.0.1 tarball.  Update all patches, trimming
those that are no longer needed.
Remove upstream-ld-tests patch as it is no longer needed.
Add patch for BZ 472152 to fix build-id generation.



binutils-2.19.50.0.1-build-id.patch:

--- NEW FILE binutils-2.19.50.0.1-build-id.patch ---
--- ../binutils-2.19.50.0.1.orig/bfd/elfcode.h	2008-11-26 09:29:54.000000000 +0000
+++ ./bfd/elfcode.h	2008-11-26 12:01:37.000000000 +0000
@@ -1170,6 +1170,19 @@ elf_checksum_contents (bfd *abfd,
 
       if (i_shdr.contents)
 	(*process) (i_shdr.contents, i_shdr.sh_size, arg);
+      else
+	{
+	  asection *sec;
+
+	  sec = bfd_section_from_elf_index (abfd, count);
+	  if (sec != NULL)
+	    {
+	      if (sec->contents == NULL)
+		bfd_malloc_and_get_section (abfd, sec, & sec->contents);
+	      if (sec->contents != NULL)
+		(*process) (sec->contents, i_shdr.sh_size, arg);
+	    }
+	}
     }
 
   return TRUE;

binutils-2.19.50.0.1-ia64-lib64.patch:

--- NEW FILE binutils-2.19.50.0.1-ia64-lib64.patch ---
2004-05-14  Jakub Jelinek  <jakub at redhat.com>

	* emulparams/elf64_ia64.sh (LIBPATH_SUFFIX): Use */lib64 paths on
	ia64-linux if /lib64 tree is present.

--- ../binutils-2.19.50.0.1.orig/ld/emulparams/elf64_ia64.sh	2008-11-21 16:45:00.000000000 +0000
+++ ld/emulparams/elf64_ia64.sh	2008-11-21 16:55:46.000000000 +0000
@@ -38,3 +38,13 @@ OTHER_READONLY_SECTIONS="${OTHER_READONL
 SMALL_DATA_CTOR=" "
 SMALL_DATA_DTOR=" "
 SHARABLE_SECTIONS=yes
+
+# For Linux modify the default library search path
+# to first include a 64-bit specific directory.
+case "$target" in
+  ia64*-linux*)
+    case "$EMULATION_NAME" in
+      *64*) test -d /lib64 && LIBPATH_SUFFIX=64 ;;
+    esac
+    ;;
+esac

binutils-2.19.50.0.1-libtool-lib64.patch:

--- NEW FILE binutils-2.19.50.0.1-libtool-lib64.patch ---
diff -rup ../binutils-2.19.50.0.1.orig/bfd/configure ./bfd/configure
--- ../binutils-2.19.50.0.1.orig/bfd/configure	2008-11-21 16:45:02.000000000 +0000
+++ ./bfd/configure	2008-11-21 16:49:02.000000000 +0000
@@ -10487,10 +10487,34 @@ rm -f conftest.err conftest.$ac_objext \
   # before this can be enabled.
   hardcode_into_libs=yes
 
+   # find out which ABI we are using
+   libsuff=
+   case "$host_cpu" in
+   x86_64*|s390*|powerpc*|ppc*|sparc*)
+     echo 'int i;' > conftest.$ac_ext
+     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+       case `/usr/bin/file conftest.$ac_objext` in
+       *64-bit*)
+         libsuff=64
+         if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
+           sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+         fi
+         sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+         ;;
+       esac
+     fi
+     rm -rf conftest*
+     ;;
+   esac
+ 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
diff -rup ../binutils-2.19.50.0.1.orig/binutils/configure ./binutils/configure
--- ../binutils-2.19.50.0.1.orig/binutils/configure	2008-11-21 16:45:00.000000000 +0000
+++ ./binutils/configure	2008-11-21 16:49:40.000000000 +0000
@@ -10318,10 +10318,34 @@ rm -f conftest.err conftest.$ac_objext \
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # find out which ABI we are using
+  libsuff=
+  case "$host_cpu" in
+  x86_64*|s390*|powerpc*|ppc*|sparc*)
+    echo 'int i;' > conftest.$ac_ext
+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+      case `/usr/bin/file conftest.$ac_objext` in
+      *64-bit*)
+        libsuff=64
+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+        fi
+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+        ;;
+      esac
+    fi
+    rm -rf conftest*
+    ;;
+  esac
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
diff -rup ../binutils-2.19.50.0.1.orig/gas/configure ./gas/configure
--- ../binutils-2.19.50.0.1.orig/gas/configure	2008-11-21 16:45:02.000000000 +0000
+++ ./gas/configure	2008-11-21 16:50:18.000000000 +0000
@@ -10316,10 +10316,34 @@ rm -f conftest.err conftest.$ac_objext \
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # find out which ABI we are using
+  libsuff=
+  case "$host_cpu" in
+  x86_64*|s390*|powerpc*|ppc*|sparc*)
+    echo 'int i;' > conftest.$ac_ext
+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+      case `/usr/bin/file conftest.$ac_objext` in
+      *64-bit*)
+        libsuff=64
+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+        fi
+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+        ;;
+      esac
+    fi
+    rm -rf conftest*
+    ;;
+  esac
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
diff -rup ../binutils-2.19.50.0.1.orig/gprof/configure ./gprof/configure
--- ../binutils-2.19.50.0.1.orig/gprof/configure	2008-11-21 16:45:00.000000000 +0000
+++ ./gprof/configure	2008-11-21 16:50:42.000000000 +0000
@@ -10407,10 +10407,34 @@ rm -f conftest.err conftest.$ac_objext \
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # find out which ABI we are using
+  libsuff=
+  case "$host_cpu" in
+  x86_64*|s390*|powerpc*|ppc*|sparc*)
+    echo 'int i;' > conftest.$ac_ext
+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+      case `/usr/bin/file conftest.$ac_objext` in
+      *64-bit*)
+        libsuff=64
+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+        fi
+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+        ;;
+      esac
+    fi
+    rm -rf conftest*
+    ;;
+  esac
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
diff -rup ../binutils-2.19.50.0.1.orig/ld/configure ./ld/configure
--- ../binutils-2.19.50.0.1.orig/ld/configure	2008-11-21 16:45:00.000000000 +0000
+++ ./ld/configure	2008-11-21 16:51:10.000000000 +0000
@@ -10607,10 +10607,34 @@ rm -f conftest.err conftest.$ac_objext \
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # find out which ABI we are using
+  libsuff=
+  case "$host_cpu" in
+  x86_64*|s390*|powerpc*|ppc*|sparc*)
+    echo 'int i;' > conftest.$ac_ext
+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+      case `/usr/bin/file conftest.$ac_objext` in
+      *64-bit*)
+        libsuff=64
+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+        fi
+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+        ;;
+      esac
+    fi
+    rm -rf conftest*
+    ;;
+  esac
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
diff -rup ../binutils-2.19.50.0.1.orig/libtool.m4 ./libtool.m4
--- ../binutils-2.19.50.0.1.orig/libtool.m4	2008-11-21 16:45:00.000000000 +0000
+++ ./libtool.m4	2008-11-21 16:51:35.000000000 +0000
@@ -2470,10 +2470,30 @@ linux* | k*bsd*-gnu)
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # find out which ABI we are using
+  libsuff=
+  case "$host_cpu" in
+  x86_64*|s390*|powerpc*|ppc*|sparc*)
+    echo 'int i;' > conftest.$ac_ext
+    if AC_TRY_EVAL(ac_compile); then
+      case `/usr/bin/file conftest.$ac_objext` in
+      *64-bit*)
+        libsuff=64
+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+        fi
+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+        ;;
+      esac
+    fi
+    rm -rf conftest*
+    ;;
+  esac
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
diff -rup ../binutils-2.19.50.0.1.orig/opcodes/configure ./opcodes/configure
--- ../binutils-2.19.50.0.1.orig/opcodes/configure	2008-11-21 16:45:00.000000000 +0000
+++ ./opcodes/configure	2008-11-21 16:52:05.000000000 +0000
@@ -10118,10 +10118,34 @@ rm -f conftest.err conftest.$ac_objext \
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # find out which ABI we are using
+  libsuff=
+  case "$host_cpu" in
+  x86_64*|s390*|powerpc*|ppc*|sparc*)
+    echo 'int i;' > conftest.$ac_ext
+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+      case `/usr/bin/file conftest.$ac_objext` in
+      *64-bit*)
+        libsuff=64
+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+        fi
+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+        ;;
+      esac
+    fi
+    rm -rf conftest*
+    ;;
+  esac
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on

binutils-2.19.50.0.1-linkonce-r-discard.patch:

--- NEW FILE binutils-2.19.50.0.1-linkonce-r-discard.patch ---
http://sourceware.org/ml/binutils/2008-10/msg00235.html

2008-10-26  Jan Kratochvil  <jan.kratochvil at redhat.com>

	* elflink.c (elf_link_input_bfd): Handle pre-COMDAT g++-3.4 relocations
	in `.gnu.linkonce.r.*' referencing its `.gnu.linkonce.t.*'.

2008-10-26  Jan Kratochvil  <jan.kratochvil at redhat.com>

	* ld-elf/linkoncerdiff.d, ld-elf/linkoncerdiff1.s,
	ld-elf/linkoncerdiff2.s: New.

--- ../binutils-2.19.50.0.1.orig/bfd/elflink.c	2008-11-21 16:45:02.000000000 +0000
+++ bfd/elflink.c	2008-11-21 17:08:32.000000000 +0000
@@ -9361,7 +9361,23 @@ elf_link_input_bfd (struct elf_final_lin
 		  if ((sec = *ps) != NULL && elf_discarded_section (sec))
 		    {
 		      BFD_ASSERT (r_symndx != 0);
-		      if (action_discarded & COMPLAIN)
+
+		      /* Do not complain on unresolved relocations in
+			 `.gnu.linkonce.r.F' referencing its discarded
+			 `.gnu.linkonce.t.F' counterpart - g++-3.4 specific as
+			 g++-4.x is using COMDAT groups (without the
+			 `.gnu.linkonce' prefix) instead.  `.gnu.linkonce.r.*'
+			 were the `.rodata' part of its matching
+			 `.gnu.linkonce.t.*'.  If `.gnu.linkonce.r.F' is not
+			 discarded with its `.gnu.linkonce.t.F' being discarded
+			 means we chose one-only `.gnu.linkonce.t.F' section
+			 from an other file not needing any `.gnu.linkonce.r.F'
+			 and thus `.gnu.linkonce.r.F' could be in fact also
+			 discarded.  */
+		      if ((action_discarded & COMPLAIN)
+		          && !(CONST_STRNEQ (o->name, ".gnu.linkonce.r.")
+			       && CONST_STRNEQ (sec->name, ".gnu.linkonce.t.")
+			       && strcmp (o->name + 16, sec->name + 16) == 0))
 			(*finfo->info->callbacks->einfo)
 			  (_("%X`%s' referenced in section `%A' of %B: "
 			     "defined in discarded section `%A' of %B\n"),
--- /dev/null	2008-11-21 14:50:50.404125628 +0000
+++ ld/testsuite/ld-elf/linkoncerdiff.d	2008-11-21 16:12:11.000000000 +0000
@@ -0,0 +1,5 @@
+#source: linkoncerdiff1.s
+#source: linkoncerdiff2.s
+#notarget: arc* d30v* dlx* openrisc* or32* pj*
+#ld: -r
+#error: `.gnu.linkonce.t.bar' referenced in section `.gnu.linkonce.r.foo' of tmpdir/dump1.o: defined in discarded section `.gnu.linkonce.t.bar' of tmpdir/dump1.o
--- /dev/null	2008-11-21 14:50:50.404125628 +0000
+++ ld/testsuite/ld-elf/linkoncerdiff1.s	2008-11-21 16:12:11.000000000 +0000
@@ -0,0 +1,7 @@
+	.section	.gnu.linkonce.t.foo, "a", %progbits
+	.globl	symfoo
+symfoo:
+
+	.section	.gnu.linkonce.t.bar, "a", %progbits
+	.globl	symbar
+symbar:
--- /dev/null	2008-11-21 14:50:50.404125628 +0000
+++ ld/testsuite/ld-elf/linkoncerdiff2.s	2008-11-21 16:12:11.000000000 +0000
@@ -0,0 +1,17 @@
+	.section	.gnu.linkonce.t.foo, "a", %progbits
+1:
+	.globl	symfoo
+symfoo:
+	.long	0
+
+	.section	.gnu.linkonce.t.bar, "a", %progbits
+2:
+	.globl	symbar
+symbar:
+	.long	0
+
+	.section	.gnu.linkonce.r.foo, "a", %progbits
+	.long	1b
+	.long	symfoo
+	.long	2b
+	.long	symbar


--- NEW FILE binutils-2.19.50.0.1-output-format.sed ---
# Generate OUTPUT_FORMAT line for .so files from the system linker output.
# Imported from glibc/Makerules.

/ld.*[ 	]-E[BL]/b f
/collect.*[ 	]-E[BL]/b f
/OUTPUT_FORMAT[^)]*$/{N
s/\n[	 ]*/ /
}
t o
: o
s/^.*OUTPUT_FORMAT(\([^,]*\), \1, \1).*$/OUTPUT_FORMAT(\1)/
t q
s/^.*OUTPUT_FORMAT(\([^,]*\), \([^,]*\), \([^,]*\)).*$/\1,\2,\3/
t s
s/^.*OUTPUT_FORMAT(\([^,)]*\).*$)/OUTPUT_FORMAT(\1)/
t q
d
: s
s/"//g
G
s/\n//
s/^\([^,]*\),\([^,]*\),\([^,]*\),B/OUTPUT_FORMAT(\2)/p
s/^\([^,]*\),\([^,]*\),\([^,]*\),L/OUTPUT_FORMAT(\3)/p
s/^\([^,]*\),\([^,]*\),\([^,]*\)/OUTPUT_FORMAT(\1)/p
/,/s|^|*** BUG in libc/scripts/output-format.sed *** |p
q
: q
s/"//g
p
q
: f
s/^.*[ 	]-E\([BL]\)[ 	].*$/,\1/
t h
s/^.*[ 	]-E\([BL]\)$/,\1/
t h
d
: h
h

binutils-2.19.50.0.1-ppc64-pie.patch:

--- NEW FILE binutils-2.19.50.0.1-ppc64-pie.patch ---
--- ../binutils-2.19.50.0.1.orig/bfd/elf64-ppc.c	2008-11-21 16:45:02.000000000 +0000
+++ bfd/elf64-ppc.c	2008-11-21 16:53:28.000000000 +0000
@@ -11296,7 +11296,12 @@ ppc64_elf_relocate_section (bfd *output_
 	      else if (!SYMBOL_REFERENCES_LOCAL (info, &h->elf)
 		       && !is_opd
 		       && r_type != R_PPC64_TOC)
-		outrel.r_info = ELF64_R_INFO (h->elf.dynindx, r_type);
+		{
+		  outrel.r_info = ELF64_R_INFO (h->elf.dynindx, r_type);
+		  if (h->elf.dynindx == -1
+		      && h->elf.root.type == bfd_link_hash_undefweak)
+		    memset (&outrel, 0, sizeof outrel);
+		}
 	      else
 		{
 		  /* This symbol is local, or marked to become local,

binutils-2.19.50.0.1-set-long-long.patch:

--- NEW FILE binutils-2.19.50.0.1-set-long-long.patch ---
--- bfd/configure.in-orig	2008-09-22 00:19:20.000000000 +0200
+++ bfd/configure.in	2008-09-22 00:43:15.000000000 +0200
@@ -149,11 +149,13 @@ if test "x${ac_cv_sizeof_long}" = "x8"; 
   BFD_HOST_64BIT_LONG=1
   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long"
   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long"
-elif test "x${ac_cv_sizeof_long_long}" = "x8"; then
+fi
+if test "x${ac_cv_sizeof_long_long}" = "x8"; then
   BFD_HOST_64BIT_LONG_LONG=1
   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long long"
   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long long"
-  if test "x${ac_cv_sizeof_void_p}" = "x8"; then
+  if test "x${ac_cv_sizeof_void_p}" = "x8" \
+          -a "x${ac_cv_sizeof_long}" != "x8"; then
     BFD_HOSTPTR_T="unsigned long long"
   fi
 fi
--- ../binutils-2.19.50.0.1.orig/bfd/configure	2008-11-21 16:45:02.000000000 +0000
+++ bfd/configure	2008-11-21 17:04:55.000000000 +0000
@@ -13844,11 +13868,13 @@ if test "x${ac_cv_sizeof_long}" = "x8"; 
   BFD_HOST_64BIT_LONG=1
   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long"
   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long"
-elif test "x${ac_cv_sizeof_long_long}" = "x8"; then
+fi
+if test "x${ac_cv_sizeof_long_long}" = "x8"; then
   BFD_HOST_64BIT_LONG_LONG=1
   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long long"
   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long long"
-  if test "x${ac_cv_sizeof_void_p}" = "x8"; then
+  if test "x${ac_cv_sizeof_void_p}" = "x8" \
+          -a "x${ac_cv_sizeof_long}" != "x8"; then
     BFD_HOSTPTR_T="unsigned long long"
   fi
 fi

binutils-2.19.50.0.1-symbolic-envvar-revert.patch:

--- NEW FILE binutils-2.19.50.0.1-symbolic-envvar-revert.patch ---
It reverts the H.J. Lu's binutils custom patch.

--- ../binutils-2.19.50.0.1.orig/ld/NEWS	2008-11-21 16:45:00.000000000 +0000
+++ ld/NEWS	2008-11-21 17:03:12.000000000 +0000
@@ -1,8 +1,5 @@
 -*- text -*-
 
-* ELF: Support environment variables, LD_SYMBOLIC for -Bsymbolic and
-  LD_SYMBOLIC_FUNCTIONS for -Bsymbolic-functions.
-
 Changes in 2.19:
 
 * Linker scripts support a new INSERT command that makes it easier to
--- ld/ld.texinfo	2008-07-10 17:33:23.000000000 +0200
+++ ld/ld.texinfo	2008-07-30 21:24:05.000000000 +0200
@@ -1147,21 +1147,14 @@ When creating a shared library, bind ref
 definition within the shared library, if any.  Normally, it is possible
 for a program linked against a shared library to override the definition
 within the shared library.  This option is only meaningful on ELF
-platforms which support shared libraries.  If @option{-Bsymbolic} is not
-used when linking a shared library, the linker will also turn on this
-option if the environment variable @code{LD_SYMBOLIC} is set.
+platforms which support shared libraries.
 
 @kindex -Bsymbolic-functions
 @item -Bsymbolic-functions
 When creating a shared library, bind references to global function
 symbols to the definition within the shared library, if any.
 This option is only meaningful on ELF platforms which support shared
-libraries.  If @option{-Bsymbolic-functions} is not used when linking a
-shared library, the linker will also turn on this option if the
-environment variable @code{LD_SYMBOLIC_FUNCTIONS} is set.  When
-both environment variables @code{LD_SYMBOLIC} and
- at code{LD_SYMBOLIC_FUNCTIONS} are set, @code{LD_SYMBOLIC} will take
-precedent.
+libraries.
 
 @kindex --dynamic-list=@var{dynamic-list-file}
 @item --dynamic-list=@var{dynamic-list-file}
--- ../binutils-2.19.50.0.1.orig/ld/ldmain.c	2008-11-21 16:45:00.000000000 +0000
+++ ld/ldmain.c	2008-11-21 17:02:48.000000000 +0000
@@ -256,11 +256,6 @@ main (int argc, char **argv)
   command_line.warn_search_mismatch = TRUE;
   command_line.check_section_addresses = TRUE;
 
-  if (getenv ("LD_SYMBOLIC") != NULL)
-    command_line.symbolic = symbolic;
-  else if (getenv ("LD_SYMBOLIC_FUNCTIONS") != NULL)
-    command_line.symbolic = symbolic_functions;
-
   /* We initialize DEMANGLING based on the environment variable
      COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
      output of the linker, unless COLLECT_NO_DEMANGLE is set in the

binutils-2.19.50.0.1-version.patch:

--- NEW FILE binutils-2.19.50.0.1-version.patch ---
--- ../binutils-2.19/bfd/Makefile.am	2008-10-16 14:20:34.000000000 +0100
+++ bfd/Makefile.am	2008-11-21 15:52:53.000000000 +0000
@@ -994,12 +994,12 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/
 	report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\
 	if test "x$(RELEASE)" = x ; then \
 	  bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
-	  bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\
-	  bfd_soversion="$(VERSION).$${bfd_version_date}" ;\
+	  bfd_version_string="\"$(VERSION)-%{release} $${bfd_version_date}\"" ;\
+	  bfd_soversion="$(VERSION)-%{release}" ;\
 	fi ;\
 	sed -e "s, at bfd_version@,$$bfd_version," \
 	    -e "s, at bfd_version_string@,$$bfd_version_string," \
-	    -e "s, at bfd_version_package@,$$bfd_version_package," \
+	    -e "s, at bfd_version_package@,\"version \"," \
 	    -e "s, at report_bugs_to@,$$report_bugs_to," \
 	    < $(srcdir)/version.h > $@; \
 	echo "$${bfd_soversion}" > libtool-soversion
--- ../binutils-2.19.50.0.1.orig/bfd/Makefile.in	2008-11-21 16:45:02.000000000 +0000
+++ bfd/Makefile.in	2008-11-21 16:57:07.000000000 +0000
@@ -1590,12 +1590,12 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/
 	report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\
 	if test "x$(RELEASE)" = x ; then \
 	  bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
-	  bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\
-	  bfd_soversion="$(VERSION).$${bfd_version_date}" ;\
+	  bfd_version_string="\"$(VERSION)-%{release} $${bfd_version_date}\"" ;\
+	  bfd_soversion="$(VERSION)-%{release}" ;\
 	fi ;\
 	sed -e "s, at bfd_version@,$$bfd_version," \
 	    -e "s, at bfd_version_string@,$$bfd_version_string," \
-	    -e "s, at bfd_version_package@,$$bfd_version_package," \
+	    -e "s, at bfd_version_package@,\"version \"," \
 	    -e "s, at report_bugs_to@,$$report_bugs_to," \
 	    < $(srcdir)/version.h > $@; \
 	echo "$${bfd_soversion}" > libtool-soversion


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spu-binutils/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Oct 2008 10:28:42 -0000	1.2
+++ .cvsignore	1 Dec 2008 15:39:57 -0000	1.3
@@ -1 +1 @@
-binutils-2.18.50.0.9.tar.bz2
+binutils-2.19.50.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spu-binutils/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Oct 2008 10:28:42 -0000	1.2
+++ sources	1 Dec 2008 15:39:58 -0000	1.3
@@ -1 +1 @@
-68e3510d9c790b134450c0a243c251cd  binutils-2.18.50.0.9.tar.bz2
+c71bf140587a5662bd1fa9d5a19556ed  binutils-2.19.50.0.1.tar.bz2


Index: spu-binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spu-binutils/devel/spu-binutils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- spu-binutils.spec	1 Dec 2008 14:38:37 -0000	1.7
+++ spu-binutils.spec	1 Dec 2008 15:39:58 -0000	1.8
@@ -17,23 +17,21 @@
 
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
-Version: 2.18.50.0.9
-Release: 10%{?dist}
+Version: 2.19.50.0.1
+Release: 1%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
 Source: ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-%{version}.tar.bz2
-Source2: binutils-2.18.50.0.9-output-format.sed
-Patch1: binutils-2.18.50.0.6-ltconfig-multilib.patch
-Patch2: binutils-2.18.50.0.6-ppc64-pie.patch
-Patch3: binutils-2.18.50.0.8-place-orphan.patch
-Patch4: binutils-2.18.50.0.6-ia64-lib64.patch
-Patch6: binutils-2.18.50.0.8-symbolic-envvar-revert.patch
-Patch7: binutils-2.18.50.0.6-version.patch
-Patch11: binutils-2.18.50.0.9-largefile.patch
-Patch12: binutils-2.18.50.0.9-set-long-long.patch
-Patch13: binutils-2.18.50.0.9-upstream.patch
-Patch14: binutils-2.18.50.0.9-linkonce-r-discard.patch
+Source2: binutils-2.19.50.0.1-output-format.sed
+Patch01: binutils-2.19.50.0.1-libtool-lib64.patch
+Patch02: binutils-2.19.50.0.1-ppc64-pie.patch
+Patch03: binutils-2.19.50.0.1-ia64-lib64.patch
+Patch04: binutils-2.19.50.0.1-symbolic-envvar-revert.patch
+Patch05: binutils-2.19.50.0.1-version.patch
+Patch06: binutils-2.19.50.0.1-set-long-long.patch
+Patch07: binutils-2.19.50.0.1-linkonce-r-discard.patch
+Patch08: binutils-2.19.50.0.1-build-id.patch
 
 %if 0%{?_with_debug:1}
 # Define this if you want to skip the strip step and preserve debug info.
@@ -93,20 +91,18 @@
 
 %prep
 %setup -q -n binutils-%{version}
-%patch1 -p0 -b .ltconfig-multilib~
-%patch2 -p0 -b .ppc64-pie~
-%patch3 -p0 -b .place-orphan~
+%patch01 -p0 -b .libtool-lib64~
+%patch02 -p0 -b .ppc64-pie~
 %ifarch ia64
 %if "%{_lib}" == "lib64"
-%patch4 -p0 -b .ia64-lib64~
+%patch03 -p0 -b .ia64-lib64~
 %endif
 %endif
-%patch6 -p0 -b .symbolic-envvar-revert~
-%patch7 -p0 -b .version~
-%patch11 -p0 -b .largefile~
-%patch12 -p0 -b .set-long-long~
-%patch13 -p0 -b .upstream~
-%patch14 -p0 -b .linkonce-r-discard~
+%patch04 -p0 -b .symbolic-envvar-revert~
+%patch05 -p0 -b .version~
+%patch06 -p0 -b .set-long-long~
+%patch07 -p0 -b .linkonce-r-discard~
+%patch08 -p0 -b .build-id~
 
 # We cannot run autotools as there is an exact requirement of autoconf-2.59.
 
@@ -361,6 +357,12 @@
 %endif # !%{isnative}
 
 %changelog
+* Mon Dec  1 2008 Jochen Roth <jroth at linux.vnet.ibm.com> 2.19.50.0.1-1
+- Rebase sources on 2.19.50.0.1 tarball. Update all patches, trimming
+  those that are no longer needed.
+- Add build-id patch to ensure that section contents are incorporated
+  into a build id. (BZ 472152)
+
 * Mon Dec  1 2008 Jochen Roth <jroth at linux.vnet.ibm.com> 2.18.50.0.9-10
 - spu-binutils now owns /usr/spu
 




More information about the fedora-extras-commits mailing list