# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1301157119 -3600
# Node ID 44acfa481149cb6a993f8936b4ab45c353037330
# Parent  51aab9414a864abfcbd006e2f49c0cee81e3e7b3
Upgrade to current upstream vendor version and correct autoconf logic.

diff -r 51aab9414a86 -r 44acfa481149 binutils/binutils.patch
--- a/binutils/binutils.patch	Sat Mar 26 17:30:52 2011 +0100
+++ b/binutils/binutils.patch	Sat Mar 26 17:31:59 2011 +0100
@@ -8,9 +8,9 @@
 linker under Solaris 10/amd64.
 
 Index: include/elf/common.h
---- include/elf/common.h.orig	2007-08-28 19:19:40 +0200
-+++ include/elf/common.h	2007-08-29 09:30:04 +0200
-@@ -353,6 +353,9 @@
+--- include/elf/common.h.orig	2010-05-18 05:31:06.000000000 +0200
++++ include/elf/common.h	2010-12-09 16:48:56.000000000 +0100
+@@ -474,6 +474,9 @@
  #define SHT_SUNW_verdef	0x6ffffffd	/* Versions defined by file */
  #define SHT_SUNW_verneed 0x6ffffffe	/* Versions needed by file */
  #define SHT_SUNW_versym	0x6fffffff	/* Symbol versions */
@@ -21,9 +21,9 @@
  #define SHT_GNU_verdef	SHT_SUNW_verdef
  #define SHT_GNU_verneed	SHT_SUNW_verneed
 Index: bfd/elf.c
---- bfd/elf.c.orig	2007-08-28 19:19:33 +0200
-+++ bfd/elf.c	2007-08-29 09:30:04 +0200
-@@ -1793,6 +1793,11 @@
+--- bfd/elf.c.orig	2010-10-29 14:10:24.000000000 +0200
++++ bfd/elf.c	2010-12-09 16:48:57.000000000 +0100
+@@ -1884,6 +1884,11 @@
        elf_tdata (abfd)->dynverref_hdr = *hdr;
        return _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex);
  
@@ -35,7 +35,7 @@
      case SHT_SHLIB:
        return TRUE;
  
-@@ -4682,6 +4687,12 @@
+@@ -5036,6 +5041,12 @@
    else
      i_ehdrp->e_type = ET_REL;
  
@@ -49,9 +49,9 @@
      {
      case bfd_arch_unknown:
 Index: bfd/elf64-x86-64.c
---- bfd/elf64-x86-64.c.orig	2007-08-06 21:59:33 +0200
-+++ bfd/elf64-x86-64.c	2007-08-29 09:30:04 +0200
-@@ -345,7 +345,11 @@
+--- bfd/elf64-x86-64.c.orig	2010-10-21 14:29:02.000000000 +0200
++++ bfd/elf64-x86-64.c	2010-12-09 16:48:57.000000000 +0100
+@@ -360,7 +360,11 @@
  /* The name of the dynamic interpreter.	 This is put in the .interp
     section.  */
  
@@ -69,9 +69,9 @@
 Support FreeBSD >= 4.10 by fixing platform detection.
 
 Index: bfd/configure
---- bfd/configure.orig	2007-08-28 22:19:51 +0200
-+++ bfd/configure	2007-08-29 09:30:04 +0200
-@@ -17459,6 +17459,10 @@
+--- bfd/configure.orig	2010-12-08 09:37:34.000000000 +0100
++++ bfd/configure	2010-12-09 16:48:57.000000000 +0100
+@@ -13876,6 +13876,10 @@
    i[3-7]86-*-bsdi)
  	COREFILE=
  	;;
@@ -88,8 +88,8 @@
 Fight problems with --disable-nls under Solaris
 
 Index: gas/asintl.h
---- gas/asintl.h.orig	2007-08-06 21:59:49 +0200
-+++ gas/asintl.h	2007-08-29 09:30:04 +0200
+--- gas/asintl.h.orig	2007-07-03 13:01:02.000000000 +0200
++++ gas/asintl.h	2010-12-09 16:48:57.000000000 +0100
 @@ -20,6 +20,11 @@
     Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
     02110-1301, USA.  */
