Mon Jun 22 16:18:47 UTC 2009

Author: nickc

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

Modified Files:
	.cvsignore binutils.spec sources 
Added Files:
	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 
Removed Files:
	binutils-2.19.50.0.1-build-id.patch 
	binutils-2.19.50.0.1-gcc_except_table.patch 
	binutils-2.19.50.0.1-libtool-lib64.patch 
	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 
	binutils-2.19.51.0.2-IBM.patch 
	binutils-2.19.51.0.2-ifunc.patch 
	binutils-2.19.51.0.2-pr10255.patch 
	binutils-2.19.51.0.2-sisreg.patch 
	binutils-2.19.51.0.2-tls-get-addr.patch 
Log Message:
Rebuild patches against latest binutils source tarball

binutils-2.19.51.0.10-build-id.patch:

--- NEW FILE binutils-2.19.51.0.10-build-id.patch ---
diff -rup ../binutils-2.19.51.0.10.orig/bfd/elfcode.h ./bfd/elfcode.h
--- ../binutils-2.19.51.0.10.orig/bfd/elfcode.h	2009-06-22 16:16:08.000000000 +0100
+++ ./bfd/elfcode.h	2009-06-22 16:20:00.000000000 +0100
@@ -1170,6 +1170,20 @@ 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))
+		continue;
+	      if (sec->contents != NULL)
+		(*process) (sec->contents, i_shdr.sh_size, arg);
+	    }
+	}
     }
 
   return TRUE;
diff -rup ../binutils-2.19.51.0.10.orig/bfd/section.c ./bfd/section.c
--- ../binutils-2.19.51.0.10.orig/bfd/section.c	2009-06-22 16:16:08.000000000 +0100
+++ ./bfd/section.c	2009-06-22 16:20:42.000000000 +0100
@@ -1477,7 +1477,7 @@ bfd_malloc_and_get_section (bfd *abfd, s
   if (sz == 0)
     return TRUE;
 
-  p = bfd_malloc (sec->rawsize > sec->size ? sec->rawsize : sec->size);
+  p = bfd_zmalloc (sec->rawsize > sec->size ? sec->rawsize : sec->size);
   if (p == NULL)
     return FALSE;
   *buf = p;

binutils-2.19.51.0.10-envvar-revert.patch:

--- NEW FILE binutils-2.19.51.0.10-envvar-revert.patch ---
diff -rup ../binutils-2.19.51.0.10.orig/ld/ldmain.c ./ld/ldmain.c
--- ../binutils-2.19.51.0.10.orig/ld/ldmain.c	2009-06-22 15:56:54.000000000 +0100
+++ ./ld/ldmain.c	2009-06-22 16:05:54.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
diff -rup ../binutils-2.19.51.0.10.orig/ld/ld.texinfo ./ld/ld.texinfo
--- ../binutils-2.19.51.0.10.orig/ld/ld.texinfo	2009-06-22 15:56:53.000000000 +0100
+++ ./ld/ld.texinfo	2009-06-22 16:05:42.000000000 +0100
@@ -1118,10 +1118,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
@@ -1185,21 +1182,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}
diff -rup ../binutils-2.19.51.0.10.orig/ld/NEWS ./ld/NEWS
--- ../binutils-2.19.51.0.10.orig/ld/NEWS	2009-06-22 15:56:54.000000000 +0100
+++ ./ld/NEWS	2009-06-22 16:04:15.000000000 +0100
@@ -55,11 +55,6 @@
   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.19.51.0.10-libtool-lib64.patch:

