Date: Thu, 29 Nov 2012 15:01:38 +0100 From: Niclas Zeising <zeising@freebsd.org> To: Hans Ottevanger <hans@beastielabs.net> Cc: toolchain@freebsd.org Subject: Re: [CFT] devel/binutils 2.23 Message-ID: <50B76AC2.4050207@freebsd.org> In-Reply-To: <50A4A69B.7030200@freebsd.org> References: <201211141445.qAEEjTXQ047896@mech-cluster241.men.bris.ac.uk> <50A3FCEF.9060204@freebsd.org> <50A4A5A2.2000902@beastielabs.net> <50A4A69B.7030200@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------000501090506000105040402 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit On 11/15/12 09:23, Niclas Zeising wrote: > On 2012-11-15 09:19, Hans Ottevanger wrote: >> On 11/14/12 21:19, Niclas Zeising wrote: >>> On 11/14/12 15:45, Anton Shterenlikht wrote: >>>> It installed fine on ia64 and sparc64, both -current. >>>> I don't know how to test. Please advise if there are >>>> simple tests. >>>> >>>> Also, just to check, I manually deleted *orig files >>>> from under files/ after applying the patch: >>>> >>>> # ls -al /usr/ports/devel/binutils/files/ >>>> total 20 >>>> drwxr-xr-x 2 root wheel 1024 Nov 14 12:58 . >>>> drwxr-xr-x 4 root wheel 512 Nov 14 13:00 .. >>>> -rw-r--r-- 1 root wheel 353 Nov 14 12:55 patch-bfd_Makefile.in >>>> -rw-r--r-- 1 root wheel 297 Nov 14 12:55 patch-gold_Makefile.in >>>> -rw-r--r-- 1 root wheel 471 Nov 14 12:55 patch-gold_script.cc >>>> # >>>> >>>> because I think all files in this directory >>>> will be used as patches, no matter the name. >>>> Am I wrong? >>>> >>>> Anton >>> >>> Just compile test some binaries and see that they link and work ok. >>> The .orig files are left over when running patch, and has to be removed. >>> Sorry if I wasn't clear on that in my previous mail. >>> Thanks for testing! >>> Regards! >> >> Please be aware that apparently something went wrong with the release of >> binutils-2.23 (see the discussion ending in: >> >> http://sourceware.org/ml/binutils/2012-10/msg00339.html >> >> though I doubt the glitches will affect your usage) and it has been >> re-released as binutils-2.23.1. Maybe it is better to base the update if >> the binutils port on that release. >> > > I noticed that late last night, but haven't had time to update the patch > yet. Thank you for pointing it out. > Regards! > Hi! Apologies for the delay. Attached is a patch that updates binutils from 2.22 to 2.23.1. Please test it. The plan is to commit it once 9.1 is out the door and the feature freeze on the ports tree is lifted. Regards! -- Niclas Zeising --------------000501090506000105040402 Content-Type: text/x-patch; name="binutils.2.23.1.update.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="binutils.2.23.1.update.diff" Index: devel/binutils/Makefile =================================================================== --- devel/binutils/Makefile (revision 307959) +++ devel/binutils/Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= binutils -PORTVERSION= 2.22 -PORTREVISION= 3 +PORTVERSION= 2.23.1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEWARE} MASTER_SITE_SUBDIR= binutils/releases Index: devel/binutils/distinfo =================================================================== --- devel/binutils/distinfo (revision 307959) +++ devel/binutils/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (binutils-2.22.tar.bz2) = 6c7af8ed1c8cf9b4b9d6e6fe09a3e1d3d479fe63984ba8b9b26bf356b6313ca9 -SIZE (binutils-2.22.tar.bz2) = 19973532 +SHA256 (binutils-2.23.1.tar.bz2) = 2ab2e5b03e086d12c6295f831adad46b3e1410a3a234933a2e8fac66cb2e7a19 +SIZE (binutils-2.23.1.tar.bz2) = 21455321 Index: devel/binutils/files/patch-bfd__config.bfd =================================================================== --- devel/binutils/files/patch-bfd__config.bfd (revision 307959) +++ devel/binutils/files/patch-bfd__config.bfd (working copy) @@ -1,26 +0,0 @@ ---- ./bfd/config.bfd.orig 2011-07-29 00:35:13.000000000 +0200 -+++ ./bfd/config.bfd 2011-12-21 09:44:40.000000000 +0100 -@@ -1128,6 +1128,11 @@ - targ_selvecs=rs6000coff_vec - want64=true - ;; -+ powerpc64-*-freebsd*) -+ targ_defvec=bfd_elf64_powerpc_freebsd_vec -+ targ_selvecs="bfd_elf64_powerpc_vec bfd_elf32_powerpc_vec bfd_elf32_powerpc_freebsd_vec bfd_elf32_powerpcle_vec rs6000coff_vec rs6000coff64_vec aix5coff64_vec" -+ want64=true -+ ;; - powerpc64-*-elf* | powerpc-*-elf64* | powerpc64-*-linux* | \ - powerpc64-*-*bsd*) - targ_defvec=bfd_elf64_powerpc_vec -@@ -1140,6 +1145,11 @@ - want64=true - ;; - #endif -+ powerpc-*-*freebsd*) -+ targ_defvec=bfd_elf32_powerpc_freebsd_vec -+ targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec bfd_elf32_powerpcle_vec ppcboot_vec" -+ targ64_selvecs="bfd_elf64_powerpc_vec bfd_elf64_powerpcle_vec bfd_elf64_powerpc_freebsd_vec" -+ ;; - powerpc-*-*bsd* | powerpc-*-elf* | powerpc-*-sysv4* | powerpc-*-eabi* | \ - powerpc-*-solaris2* | powerpc-*-linux-* | powerpc-*-rtems* | \ - powerpc-*-chorus*) Index: devel/binutils/files/patch-bfd__configure =================================================================== --- devel/binutils/files/patch-bfd__configure (revision 307959) +++ devel/binutils/files/patch-bfd__configure (working copy) @@ -1,18 +0,0 @@ ---- ./bfd/configure.orig 2011-11-21 12:55:48.000000000 +0100 -+++ ./bfd/configure 2011-12-21 09:44:40.000000000 +0100 -@@ -15262,6 +15262,7 @@ - bfd_elf32_pjl_vec) tb="$tb elf32-pj.lo elf32.lo $elf";; - bfd_elf32_powerpc_vec) tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;; - bfd_elf32_powerpcle_vec) tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;; -+ bfd_elf32_powerpc_freebsd_vec) tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;; - bfd_elf32_powerpc_vxworks_vec) tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;; - bfd_elf32_rx_le_vec) tb="$tb elf32-rx.lo elf32.lo $elf" ;; - bfd_elf32_rx_be_vec) tb="$tb elf32-rx.lo elf32.lo $elf" ;; -@@ -15327,6 +15328,7 @@ - bfd_elf64_mmix_vec) tb="$tb elf64-mmix.lo elf64.lo $elf" target_size=64 ;; - bfd_elf64_powerpc_vec) tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf"; target_size=64 ;; - bfd_elf64_powerpcle_vec) tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf" target_size=64 ;; -+ bfd_elf64_powerpc_freebsd_vec) tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf" target_size=64 ;; - bfd_elf64_s390_vec) tb="$tb elf64-s390.lo elf64.lo $elf"; target_size=64 ;; - bfd_elf64_sh64_vec) tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;; - bfd_elf64_sh64l_vec) tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;; Index: devel/binutils/files/patch-bfd__elf32-ppc.c =================================================================== --- devel/binutils/files/patch-bfd__elf32-ppc.c (revision 307959) +++ devel/binutils/files/patch-bfd__elf32-ppc.c (working copy) @@ -1,36 +0,0 @@ ---- ./bfd/elf32-ppc.c.orig 2011-11-21 10:29:21.000000000 +0100 -+++ ./bfd/elf32-ppc.c 2011-12-21 09:44:40.000000000 +0100 -@@ -9127,6 +9127,24 @@ - - #include "elf32-target.h" - -+/* FreeBSD Target */ -+ -+#undef TARGET_LITTLE_SYM -+#undef TARGET_LITTLE_NAME -+ -+#undef TARGET_BIG_SYM -+#define TARGET_BIG_SYM bfd_elf32_powerpc_freebsd_vec -+#undef TARGET_BIG_NAME -+#define TARGET_BIG_NAME "elf32-powerpc-freebsd" -+ -+#undef ELF_OSABI -+#define ELF_OSABI ELFOSABI_FREEBSD -+ -+#undef elf32_bed -+#define elf32_bed elf32_powerpc_fbsd_bed -+ -+#include "elf32-target.h" -+ - /* VxWorks Target */ - - #undef TARGET_LITTLE_SYM -@@ -9137,6 +9155,8 @@ - #undef TARGET_BIG_NAME - #define TARGET_BIG_NAME "elf32-powerpc-vxworks" - -+#undef ELF_OSABI -+ - /* VxWorks uses the elf default section flags for .plt. */ - static const struct bfd_elf_special_section * - ppc_elf_vxworks_get_sec_type_attr (bfd *abfd ATTRIBUTE_UNUSED, asection *sec) Index: devel/binutils/files/patch-bfd__elf64-ppc.c =================================================================== --- devel/binutils/files/patch-bfd__elf64-ppc.c (revision 307959) +++ devel/binutils/files/patch-bfd__elf64-ppc.c (working copy) @@ -1,25 +0,0 @@ ---- ./bfd/elf64-ppc.c.orig 2011-11-21 10:29:24.000000000 +0100 -+++ ./bfd/elf64-ppc.c 2011-12-21 09:44:40.000000000 +0100 -@@ -13897,3 +13897,22 @@ - } - - #include "elf64-target.h" -+ -+/* FreeBSD support */ -+ -+#undef TARGET_LITTLE_SYM -+#undef TARGET_LITTLE_NAME -+ -+#undef TARGET_BIG_SYM -+#define TARGET_BIG_SYM bfd_elf64_powerpc_freebsd_vec -+#undef TARGET_BIG_NAME -+#define TARGET_BIG_NAME "elf64-powerpc-freebsd" -+ -+#undef ELF_OSABI -+#define ELF_OSABI ELFOSABI_FREEBSD -+ -+#undef elf64_bed -+#define elf64_bed elf64_powerpc_fbsd_bed -+ -+#include "elf64-target.h" -+ Index: devel/binutils/files/patch-bfd__targets.c =================================================================== --- devel/binutils/files/patch-bfd__targets.c (revision 307959) +++ devel/binutils/files/patch-bfd__targets.c (working copy) @@ -1,34 +0,0 @@ ---- ./bfd/targets.c.orig 2011-08-17 02:39:38.000000000 +0200 -+++ ./bfd/targets.c 2011-12-21 09:44:40.000000000 +0100 -@@ -667,6 +667,7 @@ - extern const bfd_target bfd_elf32_pjl_vec; - extern const bfd_target bfd_elf32_powerpc_vec; - extern const bfd_target bfd_elf32_powerpcle_vec; -+extern const bfd_target bfd_elf32_powerpc_freebsd_vec; - extern const bfd_target bfd_elf32_powerpc_vxworks_vec; - extern const bfd_target bfd_elf32_rx_le_vec; - extern const bfd_target bfd_elf32_rx_be_vec; -@@ -729,6 +730,7 @@ - extern const bfd_target bfd_elf64_mmix_vec; - extern const bfd_target bfd_elf64_powerpc_vec; - extern const bfd_target bfd_elf64_powerpcle_vec; -+extern const bfd_target bfd_elf64_powerpc_freebsd_vec; - extern const bfd_target bfd_elf64_s390_vec; - extern const bfd_target bfd_elf64_sh64_vec; - extern const bfd_target bfd_elf64_sh64l_vec; -@@ -1033,6 +1035,7 @@ - &bfd_elf32_powerpc_vec, - &bfd_elf32_powerpc_vxworks_vec, - &bfd_elf32_powerpcle_vec, -+ &bfd_elf32_powerpc_freebsd_vec, - &bfd_elf32_rx_be_vec, - &bfd_elf32_rx_be_ns_vec, - &bfd_elf32_rx_le_vec, -@@ -1095,6 +1098,7 @@ - &bfd_elf64_mmix_vec, - &bfd_elf64_powerpc_vec, - &bfd_elf64_powerpcle_vec, -+ &bfd_elf64_powerpc_freebsd_vec, - &bfd_elf64_s390_vec, - &bfd_elf64_sh64_vec, - &bfd_elf64_sh64l_vec, Index: devel/binutils/files/patch-gas__config__tc-ppc.c =================================================================== --- devel/binutils/files/patch-gas__config__tc-ppc.c (revision 307959) +++ devel/binutils/files/patch-gas__config__tc-ppc.c (working copy) @@ -1,13 +0,0 @@ ---- ./gas/config/tc-ppc.c.orig 2011-06-14 11:03:51.000000000 +0200 -+++ ./gas/config/tc-ppc.c 2011-12-21 09:44:40.000000000 +0100 -@@ -1370,7 +1370,9 @@ - #endif - #endif - #ifdef OBJ_ELF --# ifdef TE_VXWORKS -+# ifdef TE_FreeBSD -+ return (ppc_obj64 ? "elf64-powerpc-freebsd" : "elf32-powerpc-freebsd"); -+# elif defined (TE_VXWORKS) - return "elf32-powerpc-vxworks"; - # else - return (target_big_endian Index: devel/binutils/files/patch-ld__Makefile.in =================================================================== --- devel/binutils/files/patch-ld__Makefile.in (revision 307959) +++ devel/binutils/files/patch-ld__Makefile.in (working copy) @@ -1,29 +0,0 @@ ---- ./ld/Makefile.in.orig 2011-07-22 22:22:37.000000000 +0200 -+++ ./ld/Makefile.in 2011-12-21 09:44:40.000000000 +0100 -@@ -783,6 +783,7 @@ - eelf64ltsmip_fbsd.c \ - eelf64mmix.c \ - eelf64ppc.c \ -+ eelf64ppc_fbsd.c \ - eelf64tilegx.c \ - eelf_l1om.c \ - eelf_l1om_fbsd.c \ -@@ -1180,6 +1181,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64ltsmip_fbsd.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64mmix.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64ppc.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64ppc_fbsd.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64tilegx.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_be.Po@am__quote@ -@@ -3425,6 +3427,10 @@ - ldemul-list.h \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} - ${GENSCRIPTS} elf64ppc "$(tdir_elf64ppc)" -+eelf64ppc_fbsd.c: $(srcdir)/emulparams/elf64ppc_fbsd.sh \ -+ $(srcdir)/emultempl/ppc64elf.em ldemul-list.h \ -+ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} -+ ${GENSCRIPTS} elf64ppc_fbsd "$(tdir_elf64ppc_fbsd)" - eelf64tilegx.c: $(srcdir)/emulparams/elf64tilegx.sh \ - $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/needrelax.em \ - $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} Index: devel/binutils/files/patch-ld__configure.tgt =================================================================== --- devel/binutils/files/patch-ld__configure.tgt (revision 307959) +++ devel/binutils/files/patch-ld__configure.tgt (working copy) @@ -1,22 +0,0 @@ ---- ./ld/configure.tgt.orig 2011-11-21 10:29:37.000000000 +0100 -+++ ./ld/configure.tgt 2011-12-21 09:44:40.000000000 +0100 -@@ -453,10 +453,17 @@ - pj*-*-*) targ_emul=pjelf - ;; - powerpc-*-freebsd* | powerpc-*-kfreebsd*-gnu) -- targ_emul=elf32ppc_fbsd; -- targ_extra_emuls="elf32ppc elf32ppcsim"; -+ targ_emul=elf32ppc_fbsd -+ targ_extra_emuls="elf32ppc elf32ppcsim" - targ_extra_libpath=elf32ppc; - tdir_elf32ppcsim=`echo ${targ_alias} | sed -e 's/ppc/ppcsim/'` ;; -+powerpc64-*-freebsd*) -+ targ_emul=elf64ppc_fbsd -+ targ_extra_emuls="elf64ppc elf32ppc_fbsd elf32ppc" -+ targ_extra_libpath="elf32ppc_fbsd elf32ppc" -+ tdir_elf32ppc=`echo "${targ_alias}" | sed -e 's/64//'` -+ tdir_elf32ppc_fbsd=$tdir_elf32ppc -+ ;; - powerpc*-*-linux*) case "${targ}" in - *64*) targ_emul=elf64ppc - targ_extra_emuls="elf32ppclinux elf32ppc elf32ppcsim" Index: devel/binutils/files/patch-ld__emulparams__elf32ppc_fbsd.sh =================================================================== --- devel/binutils/files/patch-ld__emulparams__elf32ppc_fbsd.sh (revision 307959) +++ devel/binutils/files/patch-ld__emulparams__elf32ppc_fbsd.sh (working copy) @@ -1,8 +0,0 @@ ---- ./ld/emulparams/elf32ppc_fbsd.sh.orig 2002-02-18 10:38:01.000000000 +0100 -+++ ./ld/emulparams/elf32ppc_fbsd.sh 2011-12-21 09:44:40.000000000 +0100 -@@ -1,2 +1,5 @@ - . ${srcdir}/emulparams/elf32ppc.sh - . ${srcdir}/emulparams/elf_fbsd.sh -+ -+OUTPUT_FORMAT="elf32-powerpc-freebsd" -+ Index: devel/binutils/files/patch-ld__emulparams__elf64ppc_fbsd.sh =================================================================== --- devel/binutils/files/patch-ld__emulparams__elf64ppc_fbsd.sh (revision 307959) +++ devel/binutils/files/patch-ld__emulparams__elf64ppc_fbsd.sh (working copy) @@ -1,9 +0,0 @@ ---- ./ld/emulparams/elf64ppc_fbsd.sh.orig 2011-12-21 09:44:40.000000000 +0100 -+++ ./ld/emulparams/elf64ppc_fbsd.sh 2011-12-21 09:44:40.000000000 +0100 -@@ -0,0 +1,6 @@ -+. ${srcdir}/emulparams/elf64ppc.sh -+. ${srcdir}/emulparams/elf_fbsd.sh -+ -+OUTPUT_FORMAT="elf64-powerpc-freebsd" -+DEFAULT_PLT_STATIC_CHAIN=1 -+ Index: devel/binutils/files/patch-ld__emultempl__ppc64elf.em =================================================================== --- devel/binutils/files/patch-ld__emultempl__ppc64elf.em (revision 307959) +++ devel/binutils/files/patch-ld__emultempl__ppc64elf.em (working copy) @@ -1,11 +0,0 @@ ---- ./ld/emultempl/ppc64elf.em.orig 2011-11-21 10:29:39.000000000 +0100 -+++ ./ld/emultempl/ppc64elf.em 2011-12-21 09:44:40.000000000 +0100 -@@ -62,7 +62,7 @@ - static int no_toc_sort = 0; - - /* Set if PLT call stubs should load r11. */ --static int plt_static_chain = 0; -+static int plt_static_chain = ${DEFAULT_PLT_STATIC_CHAIN-0}; - - /* Whether to emit symbols for stubs. */ - static int emit_stub_syms = -1; Index: devel/binutils/pkg-plist =================================================================== --- devel/binutils/pkg-plist (revision 307959) +++ devel/binutils/pkg-plist (working copy) @@ -67,8 +67,15 @@ %%NLS%%share/locale/id/LC_MESSAGES/gas.mo %%NLS%%share/locale/id/LC_MESSAGES/ld.mo %%NLS%%%%GOLD%%share/locale/id/LC_MESSAGES/gold.mo +%%NLS%%share/locale/it/LC_MESSAGES/binutils.mo +%%NLS%%share/locale/it/LC_MESSAGES/gprof.mo +%%NLS%%share/locale/it/LC_MESSAGES/ld.mo +%%NLS%%share/locale/it/LC_MESSAGES/opcodes.mo +%%NLS%%%%GOLD%%share/locale/it/LC_MESSAGES/gold.mo %%NLS%%share/locale/ja/LC_MESSAGES/bfd.mo %%NLS%%share/locale/ja/LC_MESSAGES/binutils.mo +%%NLS%%share/locale/ja/LC_MESSAGES/gas.mo +%%NLS%%share/locale/ja/LC_MESSAGES/gprof.mo %%NLS%%share/locale/ja/LC_MESSAGES/ld.mo %%NLS%%share/locale/ms/LC_MESSAGES/gprof.mo %%NLS%%share/locale/nl/LC_MESSAGES/gprof.mo @@ -88,6 +95,7 @@ %%NLS%%share/locale/rw/LC_MESSAGES/gas.mo %%NLS%%share/locale/rw/LC_MESSAGES/gprof.mo %%NLS%%share/locale/sk/LC_MESSAGES/binutils.mo +%%NLS%%share/locale/sr/LC_MESSAGES/gprof.mo %%NLS%%share/locale/sv/LC_MESSAGES/bfd.mo %%NLS%%share/locale/sv/LC_MESSAGES/binutils.mo %%NLS%%share/locale/sv/LC_MESSAGES/gprof.mo @@ -99,7 +107,11 @@ %%NLS%%share/locale/tr/LC_MESSAGES/gprof.mo %%NLS%%share/locale/tr/LC_MESSAGES/ld.mo %%NLS%%share/locale/tr/LC_MESSAGES/opcodes.mo +%%NLS%%share/locale/uk/LC_MESSAGES/bfd.mo %%NLS%%share/locale/uk/LC_MESSAGES/binutils.mo +%%NLS%%share/locale/uk/LC_MESSAGES/gprof.mo +%%NLS%%share/locale/uk/LC_MESSAGES/ld.mo +%%NLS%%share/locale/uk/LC_MESSAGES/opcodes.mo %%NLS%%share/locale/vi/LC_MESSAGES/bfd.mo %%NLS%%share/locale/vi/LC_MESSAGES/binutils.mo %%NLS%%share/locale/vi/LC_MESSAGES/gprof.mo --------------000501090506000105040402--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?50B76AC2.4050207>