rpms/binutils/F-9 binutils-2.18.50.0.6-spu_ovl-dependency.patch, NONE, 1.1 binutils-2.18.50.0.6-spu_ovl-fatal.patch, NONE, 1.1 binutils-2.18.50.0.6-place-orphan.patch, 1.1, 1.2 binutils.spec, 1.134, 1.135

Jan Kratochvil (jkratoch) fedora-extras-commits at redhat.com
Thu Jul 31 07:30:19 UTC 2008 

Author: jkratoch

Update of /cvs/pkgs/rpms/binutils/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32382

Modified Files:
	binutils-2.18.50.0.6-place-orphan.patch binutils.spec 
Added Files:
	binutils-2.18.50.0.6-spu_ovl-dependency.patch 
	binutils-2.18.50.0.6-spu_ovl-fatal.patch 
Log Message:
* Thu Jul 31 2008 Jan Kratochvil <jan.kratochvil at redhat.com> 2.18.50.0.6-5
- Enable the spu target on ppc/ppc64 (BZ 455242).


binutils-2.18.50.0.6-spu_ovl-dependency.patch:

--- NEW FILE binutils-2.18.50.0.6-spu_ovl-dependency.patch ---
2008-07-30  Jan Kratochvil  <jan.kratochvil at redhat.com>

	* Makefile.def: ld's spu_ovl.o depends on gas and binutils.
	* Makefile.in: Regenerate.

