Mon Oct 12 11:18:37 UTC 2009

Author: nickc

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

Modified Files:
	.cvsignore binutils.spec sources 
Added Files:
	binutils-2.20.51.0.2-build-id.patch 
	binutils-2.20.51.0.2-envvar-revert.patch 
	binutils-2.20.51.0.2-ia64-lib64.patch 
	binutils-2.20.51.0.2-libtool-lib64.patch 
	binutils-2.20.51.0.2-ppc64-pie.patch 
	binutils-2.20.51.0.2-set-long-long.patch 
	binutils-2.20.51.0.2-version.patch 
Removed Files:
	binutils-2.19.50.0.1-ia64-lib64.patch 
	binutils-2.19.51.0.10-build-id.patch 
	binutils-2.19.51.0.10-envvar-revert.patch 
	binutils-2.19.51.0.10-libtool-lib64.patch 
	binutils-2.19.51.0.10-ppc64-pie.patch 
	binutils-2.19.51.0.10-set-long-long.patch 
	binutils-2.19.51.0.10-version.patch 
	binutils-2.19.51.0.11-moxie.patch 
	binutils-2.19.51.0.14-cxxfilt-java-doc.patch 
	binutils-2.19.51.0.14-unique-is-global.patch 
Log Message:
- Rebase on 2.20 tarball.
- Remove redundant moxie patch.
- Remove redundant unique is global patch.
- Remove redundant cxxfilt java doc patch.



binutils-2.20.51.0.2-build-id.patch:
 elfcode.h |   18 ++++++++++++++++++
 section.c |    2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

--- NEW FILE binutils-2.20.51.0.2-build-id.patch ---
--- ../binutils-2.20.51.0.2.orig/bfd/elfcode.h	2009-10-12 11:45:05.000000000 +0100
+++ bfd/elfcode.h	2009-10-12 11:47:14.000000000 +0100
@@ -1175,6 +1175,24 @@ 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)
+		{
+		  /* Force rereading from file.  */
+		  sec->flags &= ~SEC_IN_MEMORY;
+		  if (! bfd_malloc_and_get_section (abfd, sec, & sec->contents))
+		    continue;
+		}
+	      if (sec->contents != NULL)
+		(*process) (sec->contents, i_shdr.sh_size, arg);
+	    }
+	}
     }
 
   return TRUE;