@@ -103,8 +103,8 @@
  # ifndef ENABLE_NLS
     /* The Solaris version of locale.h always includes libintl.h.  If we have
 Index: ld/ld.h
---- ld/ld.h.orig	2007-08-06 22:00:19 +0200
-+++ ld/ld.h	2007-08-29 09:30:04 +0200
+--- ld/ld.h.orig	2009-11-26 14:45:25.000000000 +0100
++++ ld/ld.h	2010-12-09 16:48:57.000000000 +0100
 @@ -23,6 +23,11 @@
  #ifndef LD_H
  #define LD_H
@@ -118,9 +118,9 @@
  #endif
  #ifndef SEEK_CUR
 Index: ld/Makefile.in
---- ld/Makefile.in.orig	2007-08-06 22:29:54 +0200
-+++ ld/Makefile.in	2007-08-29 09:30:04 +0200
-@@ -287,7 +287,7 @@
+--- ld/Makefile.in.orig	2010-11-05 11:34:22.000000000 +0100
++++ ld/Makefile.in	2010-12-09 16:48:57.000000000 +0100
+@@ -360,7 +360,7 @@
  # We put the scripts in the directory $(scriptdir)/ldscripts.
  # We can't put the scripts in $(datadir) because the SEARCH_DIR
  # directives need to be different for native and cross linkers.
@@ -132,11 +132,11 @@
 
 -----------------------------------------------------------------------------
 
-workaround problems under Mac OS X.
+Workaround problems under Mac OS X.
 
 Index: libiberty/fibheap.c
---- libiberty/fibheap.c.orig	2005-05-10 17:33:33 +0200
-+++ libiberty/fibheap.c	2007-08-29 09:30:04 +0200
+--- libiberty/fibheap.c.orig	2009-05-29 05:01:15.000000000 +0200
++++ libiberty/fibheap.c	2010-12-09 16:48:57.000000000 +0100
 @@ -34,8 +34,11 @@
  #include "libiberty.h"
  #include "fibheap.h"
@@ -161,38 +161,18 @@
 any problems and this message really confused, just disable it for now.
 
 Index: bfd/elf-eh-frame.c
---- bfd/elf-eh-frame.c.orig	2007-08-06 21:59:22 +0200
-+++ bfd/elf-eh-frame.c	2007-11-11 15:46:44 +0100
-@@ -970,9 +970,11 @@
-   return offset != sec->rawsize;
+--- bfd/elf-eh-frame.c.orig	2010-04-09 16:40:15.000000000 +0200
++++ bfd/elf-eh-frame.c	2010-12-09 16:48:57.000000000 +0100
+@@ -909,9 +909,11 @@
+   goto success;
  
- free_no_table:
+  free_no_table:
 +#if 0
    (*info->callbacks->einfo)
      (_("%P: error in %B(%A); no .eh_frame_hdr table will be created.\n"),
       abfd, sec);
 +#endif
-   if (ehbuf)
-     free (ehbuf);
+   hdr_info->table = FALSE;
    if (sec_info)
-Index: bfd/elflink.c
-diff -Nau bfd/elflink.c.orig bfd/elflink.c
---- bfd/elflink.c.orig	2007-08-24 16:01:08.000000000 +0200
-+++ bfd/elflink.c	2009-01-11 14:07:54.705525343 +0100
-@@ -4231,7 +4231,15 @@
- 		    h->ref_regular_nonweak = 1;
- 		}
- 	      else
--		h->def_regular = 1;
-+		{
-+		  h->def_regular = 1;
-+		  if (h->def_dynamic)
-+		    {
-+		      h->def_dynamic = 0;
-+		      h->ref_dynamic = 1;
-+		      h->dynamic_def = 1;
-+		    }
-+		}
- 	      if (! info->executable
- 		  || h->def_dynamic
- 		  || h->ref_dynamic)
+     free (sec_info);
+
diff -r 51aab9414a86 -r 44acfa481149 binutils/binutils.spec
--- a/binutils/binutils.spec	Sat Mar 26 17:30:52 2011 +0100
+++ b/binutils/binutils.spec	Sat Mar 26 17:31:59 2011 +0100
@@ -1,6 +1,6 @@
 ##
 ##  binutils.spec -- OpenPKG RPM Package Specification
-##  Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/>
+##  Copyright (c) 2000-2010 OpenPKG Foundation e.V. <http://openpkg.net/>
 ##
 ##  Permission to use, copy, modify, and distribute this software for
 ##  any purpose with or without fee is hereby granted, provided that
@@ -31,8 +31,8 @@
 Class:        CORE
 Group:        Compiler
 License:      GPL
-Version:      2.18
-Release:      20090106
+Version:      2.21
+Release:      20101212
 
 #   list of sources
 Source0:      ftp://sources.redhat.com/pub/binutils/releases/binutils-%{version}.tar.bz2
@@ -41,8 +41,8 @@
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20060419, make
-PreReq:       OpenPKG, openpkg >= 20060419
+BuildPreReq:  OpenPKG, openpkg >= 20060823, make
+PreReq:       OpenPKG, openpkg >= 20060823
 AutoReq:      no
 AutoReqProv:  no
 
@@ -96,6 +96,8 @@
     CONFIG_SHELL="%{l_bash}" \
     ./configure \
         --prefix=%{l_prefix} \
+        --mandir=%{l_prefix}/man \
+        --infodir=%{l_prefix}/info \
         --includedir=%{l_prefix}/include/binutils \
         --libdir=%{l_prefix}/lib/binutils \
         --disable-werror \
@@ -103,7 +105,7 @@
         $ARGS
 
     #   build package
-    %{l_make} %{l_mflags}
+    %{l_make} %{l_mflags} GREP="grep"
 
 %install
     rm -rf $RPM_BUILD_ROOT
@@ -112,6 +114,8 @@
     %{l_make} %{l_mflags} install \
         prefix=$RPM_BUILD_ROOT%{l_prefix} \
         exec_prefix=$RPM_BUILD_ROOT%{l_prefix} \
+        mandir=$RPM_BUILD_ROOT%{l_prefix}/man \
+        infodir=$RPM_BUILD_ROOT%{l_prefix}/info \
         includedir=$RPM_BUILD_ROOT%{l_prefix}/include/binutils \
         libdir=$RPM_BUILD_ROOT%{l_prefix}/lib/binutils
 
@@ -143,6 +147,7 @@
     rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/dlltool.1
     rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/nlmconv.1
     rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/windres.1
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/windmc.1
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/*-*-*
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/bin/c++filt
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true