From 1af2172b5c67bb4c91772afafad0a40b0ff11943 Mon Sep 17 00:00:00 2001 From: ryoon Date: Mon, 15 Aug 2016 19:29:13 +0000 Subject: Update to 2.26.1 * Remove merged patches Changelog: gas: * Add a configure option --enable-x86-relax-relocations to decide whether x86 assembler should generate relax relocations by default. Default to yes, except for x86 Solaris targets older than Solaris 12. * New command line option -mrelax-relocations= for x86 target to control whether to generate relax relocations. --- devel/binutils/Makefile | 5 +- devel/binutils/distinfo | 14 ++--- devel/binutils/patches/patch-gas_config.in | 16 ----- devel/binutils/patches/patch-gas_config_tc-i386.c | 77 ----------------------- devel/binutils/patches/patch-gas_configure | 76 ---------------------- devel/binutils/patches/patch-ld_configure | 13 ---- 6 files changed, 7 insertions(+), 194 deletions(-) delete mode 100644 devel/binutils/patches/patch-gas_config.in delete mode 100644 devel/binutils/patches/patch-gas_config_tc-i386.c delete mode 100644 devel/binutils/patches/patch-gas_configure delete mode 100644 devel/binutils/patches/patch-ld_configure (limited to 'devel/binutils') diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile index 40bb74d468e..69fafa5daee 100644 --- a/devel/binutils/Makefile +++ b/devel/binutils/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.73 2016/07/09 06:38:05 wiz Exp $ +# $NetBSD: Makefile,v 1.74 2016/08/15 19:29:13 ryoon Exp $ -DISTNAME= binutils-2.26 -PKGREVISION= 2 +DISTNAME= binutils-2.26.1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=binutils/} diff --git a/devel/binutils/distinfo b/devel/binutils/distinfo index 842434e1124..9b3beaf7264 100644 --- a/devel/binutils/distinfo +++ b/devel/binutils/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.29 2016/02/03 19:56:34 jperkin Exp $ +$NetBSD: distinfo,v 1.30 2016/08/15 19:29:13 ryoon Exp $ -SHA1 (binutils-2.26.tar.bz2) = a637508cffeb2323b14bc8dd65378819768ad4ff -RMD160 (binutils-2.26.tar.bz2) = ce0400ffcc1200280854fefb29f97b63507bad14 -SHA512 (binutils-2.26.tar.bz2) = e77e1b8dbbcbaf9ac2fae95c4403615808af3be03b2e1d32448cd3a7d32c43273f8bcace3f2de84ec120a982879295673029da306e2885dbf5f990584932cfc7 -Size (binutils-2.26.tar.bz2) = 25543552 bytes +SHA1 (binutils-2.26.1.tar.bz2) = 624cd377e3a8eef3db83a56ce289a60f556b3ec2 +RMD160 (binutils-2.26.1.tar.bz2) = a4933fbd12056edc1933d3a5379cd7a2cffef185 +SHA512 (binutils-2.26.1.tar.bz2) = 9d9165609fd3b0f20d616f9891fc8e2b466eb13e2bfce40125e12427f8f201d20e2b8322bb6cb2b45e8df812f0e8ac059149f8a1f69ba3ed9d86a35c6a540b67 +Size (binutils-2.26.1.tar.bz2) = 25595243 bytes SHA1 (patch-aa) = e748bbffa21146cf5c0c50c912f1d84c411fd55c SHA1 (patch-bfd_cache.c) = 20988e84ff2a1d7ff83b5adb04e4f117953205b8 SHA1 (patch-bfd_config.bfd) = 2ca06a7755dffd88344df72206917befff12ae91 @@ -11,15 +11,11 @@ SHA1 (patch-bfd_configure) = 37777852c63bb5b13c76f4085f1e43d50ce88920 SHA1 (patch-bfd_configure.ac) = 742e4c118f6a00b646799862172ffa70a867cf0f SHA1 (patch-bfd_elf32-arm.c) = 8d90dd77cb4925db71def94d2d32cbe3e1cfb69e SHA1 (patch-configure.ac) = 1524f06882f41012ef2bbf960739a4f1f03659c4 -SHA1 (patch-gas_config.in) = 328f356fa7043fbfdc9f537cf3c584454276b76b -SHA1 (patch-gas_config_tc-i386.c) = 47b601d62adcbfbb8878be642595e77a0df70ca1 -SHA1 (patch-gas_configure) = 32bdcec45f41bc33e94158ea0d12f44d693d774f SHA1 (patch-gas_configure.tgt) = 056713626741047d7aba48fe29c471e294a0446d SHA1 (patch-gold_Makefile.in) = aef43853a28450c496cc39a70d18f4cb1911ee3d SHA1 (patch-gold_options.h) = 71b28e8090df0a431354cc47b2897979773b8bd6 SHA1 (patch-gold_resolve.cc) = d93ce96cf97289f8947707f4ff3f5a837d8cb4de SHA1 (patch-gold_system.h) = 9151878fe25dfee33f839cd63e465d30481dda7a SHA1 (patch-include_safe-ctype.h) = d0fcfb2830f0c90816f63906f618a1d6df010a9f -SHA1 (patch-ld_configure) = 2c6fdb4dc7af4ee58100910029be70fd9e5c90e0 SHA1 (patch-ld_configure.tgt) = 06ac3cbb3c397123a6a4a3fdb19828f074282c60 SHA1 (patch-libiberty_Makefile.in) = 59c479e6fe491e17837d421f5b4b25a81dc5e7c9 diff --git a/devel/binutils/patches/patch-gas_config.in b/devel/binutils/patches/patch-gas_config.in deleted file mode 100644 index 7bba57791d8..00000000000 --- a/devel/binutils/patches/patch-gas_config.in +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-gas_config.in,v 1.1 2016/02/03 19:56:34 jperkin Exp $ - -Backport SunOS fix from 2.26.1 - ---- gas/config.in.orig 2015-11-13 08:27:41.000000000 +0000 -+++ gas/config.in -@@ -39,6 +39,9 @@ - /* Define if you want compressed debug sections by default. */ - #undef DEFAULT_FLAG_COMPRESS_DEBUG - -+/* Define to 1 if you want to generate x86 relax relocations by default. */ -+#undef DEFAULT_GENERATE_X86_RELAX_RELOCATIONS -+ - /* Supported emulations. */ - #undef EMULATIONS - diff --git a/devel/binutils/patches/patch-gas_config_tc-i386.c b/devel/binutils/patches/patch-gas_config_tc-i386.c deleted file mode 100644 index 2c5c0bef252..00000000000 --- a/devel/binutils/patches/patch-gas_config_tc-i386.c +++ /dev/null @@ -1,77 +0,0 @@ -$NetBSD: patch-gas_config_tc-i386.c,v 1.3 2016/02/03 19:56:34 jperkin Exp $ - -Backport SunOS fix from 2.26.1. - ---- gas/config/tc-i386.c.orig 2016-01-25 08:51:06.000000000 +0000 -+++ gas/config/tc-i386.c -@@ -552,6 +552,10 @@ static int allow_index_reg = 0; - specified explicitly. */ - static int omit_lock_prefix = 0; - -+/* 1 if the assembler should generate relax relocations. */ -+static int generate_relax_relocations -+ = DEFAULT_GENERATE_X86_RELAX_RELOCATIONS; -+ - static enum check_kind - { - check_none = 0, -@@ -7241,9 +7245,14 @@ output_disp (fragS *insn_start_frag, off - /* Check for "call/jmp *mem", "mov mem, %reg", - "test %reg, mem" and "binop mem, %reg" where binop - is one of adc, add, and, cmp, or, sbb, sub, xor -- instructions. */ -- if ((i.rm.mode == 2 -- || (i.rm.mode == 0 && i.rm.regmem == 5)) -+ instructions. Always generate R_386_GOT32X for -+ "sym*GOT" operand in 32-bit mode. */ -+ if ((generate_relax_relocations -+ || (!object_64bit -+ && i.rm.mode == 0 -+ && i.rm.regmem == 5)) -+ && (i.rm.mode == 2 -+ || (i.rm.mode == 0 && i.rm.regmem == 5)) - && ((i.operands == 1 - && i.tm.base_opcode == 0xff - && (i.rm.reg == 2 || i.rm.reg == 4)) -@@ -9616,6 +9625,7 @@ const char *md_shortopts = "qn"; - #define OPTION_MSHARED (OPTION_MD_BASE + 21) - #define OPTION_MAMD64 (OPTION_MD_BASE + 22) - #define OPTION_MINTEL64 (OPTION_MD_BASE + 23) -+#define OPTION_MRELAX_RELOCATIONS (OPTION_MD_BASE + 24) - - struct option md_longopts[] = - { -@@ -9647,6 +9657,7 @@ struct option md_longopts[] = - {"mbig-obj", no_argument, NULL, OPTION_MBIG_OBJ}, - #endif - {"momit-lock-prefix", required_argument, NULL, OPTION_OMIT_LOCK_PREFIX}, -+ {"mrelax-relocations", required_argument, NULL, OPTION_MRELAX_RELOCATIONS}, - {"mevexrcig", required_argument, NULL, OPTION_MEVEXRCIG}, - {"mamd64", no_argument, NULL, OPTION_MAMD64}, - {"mintel64", no_argument, NULL, OPTION_MINTEL64}, -@@ -9966,6 +9977,15 @@ md_parse_option (int c, char *arg) - as_fatal (_("invalid -momit-lock-prefix= option: `%s'"), arg); - break; - -+ case OPTION_MRELAX_RELOCATIONS: -+ if (strcasecmp (arg, "yes") == 0) -+ generate_relax_relocations = 1; -+ else if (strcasecmp (arg, "no") == 0) -+ generate_relax_relocations = 0; -+ else -+ as_fatal (_("invalid -mrelax-relocations= option: `%s'"), arg); -+ break; -+ - case OPTION_MAMD64: - cpu_arch_flags.bitfield.cpuamd64 = 1; - cpu_arch_flags.bitfield.cpuintel64 = 0; -@@ -10146,6 +10166,9 @@ md_show_usage (FILE *stream) - -momit-lock-prefix=[no|yes]\n\ - strip all lock prefixes\n")); - fprintf (stream, _("\ -+ -mrelax-relocations=[no|yes]\n\ -+ generate relax relocations\n")); -+ fprintf (stream, _("\ - -mamd64 accept only AMD64 ISA\n")); - fprintf (stream, _("\ - -mintel64 accept only Intel64 ISA\n")); diff --git a/devel/binutils/patches/patch-gas_configure b/devel/binutils/patches/patch-gas_configure deleted file mode 100644 index 694bdb1b972..00000000000 --- a/devel/binutils/patches/patch-gas_configure +++ /dev/null @@ -1,76 +0,0 @@ -$NetBSD: patch-gas_configure,v 1.4 2016/02/03 19:56:34 jperkin Exp $ - -Backport SunOS fix from 2.26.1 - ---- gas/configure.orig 2016-01-25 08:54:08.000000000 +0000 -+++ gas/configure -@@ -765,6 +765,7 @@ enable_largefile - enable_targets - enable_checking - enable_compressed_debug_sections -+enable_x86_relax_relocations - enable_werror - enable_build_warnings - enable_nls -@@ -1415,6 +1416,8 @@ Optional Features: - --enable-checking enable run-time checks - --enable-compressed-debug-sections={all,gas,none} - compress debug sections by default] -+ --enable-x86-relax-relocations -+ generate x86 relax relocations by default - --enable-werror treat compile warnings as errors - --enable-build-warnings enable build-time compiler warnings - --disable-nls do not use Native Language Support -@@ -11680,6 +11683,17 @@ if test "${enable_compressed_debug_secti - esac - fi - -+# PR gas/19520 -+# Decide if x86 assembler should generate relax relocations. -+ac_default_x86_relax_relocations=unset -+# Provide a configure time option to override our default. -+# Check whether --enable-x86_relax_relocations was given. -+if test "${enable_x86_relax_relocations+set}" = set; then : -+ enableval=$enable_x86_relax_relocations; case "${enableval}" in -+ no) ac_default_x86_relax_relocations=0 ;; -+esac -+fi -+ - using_cgen=no - - -@@ -12085,6 +12099,17 @@ $as_echo "#define STRICTCOFF 1" >>confde - - ;; - -+ i386-*-solaris2 \ -+ | x86_64-*-solaris2 \ -+ | i386-*-solaris2.[0-9] \ -+ | i386-*-solaris2.1[01] \ -+ | x86_64-*-solaris2.1[01]) -+ if test ${this_target} = $target \ -+ && test ${ac_default_x86_relax_relocations} = unset; then -+ ac_default_x86_relax_relocations=0 -+ fi -+ ;; -+ - i860-*-*) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GAS support for ${generic_target} is preliminary and a work in progress" >&5 - $as_echo "$as_me: WARNING: GAS support for ${generic_target} is preliminary and a work in progress" >&2;} -@@ -12505,7 +12530,15 @@ _ACEOF - - done - --if test x$ac_default_compressed_debug_sections == xyes ; then -+if test ${ac_default_x86_relax_relocations} = unset; then -+ ac_default_x86_relax_relocations=1 -+fi -+ -+cat >>confdefs.h <<_ACEOF -+#define DEFAULT_GENERATE_X86_RELAX_RELOCATIONS $ac_default_x86_relax_relocations -+_ACEOF -+ -+if test x$ac_default_compressed_debug_sections = xyes ; then - - $as_echo "#define DEFAULT_FLAG_COMPRESS_DEBUG 1" >>confdefs.h - diff --git a/devel/binutils/patches/patch-ld_configure b/devel/binutils/patches/patch-ld_configure deleted file mode 100644 index 04b09000a72..00000000000 --- a/devel/binutils/patches/patch-ld_configure +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ld_configure,v 1.1 2016/01/30 22:15:11 ryoon Exp $ - ---- ld/configure.orig 2016-01-25 08:54:11.000000000 +0000 -+++ ld/configure -@@ -17134,7 +17134,7 @@ do - fi - done - --if test x$ac_default_compressed_debug_sections == xyes ; then -+if test x$ac_default_compressed_debug_sections = xyes ; then - - $as_echo "#define DEFAULT_FLAG_COMPRESS_DEBUG 1" >>confdefs.h - -- cgit v1.2.3