--- ../binutils-2.20.51.0.2.orig/bfd/section.c	2009-10-12 11:45:05.000000000 +0100
+++ bfd/section.c	2009-10-12 11:48:44.000000000 +0100
@@ -1553,7 +1553,7 @@ bfd_malloc_and_get_section (bfd *abfd, s
     return TRUE;
 
   p = (bfd_byte *)
-      bfd_malloc (sec->rawsize > sec->size ? sec->rawsize : sec->size);
+      bfd_zmalloc (sec->rawsize > sec->size ? sec->rawsize : sec->size);
   if (p == NULL)
     return FALSE;
   *buf = p;

binutils-2.20.51.0.2-envvar-revert.patch:
 NEWS       |    5 -----
 ld.texinfo |   16 +++-------------
 ldmain.c   |    8 --------
 3 files changed, 3 insertions(+), 26 deletions(-)

--- NEW FILE binutils-2.20.51.0.2-envvar-revert.patch ---
--- ../binutils-2.20.51.0.2.orig/ld/ldmain.c	2009-10-12 11:28:44.000000000 +0100
+++ ld/ldmain.c	2009-10-12 11:38:36.000000000 +0100
@@ -256,14 +256,6 @@ main (int argc, char **argv)
   command_line.warn_search_mismatch = TRUE;
   command_line.check_section_addresses = -1;
 
-  if (getenv ("LD_SYMBOLIC") != NULL)
-    command_line.symbolic = symbolic;
-  else if (getenv ("LD_SYMBOLIC_FUNCTIONS") != NULL)
-    command_line.symbolic = symbolic_functions;
-
-  if (getenv ("LD_AS_NEEDED") != NULL)
-    as_needed = TRUE;
-
   /* 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.20.51.0.2.orig/ld/ld.texinfo	2009-10-12 11:28:44.000000000 +0100
+++ ld/ld.texinfo	2009-10-12 11:38:36.000000000 +0100
@@ -1140,10 +1140,7 @@ for a library that satisfies a symbol re
 which is undefined at the point that the library was linked, or, if
 the library is not found in the DT_NEEDED lists of other libraries
 linked up to that point, a reference from another dynamic library.
- at option{--no-as-needed} restores the default behaviour.  If the
-environment variable @code{LD_AS_NEEDED} is set, the linker will
-behave as if the @option{--as-needed} option is passed to the linker as
-the first command line option.
+ at option{--no-as-needed} restores the default behaviour.
 
 @kindex --add-needed
 @kindex --no-add-needed
@@ -1207,21 +1204,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.20.51.0.2.orig/ld/NEWS	2009-10-12 11:28:44.000000000 +0100
+++ ld/NEWS	2009-10-12 11:38:36.000000000 +0100
@@ -64,11 +64,6 @@ Changes in 2.20:
   For the switch --enable-runtime-pseudo-reloc it uses for 32-bit
   runtime pseudo relocation version one, for 64-bit the version two.
 
-* ELF: Support environment variable LD_AS_NEEDED for --as-needed.
-
-* 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

binutils-2.20.51.0.2-ia64-lib64.patch:
 elf64_ia64.sh |   10 ++++++++++
 1 file changed, 10 insertions(+)

--- NEW FILE binutils-2.20.51.0.2-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.20.51.0.2-libtool-lib64.patch:
 bfd/configure           |   26 +++++++++++++++++++++++++-
 bfd/configure.orig      |only
 binutils/configure      |   26 +++++++++++++++++++++++++-
 binutils/configure.orig |only
 gas/configure           |   26 +++++++++++++++++++++++++-
 gas/configure.orig      |only
 gprof/configure         |   26 +++++++++++++++++++++++++-
 gprof/configure.orig    |only
 ld/configure            |   26 +++++++++++++++++++++++++-
 ld/configure.orig       |only
 libtool.m4              |   22 +++++++++++++++++++++-
 opcodes/configure       |   26 +++++++++++++++++++++++++-
 opcodes/configure.orig  |only
 13 files changed, 171 insertions(+), 7 deletions(-)

--- NEW FILE binutils-2.20.51.0.2-libtool-lib64.patch ---
diff -rup ../binutils-2.20.51.0.2.orig/bfd/configure ./bfd/configure
--- ../binutils-2.20.51.0.2.orig/bfd/configure	2009-10-12 11:28:45.000000000 +0100
+++ ./bfd/configure	2009-10-12 11:31:43.000000000 +0100
@@ -10670,10 +10670,34 @@ fi
   # 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
Only in ./bfd: configure.orig
diff -rup ../binutils-2.20.51.0.2.orig/binutils/configure ./binutils/configure
--- ../binutils-2.20.51.0.2.orig/binutils/configure	2009-10-12 11:28:44.000000000 +0100
+++ ./binutils/configure	2009-10-12 11:31:43.000000000 +0100
@@ -10461,10 +10461,34 @@ fi
   # 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
Only in ./binutils: configure.orig
diff -rup ../binutils-2.20.51.0.2.orig/gas/configure ./gas/configure
--- ../binutils-2.20.51.0.2.orig/gas/configure	2009-10-12 11:28:45.000000000 +0100
+++ ./gas/configure	2009-10-12 11:31:43.000000000 +0100
@@ -10418,10 +10418,34 @@ fi
   # 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
Only in ./gas: configure.orig
diff -rup ../binutils-2.20.51.0.2.orig/gprof/configure ./gprof/configure
--- ../binutils-2.20.51.0.2.orig/gprof/configure	2009-10-12 11:28:44.000000000 +0100
+++ ./gprof/configure	2009-10-12 11:31:43.000000000 +0100
@@ -10356,10 +10356,34 @@ fi
   # 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
Only in ./gprof: configure.orig
diff -rup ../binutils-2.20.51.0.2.orig/ld/configure ./ld/configure
--- ../binutils-2.20.51.0.2.orig/ld/configure	2009-10-12 11:28:44.000000000 +0100
+++ ./ld/configure	2009-10-12 11:31:43.000000000 +0100
@@ -10806,10 +10806,34 @@ fi
   # 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
Only in ./ld: configure.orig
diff -rup ../binutils-2.20.51.0.2.orig/libtool.m4 ./libtool.m4
--- ../binutils-2.20.51.0.2.orig/libtool.m4	2009-10-12 11:28:44.000000000 +0100
+++ ./libtool.m4	2009-10-12 11:31:43.000000000 +0100
@@ -2475,10 +2475,30 @@ linux* | k*bsd*-gnu | kopensolaris*-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.20.51.0.2.orig/opcodes/configure ./opcodes/configure
--- ../binutils-2.20.51.0.2.orig/opcodes/configure	2009-10-12 11:28:44.000000000 +0100
+++ ./opcodes/configure	2009-10-12 11:31:43.000000000 +0100
@@ -10406,10 +10406,34 @@ fi
   # 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
Only in ./opcodes: configure.orig

binutils-2.20.51.0.2-ppc64-pie.patch:
 elf64-ppc.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE binutils-2.20.51.0.2-ppc64-pie.patch ---
--- ../binutils-2.20.51.0.2.orig/bfd/elf64-ppc.c	2009-10-12 11:28:45.000000000 +0100
+++ bfd/elf64-ppc.c	2009-10-12 11:34:17.000000000 +0100
@@ -11992,7 +11992,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.20.51.0.2-set-long-long.patch:
 configure      |    6 ++++--
 configure.in   |    6 ++++--
 configure.orig |   26 +++++++++++++++++++++++++-
 3 files changed, 33 insertions(+), 5 deletions(-)

--- NEW FILE binutils-2.20.51.0.2-set-long-long.patch ---
diff -rup ../binutils-2.20.51.0.2.orig/bfd/configure bfd/configure
--- ../binutils-2.20.51.0.2.orig/bfd/configure	2009-10-12 11:45:05.000000000 +0100
+++ bfd/configure	2009-10-12 11:45:13.000000000 +0100
@@ -12694,11 +12694,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
diff -rup ../binutils-2.20.51.0.2.orig/bfd/configure.in bfd/configure.in
--- ../binutils-2.20.51.0.2.orig/bfd/configure.in	2009-10-12 11:45:05.000000000 +0100
+++ bfd/configure.in	2009-10-12 11:45:13.000000000 +0100
@@ -172,11 +172,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
diff -rup ../binutils-2.20.51.0.2.orig/bfd/configure.orig bfd/configure.orig
--- ../binutils-2.20.51.0.2.orig/bfd/configure.orig	2009-10-12 11:45:05.000000000 +0100
+++ bfd/configure.orig	2009-10-12 11:31:43.000000000 +0100
@@ -10670,10 +10670,34 @@ fi
   # 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.20.51.0.2-version.patch:
 Makefile.am |    6 +++---
 Makefile.in |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE binutils-2.20.51.0.2-version.patch ---
--- ../binutils-2.20.51.0.2.orig/bfd/Makefile.am	2009-10-12 11:28:45.000000000 +0100
+++ bfd/Makefile.am	2009-10-12 11:42:24.000000000 +0100
@@ -951,12 +951,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.20.51.0.2.orig/bfd/Makefile.in	2009-10-12 11:28:45.000000000 +0100
+++ bfd/Makefile.in	2009-10-12 11:42:24.000000000 +0100
@@ -1978,12 +1978,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/binutils/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	23 Jul 2009 08:34:57 -0000	1.47
+++ .cvsignore	12 Oct 2009 11:18:36 -0000	1.48
@@ -1 +1 @@
-binutils-2.19.51.0.14.tar.bz2
+binutils-2.20.51.0.2.tar.bz2


Index: binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -p -r1.175 -r1.176
--- binutils.spec	29 Sep 2009 17:35:56 -0000	1.175
+++ binutils.spec	12 Oct 2009 11:18:37 -0000	1.176
@@ -16,23 +16,20 @@
 
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
-Version: 2.19.51.0.14
-Release: 32%{?dist}
+Version: 2.20.51.0.2
+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.19.50.0.1-output-format.sed
-Patch01: binutils-2.19.51.0.10-libtool-lib64.patch
-Patch02: binutils-2.19.51.0.10-ppc64-pie.patch
-Patch03: binutils-2.19.50.0.1-ia64-lib64.patch
-Patch04: binutils-2.19.51.0.10-envvar-revert.patch
-Patch05: binutils-2.19.51.0.10-version.patch
-Patch06: binutils-2.19.51.0.10-set-long-long.patch
-Patch07: binutils-2.19.51.0.10-build-id.patch
-Patch09: binutils-2.19.51.0.11-moxie.patch
-Patch10: binutils-2.19.51.0.14-unique-is-global.patch
-Patch11: binutils-2.19.51.0.14-cxxfilt-java-doc.patch
+Patch01: binutils-2.20.51.0.2-libtool-lib64.patch
+Patch02: binutils-2.20.51.0.2-ppc64-pie.patch
+Patch03: binutils-2.20.51.0.2-ia64-lib64.patch
+Patch04: binutils-2.20.51.0.2-envvar-revert.patch
+Patch05: binutils-2.20.51.0.2-version.patch
+Patch06: binutils-2.20.51.0.2-set-long-long.patch
+Patch07: binutils-2.20.51.0.2-build-id.patch
 
 %if 0%{?_with_debug:1}
 # Define this if you want to skip the strip step and preserve debug info.
@@ -104,9 +101,6 @@ to consider using libelf instead of BFD.
 %patch05 -p0 -b .version~
 %patch06 -p0 -b .set-long-long~
 %patch07 -p0 -b .build-id~
-%patch09 -p0 -b .moxie~
-%patch10 -p0 -b .unique-is-global~
-%patch11 -p0 -b .cxxfilt-java-doc~
 
 # We cannot run autotools as there is an exact requirement of autoconf-2.59.
 
@@ -357,6 +351,12 @@ fi
 %endif # %{isnative}
 
 %changelog
+* Mon Oct 12 2009 Nick Clifton <nickc at redhat.com> 2.20.51.0.2-1
+- Rebase on 2.20 tarball.
+- Remove redundant moxie patch.
+- Remove redundant unique is global patch.
+- Remove redundant cxxfilt java doc patch.
+
 * Tue Sep 29 2009 Jan Kratochvil <jan.kratochvil at redhat.com> 2.19.51.0.14-32
 - Remove spurious description of nonexistent --java switch for cxxfilt.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	23 Jul 2009 08:34:57 -0000	1.47
+++ sources	12 Oct 2009 11:18:37 -0000	1.48
@@ -1 +1 @@
-e0b485a3ff9392da1351dc3fb61a3d10  binutils-2.19.51.0.14.tar.bz2
+b01b185a5eab43190fb83efaeb2ffef9  binutils-2.20.51.0.2.tar.bz2


--- binutils-2.19.50.0.1-ia64-lib64.patch DELETED ---


--- binutils-2.19.51.0.10-build-id.patch DELETED ---


--- binutils-2.19.51.0.10-envvar-revert.patch DELETED ---


--- binutils-2.19.51.0.10-libtool-lib64.patch DELETED ---


--- binutils-2.19.51.0.10-ppc64-pie.patch DELETED ---


--- binutils-2.19.51.0.10-set-long-long.patch DELETED ---


--- binutils-2.19.51.0.10-version.patch DELETED ---


--- binutils-2.19.51.0.11-moxie.patch DELETED ---


--- binutils-2.19.51.0.14-cxxfilt-java-doc.patch DELETED ---


--- binutils-2.19.51.0.14-unique-is-global.patch DELETED ---