--- NEW FILE binutils-2.19.51.0.10-libtool-lib64.patch ---
diff -rup ../binutils-2.19.51.0.10.orig/bfd/configure ./bfd/configure
--- ../binutils-2.19.51.0.10.orig/bfd/configure	2009-06-22 15:56:55.000000000 +0100
+++ ./bfd/configure	2009-06-22 15:58:46.000000000 +0100
@@ -10137,10 +10137,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.19.51.0.10.orig/binutils/configure ./binutils/configure
--- ../binutils-2.19.51.0.10.orig/binutils/configure	2009-06-22 15:56:54.000000000 +0100
+++ ./binutils/configure	2009-06-22 15:58:46.000000000 +0100
@@ -10362,10 +10362,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.19.51.0.10.orig/gas/configure ./gas/configure
--- ../binutils-2.19.51.0.10.orig/gas/configure	2009-06-22 15:56:55.000000000 +0100
+++ ./gas/configure	2009-06-22 15:58:46.000000000 +0100
@@ -10330,10 +10330,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.19.51.0.10.orig/gprof/configure ./gprof/configure
--- ../binutils-2.19.51.0.10.orig/gprof/configure	2009-06-22 15:56:54.000000000 +0100
+++ ./gprof/configure	2009-06-22 15:58:46.000000000 +0100
@@ -10422,10 +10422,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.19.51.0.10.orig/ld/configure ./ld/configure
--- ../binutils-2.19.51.0.10.orig/ld/configure	2009-06-22 15:56:54.000000000 +0100
+++ ./ld/configure	2009-06-22 15:58:46.000000000 +0100
@@ -10622,10 +10622,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.19.51.0.10.orig/libtool.m4 ./libtool.m4
--- ../binutils-2.19.51.0.10.orig/libtool.m4	2009-06-22 15:56:54.000000000 +0100
+++ ./libtool.m4	2009-06-22 15:58:46.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
Only in .: libtool.m4.orig
diff -rup ../binutils-2.19.51.0.10.orig/opcodes/configure ./opcodes/configure
--- ../binutils-2.19.51.0.10.orig/opcodes/configure	2009-06-22 15:56:54.000000000 +0100
+++ ./opcodes/configure	2009-06-22 15:58:46.000000000 +0100
@@ -10132,10 +10132,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.19.51.0.10-ppc64-pie.patch:

--- NEW FILE binutils-2.19.51.0.10-ppc64-pie.patch ---
--- ../binutils-2.19.51.0.10.orig/bfd/elf64-ppc.c	2009-06-22 15:56:55.000000000 +0100
+++ ./bfd/elf64-ppc.c	2009-06-22 16:00:39.000000000 +0100
@@ -11466,7 +11466,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.51.0.10-set-long-long.patch:

--- NEW FILE binutils-2.19.51.0.10-set-long-long.patch ---
diff -rup ../binutils-2.19.51.0.10.orig/bfd/configure ./bfd/configure
--- ../binutils-2.19.51.0.10.orig/bfd/configure	2009-06-22 16:16:08.000000000 +0100
+++ ./bfd/configure	2009-06-22 16:16:14.000000000 +0100
@@ -13924,11 +13924,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.19.51.0.10.orig/bfd/configure.in ./bfd/configure.in
--- ../binutils-2.19.51.0.10.orig/bfd/configure.in	2009-06-22 16:16:08.000000000 +0100
+++ ./bfd/configure.in	2009-06-22 16:16:14.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

binutils-2.19.51.0.10-version.patch:

--- NEW FILE binutils-2.19.51.0.10-version.patch ---
--- ../binutils-2.19.51.0.10.orig/bfd/Makefile.am	2009-06-22 15:56:55.000000000 +0100
+++ ./bfd/Makefile.am	2009-06-22 16:13:31.000000000 +0100
@@ -1038,12 +1038,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.51.0.10.orig/bfd/Makefile.in	2009-06-22 15:56:55.000000000 +0100
+++ ./bfd/Makefile.in	2009-06-22 16:13:31.000000000 +0100
@@ -1639,12 +1639,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.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	5 Feb 2009 16:21:55 -0000	1.43
+++ .cvsignore	22 Jun 2009 16:18:17 -0000	1.44
@@ -1 +1 @@
-binutils-2.19.51.0.2.tar.bz2
+binutils-2.19.51.0.10.tar.bz2