--- Makefile.def	30 Jul 2008 15:03:54 -0000	1.92
+++ Makefile.def	30 Jul 2008 21:18:12 -0000
@@ -378,6 +378,9 @@ dependencies = { module=all-ld; on=all-b
 dependencies = { module=all-ld; on=all-build-byacc; };
 dependencies = { module=all-ld; on=all-build-flex; };
 dependencies = { module=all-ld; on=all-intl; };
+// spu_ovl.o depends on both gas and binutils/bin2c
+dependencies = { module=all-ld; on=all-gas; };
+dependencies = { module=all-ld; on=all-binutils; };
 dependencies = { module=configure-gold; on=configure-intl; };
 dependencies = { module=all-gold; on=all-libiberty; };
 dependencies = { module=all-gold; on=all-intl; };
--- Makefile.in	30 Jul 2008 15:03:54 -0000	1.285
+++ Makefile.in	30 Jul 2008 21:18:34 -0000
@@ -53308,6 +53308,26 @@ all-stageb3g2-ld: maybe-all-stageb3g2-in
 all-stage4-ld: maybe-all-stage4-intl
 all-stageprofile-ld: maybe-all-stageprofile-intl
 all-stagefeedback-ld: maybe-all-stagefeedback-intl
+all-ld: maybe-all-gas
+
+all-stage1-ld: maybe-all-stage1-gas
+all-stage2-ld: maybe-all-stage2-gas
+all-stageb2g0-ld: maybe-all-stageb2g0-gas
+all-stage3-ld: maybe-all-stage3-gas
+all-stageb3g2-ld: maybe-all-stageb3g2-gas
+all-stage4-ld: maybe-all-stage4-gas
+all-stageprofile-ld: maybe-all-stageprofile-gas
+all-stagefeedback-ld: maybe-all-stagefeedback-gas
+all-ld: maybe-all-binutils
+
+all-stage1-ld: maybe-all-stage1-binutils
+all-stage2-ld: maybe-all-stage2-binutils
+all-stageb2g0-ld: maybe-all-stageb2g0-binutils
+all-stage3-ld: maybe-all-stage3-binutils
+all-stageb3g2-ld: maybe-all-stageb3g2-binutils
+all-stage4-ld: maybe-all-stage4-binutils
+all-stageprofile-ld: maybe-all-stageprofile-binutils
+all-stagefeedback-ld: maybe-all-stagefeedback-binutils
 configure-gold: maybe-configure-intl
 
 configure-stage1-gold: maybe-configure-stage1-intl

binutils-2.18.50.0.6-spu_ovl-fatal.patch:

--- NEW FILE binutils-2.18.50.0.6-spu_ovl-fatal.patch ---
2008-07-30  Jan Kratochvil  <jan.kratochvil at redhat.com>

	* emultempl/spuelf.em: Abort on the missing required `spu_ovl.o'.

--- ld/emultempl/spuelf.em	19 Jun 2008 16:14:53 -0000	1.24
+++ ld/emultempl/spuelf.em	30 Jul 2008 18:28:25 -0000
@@ -57,7 +57,12 @@ char **my_argv;
 static const char ovl_mgr[] = {
 EOF
 
-../binutils/bin2c < ${srcdir}/emultempl/spu_ovl.o >> e${EMULATION_NAME}.c
+if ! ../binutils/bin2c < ${srcdir}/emultempl/spu_ovl.o >> e${EMULATION_NAME}.c
+then
+  echo >&2 "Missing ${srcdir}/emultempl/spu_ovl.o"
+  echo >&2 "You must build gas/as-new with --target=spu to build spu_ovl.o"
+  exit 1
+fi
 
 fragment <<EOF
 };

binutils-2.18.50.0.6-place-orphan.patch:

Index: binutils-2.18.50.0.6-place-orphan.patch
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/F-9/binutils-2.18.50.0.6-place-orphan.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- binutils-2.18.50.0.6-place-orphan.patch	4 Apr 2008 09:48:39 -0000	1.1
+++ binutils-2.18.50.0.6-place-orphan.patch	31 Jul 2008 07:29:49 -0000	1.2
@@ -2,8 +2,8 @@
 
 	* emulparams/elf64ppc.sh (OTHER_GOT_RELOC_SECTIONS): Add .rela.opd.
 
---- ld/emulparams/elf64ppc.sh.jj	2003-07-28 10:24:45.000000000 -0400
-+++ ld/emulparams/elf64ppc.sh	2003-08-05 08:35:58.000000000 -0400
+--- ld/emulparams/elf64ppc.sh	2007-03-16 16:48:30.000000000 +0100
++++ ld/emulparams/elf64ppc.sh	2008-07-25 20:11:20.000000000 +0200
 @@ -28,7 +28,8 @@ else
    .toc		0 : { *(.toc) }"
  fi
@@ -12,5 +12,5 @@
 +  .rela.toc	${RELOCATING-0} : { *(.rela.toc) }
 +  .rela.opd	${RELOCATING-0} : { *(.rela.opd) }"
  OTHER_READWRITE_SECTIONS="
-   .toc1		${RELOCATING-0}${RELOCATING+ALIGN(8)} : { *(.toc1) }
-   .opd		${RELOCATING-0}${RELOCATING+ALIGN(8)} : { KEEP (*(.opd)) }"
+   .toc1		${RELOCATING-0} :${RELOCATING+ ALIGN(8)} { *(.toc1) }
+   .opd		${RELOCATING-0} :${RELOCATING+ ALIGN(8)} { KEEP (*(.opd)) }


Index: binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/F-9/binutils.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- binutils.spec	16 Jul 2008 18:37:16 -0000	1.134
+++ binutils.spec	31 Jul 2008 07:29:49 -0000	1.135
@@ -1,7 +1,7 @@
 Summary: A GNU collection of binary utilities.
 Name: binutils
 Version: 2.18.50.0.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -14,6 +14,8 @@
 Patch6: binutils-2.18.50.0.6-symbolic-envvar-revert.patch
 Patch7: binutils-2.18.50.0.6-version.patch
 Patch8: binutils-2.18.50.0.6-pclmul.patch
+Patch9: binutils-2.18.50.0.6-spu_ovl-fatal.patch
+Patch10: binutils-2.18.50.0.6-spu_ovl-dependency.patch
 
 Buildroot: %{_tmppath}/binutils-root
 BuildRequires: texinfo >= 4.0, dejagnu, gettext, flex, bison
@@ -67,6 +69,10 @@
 %patch6 -p0 -b .symbolic-envvar-revert~
 %patch7 -p0 -b .version~
 %patch8 -p0 -b .pclmul~
+%patch9 -p0 -b .spu_ovl-fatal~
+%patch10 -p0 -b .spu_ovl-dependency~
+
+# We cannot run autotools as there is an exact requirement of autoconf-2.59.
 
 # On ppc64 we might use 64K pages
 sed -i -e '/#define.*ELF_COMMONPAGESIZE/s/0x1000$/0x10000/' bfd/elf*ppc.c
@@ -82,15 +88,34 @@
 touch */configure
 
 %build
-mkdir build-%{_target_platform}
-cd build-%{_target_platform}
 CARGS=
+
 %ifarch sparc ppc s390
-CARGS=--enable-64-bit-bfd
+CARGS="$CARGS --enable-64-bit-bfd"
 %endif
+
 %ifarch ia64
-CARGS=--enable-targets=i386-linux
+CARGS="$CARGS --enable-targets=i386-linux"
 %endif
+
+%ifarch ppc ppc64
+CARGS="$CARGS --enable-targets=spu"
+# This file is present in CVS but missing in H. J. Lu's snapshots.
+# To include it for --enable-targets=spu we need to build gas by --target=spu.
+! test -f ld/emultempl/spu_ovl.o
+mkdir build-spu
+cd build-spu
+CFLAGS="${CFLAGS:-%optflags} -O0 -s" ../configure \
+  --target=spu --disable-shared --enable-static --disable-werror \
+  --with-bugurl=http://bugzilla.redhat.com/bugzilla/
+make %{_smp_mflags} all
+cd ..
+test -f ld/emultempl/spu_ovl.o
+rm -rf build-spu
+%endif
+
+mkdir build-%{_target_platform}
+cd build-%{_target_platform}
 CC="gcc -L`pwd`/bfd/.libs/" CFLAGS="${CFLAGS:-%optflags}" ../configure \
   %{_target_platform} --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \
   --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
@@ -225,6 +250,9 @@
 %{_infodir}/bfd*info*
 
 %changelog
+* Thu Jul 31 2008 Jan Kratochvil <jan.kratochvil at redhat.com> 2.18.50.0.6-5
+- Enable the spu target on ppc/ppc64 (BZ 455242).
+
 * Wed Jul 16 2008 Jan Kratochvil <jan.kratochvil at redhat.com> 2.18.50.0.6-4
 - include the `dist' tag in the Release number
 - libbfd.a symbols visibility is now hidden (for #447426, suggested by Jakub)

More information about the fedora-extras-commits mailing list