Index: binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -p -r1.164 -r1.165
--- binutils.spec	11 Jun 2009 15:16:20 -0000	1.164
+++ binutils.spec	22 Jun 2009 16:18:17 -0000	1.165
@@ -16,25 +16,20 @@
 
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
-Version: 2.19.51.0.2
-Release: 21%{?dist}
+Version: 2.19.51.0.10
+Release: 22%{?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.50.0.1-libtool-lib64.patch
-Patch02: binutils-2.19.50.0.1-ppc64-pie.patch
+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.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-build-id.patch
-Patch08: binutils-2.19.51.0.2-ifunc.patch
-Patch09: binutils-2.19.51.0.2-IBM.patch
-Patch10: binutils-2.19.51.0.2-tls-get-addr.patch
-Patch11: binutils-2.19.51.0.2-pr10255.patch
-Patch12: binutils-2.19.51.0.2-sisreg.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
 
 %if 0%{?_with_debug:1}
 # Define this if you want to skip the strip step and preserve debug info.
@@ -73,10 +68,11 @@ assemblers), gprof (for displaying call 
 GNU linker), nm (for listing symbols from object files), objcopy (for
 copying and translating object files), objdump (for displaying
 information from object files), ranlib (for generating an index for
-the contents of an archive), size (for listing the section sizes of an
-object or archive file), strings (for listing printable strings from
-files), strip (for discarding symbols), and addr2line (for converting
-addresses to file and line).
+the contents of an archive), readelf (for displaying detailed
+information about binary files), size (for listing the section sizes
+of an object or archive file), strings (for listing printable strings
+from files), strip (for discarding symbols), and addr2line (for
+converting addresses to file and line).
 
 %package devel
 Summary: BFD and opcodes static libraries and header files
@@ -101,15 +97,10 @@ to consider using libelf instead of BFD.
 %patch03 -p0 -b .ia64-lib64~
 %endif
 %endif
-%patch04 -p0 -b .symbolic-envvar-revert~
+%patch04 -p0 -b .envvar-revert~
 %patch05 -p0 -b .version~
 %patch06 -p0 -b .set-long-long~
 %patch07 -p0 -b .build-id~
-%patch08 -p1 -b .ifunc~
-%patch09 -p0 -b .IBM~
-%patch10 -p0 -b .tls-get-addr~
-%patch11 -p0 -b .pr10255~
-%patch12 -p0 -b .sisreg~
 
 # We cannot run autotools as there is an exact requirement of autoconf-2.59.
 
@@ -353,6 +344,9 @@ fi
 %endif # %{isnative}
 
 %changelog
+* Mon Jun 22 2009 Nick Clifton <nickc at redhat.com> 2.19.51.0.10-22
+- Rebase sources on the 2.19.51.0.10 tarball.
+
 * Thu Jun 11 2009 Nick Clifton <nickc at redhat.com> 2.19.51.0.2-21
 - Do not attempt to set execute permission on non-regular files.  (BZ 503426)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	5 Feb 2009 16:21:55 -0000	1.43
+++ sources	22 Jun 2009 16:18:17 -0000	1.44
@@ -1 +1 @@
-2b019d9f3c46a5bb775b42ab55f199cc  binutils-2.19.51.0.2.tar.bz2
+d8d6136bb1142080d229f799bf85345f  binutils-2.19.51.0.10.tar.bz2


--- binutils-2.19.50.0.1-build-id.patch DELETED ---


--- binutils-2.19.50.0.1-gcc_except_table.patch DELETED ---


--- binutils-2.19.50.0.1-libtool-lib64.patch DELETED ---


--- binutils-2.19.50.0.1-ppc64-pie.patch DELETED ---


--- binutils-2.19.50.0.1-set-long-long.patch DELETED ---


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


--- binutils-2.19.50.0.1-version.patch DELETED ---


--- binutils-2.19.51.0.2-IBM.patch DELETED ---


--- binutils-2.19.51.0.2-ifunc.patch DELETED ---


--- binutils-2.19.51.0.2-pr10255.patch DELETED ---


--- binutils-2.19.51.0.2-sisreg.patch DELETED ---


--- binutils-2.19.51.0.2-tls-get-addr.patch DELETED ---


