[Midnightbsd-cvs] mports [19078] trunk/devel/binutils/files: fixup patches
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat May 23 14:29:23 EDT 2015
Revision: 19078
http://svnweb.midnightbsd.org/mports/?rev=19078
Author: laffer1
Date: 2015-05-23 14:29:22 -0400 (Sat, 23 May 2015)
Log Message:
-----------
fixup patches
Removed Paths:
-------------
trunk/devel/binutils/files/patch-bfd-config.bfd
trunk/devel/binutils/files/patch-gas-Makefile.am
trunk/devel/binutils/files/patch-gas-Makefile.in
trunk/devel/binutils/files/patch-gas-config-te-armfbsdeabi.h
trunk/devel/binutils/files/patch-gas-config-te-armfbsdvfp.h
trunk/devel/binutils/files/patch-gas-configure.tgt
trunk/devel/binutils/files/patch-gold_Makefile.in
trunk/devel/binutils/files/patch-gold_config.in
trunk/devel/binutils/files/patch-gold_configure
trunk/devel/binutils/files/patch-gold_script.cc
trunk/devel/binutils/files/patch-gold_stringpool.cc
trunk/devel/binutils/files/patch-gold_system.h
trunk/devel/binutils/files/patch-ld-Makefile.am
trunk/devel/binutils/files/patch-ld-Makefile.in
trunk/devel/binutils/files/patch-ld-emulparams-armelf_fbsd.sh
trunk/devel/binutils/files/patch-ld-emulparams-armelfb_fbsd.sh
Deleted: trunk/devel/binutils/files/patch-bfd-config.bfd
===================================================================
--- trunk/devel/binutils/files/patch-bfd-config.bfd 2015-05-23 18:28:14 UTC (rev 19077)
+++ trunk/devel/binutils/files/patch-bfd-config.bfd 2015-05-23 18:29:22 UTC (rev 19078)
@@ -1,20 +0,0 @@
---- bfd/config.bfd.orig 1970-01-01 00:07:43.000000000 +0000
-+++ bfd/config.bfd 1970-01-01 00:09:21.000000000 +0000
-@@ -323,7 +323,7 @@
- targ_defvec=bfd_elf32_littlearm_vec
- targ_selvecs=bfd_elf32_bigarm_vec
- ;;
-- armeb-*-elf | arm*b-*-linux-*)
-+ armeb-*-elf | arm*b-*-freebsd* | arm*b-*-linux-*)
- targ_defvec=bfd_elf32_bigarm_vec
- targ_selvecs=bfd_elf32_littlearm_vec
- ;;
-@@ -331,7 +331,7 @@
- targ_defvec=bfd_elf32_littlearm_vec
- targ_selvecs=bfd_elf32_bigarm_vec
- ;;
-- arm-*-elf | arm-*-freebsd* | arm*-*-linux-* | arm*-*-conix* | \
-+ arm-*-elf | arm*-*-freebsd* | arm*-*-linux-* | arm*-*-conix* | \
- arm*-*-uclinux* | arm-*-kfreebsd*-gnu | \
- arm*-*-eabi* )
- targ_defvec=bfd_elf32_littlearm_vec
Deleted: trunk/devel/binutils/files/patch-gas-Makefile.am
===================================================================
--- trunk/devel/binutils/files/patch-gas-Makefile.am 2015-05-23 18:28:14 UTC (rev 19077)
+++ trunk/devel/binutils/files/patch-gas-Makefile.am 2015-05-23 18:29:22 UTC (rev 19078)
@@ -1,11 +0,0 @@
---- gas/Makefile.am.orig 1970-01-01 00:12:34.000000000 +0000
-+++ gas/Makefile.am 1970-01-01 00:13:11.000000000 +0000
-@@ -296,6 +296,8 @@
- config/te-386bsd.h \
- config/te-aix5.h \
- config/te-armeabi.h \
-+ config/te-armfbsddeabi.h \
-+ config/te-armfbsdvfp.h \
- config/te-armlinuxeabi.h \
- config/te-dynix.h \
- config/te-epoc-pe.h \
Deleted: trunk/devel/binutils/files/patch-gas-Makefile.in
===================================================================
--- trunk/devel/binutils/files/patch-gas-Makefile.in 2015-05-23 18:28:14 UTC (rev 19077)
+++ trunk/devel/binutils/files/patch-gas-Makefile.in 2015-05-23 18:29:22 UTC (rev 19078)
@@ -1,11 +0,0 @@
---- gas/Makefile.in.orig 1970-01-01 00:12:39.000000000 +0000
-+++ gas/Makefile.in 1970-01-01 00:13:39.000000000 +0000
-@@ -565,6 +565,8 @@
- config/te-386bsd.h \
- config/te-aix5.h \
- config/te-armeabi.h \
-+ config/te-armfbsddeabi.h \
-+ config/te-armfbsdvfp.h \
- config/te-armlinuxeabi.h \
- config/te-dynix.h \
- config/te-epoc-pe.h \
Deleted: trunk/devel/binutils/files/patch-gas-config-te-armfbsdeabi.h
===================================================================
--- trunk/devel/binutils/files/patch-gas-config-te-armfbsdeabi.h 2015-05-23 18:28:14 UTC (rev 19077)
+++ trunk/devel/binutils/files/patch-gas-config-te-armfbsdeabi.h 2015-05-23 18:29:22 UTC (rev 19078)
@@ -1,25 +0,0 @@
---- gas/config/te-armfbsdeabi.h.orig 1970-01-01 00:14:12.000000000 +0000
-+++ gas/config/te-armfbsdeabi.h 1970-01-01 00:14:37.000000000 +0000
-@@ -0,0 +1,22 @@
-+/* Copyright (C) 2004-2014 Free Software Foundation, Inc.
-+
-+ This file is part of GAS, the GNU Assembler.
-+
-+ GAS is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as
-+ published by the Free Software Foundation; either version 3,
-+ or (at your option) any later version.
-+
-+ GAS is distributed in the hope that it will be useful, but
-+ WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
-+ the GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with GAS; see the file COPYING. If not, write to the Free
-+ Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
-+ 02110-1301, USA. */
-+
-+#include "te-freebsd.h"
-+
-+#define EABI_DEFAULT EF_ARM_EABI_VER5
Deleted: trunk/devel/binutils/files/patch-gas-config-te-armfbsdvfp.h
===================================================================
--- trunk/devel/binutils/files/patch-gas-config-te-armfbsdvfp.h 2015-05-23 18:28:14 UTC (rev 19077)
+++ trunk/devel/binutils/files/patch-gas-config-te-armfbsdvfp.h 2015-05-23 18:29:22 UTC (rev 19078)
@@ -1,25 +0,0 @@
---- gas/config/te-armfbsdvfp.h.orig 1970-01-01 00:14:52.000000000 +0000
-+++ gas/config/te-armfbsdvfp.h 1970-01-01 00:14:41.000000000 +0000
-@@ -0,0 +1,22 @@
-+/* Copyright (C) 2004-2014 Free Software Foundation, Inc.
-+
-+ This file is part of GAS, the GNU Assembler.
-+
-+ GAS is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as
-+ published by the Free Software Foundation; either version 3,
-+ or (at your option) any later version.
-+
-+ GAS is distributed in the hope that it will be useful, but
-+ WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
-+ the GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with GAS; see the file COPYING. If not, write to the Free
-+ Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
-+ 02110-1301, USA. */
-+
-+#include "te-armfbsdeabi.h"
-+
-+#define FPU_DEFAULT FPU_ARCH_VFP
Deleted: trunk/devel/binutils/files/patch-gas-configure.tgt
===================================================================
--- trunk/devel/binutils/files/patch-gas-configure.tgt 2015-05-23 18:28:14 UTC (rev 19077)
+++ trunk/devel/binutils/files/patch-gas-configure.tgt 2015-05-23 18:29:22 UTC (rev 19078)
@@ -1,12 +0,0 @@
---- gas/configure.tgt.orig 1970-01-01 00:15:16.000000000 +0000
-+++ gas/configure.tgt 1970-01-01 00:16:31.000000000 +0000
-@@ -136,6 +136,9 @@
- arm-*-symbianelf*) fmt=elf em=symbian ;;
- arm-*-kaos*) fmt=elf ;;
- arm-*-conix*) fmt=elf ;;
-+ arm-*-freebsd9* | armeb-*-freebsd9*) fmt=elf em=freebsd ;;
-+ arm-*-freebsd* | armeb-*-freebsd*) fmt=elf em=armfbsdeabi ;;
-+ arm*-*-freebsd*) fmt=elf em=armfbsdvfp ;;
- arm-*-linux*aout*) fmt=aout em=linux ;;
- arm-*-linux-*eabi*) fmt=elf em=armlinuxeabi ;;
- arm-*-linux-*) fmt=elf em=linux ;;
Deleted: trunk/devel/binutils/files/patch-gold_Makefile.in
===================================================================
--- trunk/devel/binutils/files/patch-gold_Makefile.in 2015-05-23 18:28:14 UTC (rev 19077)
+++ trunk/devel/binutils/files/patch-gold_Makefile.in 2015-05-23 18:29:22 UTC (rev 19078)
@@ -1,11 +0,0 @@
---- gold/Makefile.in.orig 2013-11-04 16:33:39.000000000 +0100
-+++ gold/Makefile.in 2013-12-13 17:15:03.279391312 +0100
-@@ -419,7 +419,7 @@
- -DTOOLLIBDIR="\"$(tooldir)/lib\"" @INCINTL@
-
- LIBIBERTY = ../libiberty/libiberty.a
-- at PLUGINS_TRUE@LIBDL = @DLOPEN_LIBS@
-+ at PLUGINS_TRUE@LIBDL =
- @THREADS_TRUE at THREADSLIB = -lpthread
- AM_YFLAGS = -d
-
Deleted: trunk/devel/binutils/files/patch-gold_config.in
===================================================================
--- trunk/devel/binutils/files/patch-gold_config.in 2015-05-23 18:28:14 UTC (rev 19077)
+++ trunk/devel/binutils/files/patch-gold_config.in 2015-05-23 18:29:22 UTC (rev 19078)
@@ -1,15 +0,0 @@
---- gold/config.in.orig 2012-09-11 11:20:40.000000000 +0200
-+++ gold/config.in 2013-06-22 20:44:46.000000000 +0200
-@@ -190,6 +190,12 @@
- /* Define to 1 if you have the <windows.h> header file. */
- #undef HAVE_WINDOWS_H
-
-+/* Define to 1 if you have the <unordered_map> header file. */
-+#undef HAVE_UNORDERED_MAP
-+
-+/* Define to 1 if you have the <unordered_set> header file. */
-+#undef HAVE_UNORDERED_SET
-+
- /* Define to 1 if you have the <zlib.h> header file. */
- #undef HAVE_ZLIB_H
-
Deleted: trunk/devel/binutils/files/patch-gold_configure
===================================================================
--- trunk/devel/binutils/files/patch-gold_configure 2015-05-23 18:28:14 UTC (rev 19077)
+++ trunk/devel/binutils/files/patch-gold_configure 2015-05-23 18:29:22 UTC (rev 19078)
@@ -1,23 +0,0 @@
---- gold/configure.orig 2013-11-08 11:13:48.000000000 +0100
-+++ gold/configure 2013-12-14 13:03:48.000000000 +0100
-@@ -7133,6 +7133,20 @@
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-+for ac_header in unordered_set unordered_map
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
- for ac_header in tr1/unordered_set tr1/unordered_map
- do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
Deleted: trunk/devel/binutils/files/patch-gold_script.cc
===================================================================
--- trunk/devel/binutils/files/patch-gold_script.cc 2015-05-23 18:28:14 UTC (rev 19077)
+++ trunk/devel/binutils/files/patch-gold_script.cc 2015-05-23 18:29:22 UTC (rev 19078)
@@ -1,17 +0,0 @@
---- gold/script.cc.dist 2012-09-01 19:52:34.000000000 -0500
-+++ gold/script.cc 2012-09-01 19:53:22.000000000 -0500
-@@ -2534,8 +2534,6 @@
- fprintf(f, " }\n");
- }
-
--} // End namespace gold.
--
- // The remaining functions are extern "C", so it's clearer to not put
- // them in namespace gold.
-
-@@ -3391,3 +3389,5 @@
-
- return length;
- }
-+
-+} // End namespace gold.
Deleted: trunk/devel/binutils/files/patch-gold_stringpool.cc
===================================================================
--- trunk/devel/binutils/files/patch-gold_stringpool.cc 2015-05-23 18:28:14 UTC (rev 19077)
+++ trunk/devel/binutils/files/patch-gold_stringpool.cc 2015-05-23 18:29:22 UTC (rev 19078)
@@ -1,23 +0,0 @@
---- gold/stringpool.cc.orig 2010-08-25 10:36:54.000000000 +0200
-+++ gold/stringpool.cc 2013-06-22 21:09:24.000000000 +0200
-@@ -73,7 +73,10 @@ Stringpool_template<Stringpool_char>::re
- {
- this->key_to_offset_.reserve(n);
-
--#if defined(HAVE_TR1_UNORDERED_MAP)
-+#if defined(HAVE_UNORDERED_MAP)
-+ this->string_set_.rehash(this->string_set_.size() + n);
-+ return;
-+#elif defined(HAVE_TR1_UNORDERED_MAP)
- // rehash() implementation is broken in gcc 4.0.3's stl
- //this->string_set_.rehash(this->string_set_.size() + n);
- //return;
-@@ -503,7 +506,7 @@ template<typename Stringpool_char>
- void
- Stringpool_template<Stringpool_char>::print_stats(const char* name) const
- {
--#if defined(HAVE_TR1_UNORDERED_MAP) || defined(HAVE_EXT_HASH_MAP)
-+#if defined(HAVE_UNORDERED_MAP) || defined(HAVE_TR1_UNORDERED_MAP) || defined(HAVE_EXT_HASH_MAP)
- fprintf(stderr, _("%s: %s entries: %zu; buckets: %zu\n"),
- program_name, name, this->string_set_.size(),
- this->string_set_.bucket_count());
Deleted: trunk/devel/binutils/files/patch-gold_system.h
===================================================================
--- trunk/devel/binutils/files/patch-gold_system.h 2015-05-23 18:28:14 UTC (rev 19077)
+++ trunk/devel/binutils/files/patch-gold_system.h 2015-05-23 18:29:22 UTC (rev 19078)
@@ -1,24 +0,0 @@
---- gold/system.h.orig 2013-11-04 16:33:39.000000000 +0100
-+++ gold/system.h 2013-12-14 12:51:17.000000000 +0100
-@@ -57,7 +57,20 @@
-
- // Figure out how to get a hash set and a hash map.
-
--#if defined(HAVE_TR1_UNORDERED_SET) && defined(HAVE_TR1_UNORDERED_MAP) \
-+#if defined(HAVE_UNORDERED_SET) && defined(HAVE_UNORDERED_MAP)
-+
-+#include <unordered_set>
-+#include <unordered_map>
-+
-+// We need a template typedef here.
-+
-+#define Unordered_set std::unordered_set
-+#define Unordered_map std::unordered_map
-+#define Unordered_multimap std::unordered_multimap
-+
-+#define reserve_unordered_map(map, n) ((map)->rehash(n))
-+
-+#elif defined(HAVE_TR1_UNORDERED_SET) && defined(HAVE_TR1_UNORDERED_MAP) \
- && defined(HAVE_TR1_UNORDERED_MAP_REHASH)
-
- #include <tr1/unordered_set>
Deleted: trunk/devel/binutils/files/patch-ld-Makefile.am
===================================================================
--- trunk/devel/binutils/files/patch-ld-Makefile.am 2015-05-23 18:28:14 UTC (rev 19077)
+++ trunk/devel/binutils/files/patch-ld-Makefile.am 2015-05-23 18:29:22 UTC (rev 19078)
@@ -1,22 +0,0 @@
---- ld/Makefile.am.orig 1970-01-01 00:20:49.000000000 +0000
-+++ ld/Makefile.am 1970-01-01 00:30:34.000000000 +0000
-@@ -165,6 +165,7 @@
- earmelf_nbsd.c \
- earmelf_vxworks.c \
- earmelfb.c \
-+ earmelfb_fbsd.c \
- earmelfb_linux.c \
- earmelfb_linux_eabi.c \
- earmelfb_nacl.c \
-@@ -765,6 +766,11 @@
- $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
- $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
- ${GENSCRIPTS} armelfb "$(tdir_armelfb)"
-+earmelfb_fbsd.c: $(srcdir)/emulparams/armelfb_fbsd.sh \
-+ $(srcdir)/emulparams/armelf_fbsd.sh \
-+ $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
-+ $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-+ ${GENSCRIPTS} armelfb_fbsd "$(tdir_armelfb_fbsd)"
- earmelfb_linux.c: $(srcdir)/emulparams/armelfb_linux.sh \
- $(srcdir)/emulparams/armelf_linux.sh \
- $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
Deleted: trunk/devel/binutils/files/patch-ld-Makefile.in
===================================================================
--- trunk/devel/binutils/files/patch-ld-Makefile.in 2015-05-23 18:28:14 UTC (rev 19077)
+++ trunk/devel/binutils/files/patch-ld-Makefile.in 2015-05-23 18:29:22 UTC (rev 19078)
@@ -1,30 +0,0 @@
---- ld/Makefile.in.orig 2013-11-26 11:37:33.000000000 +0000
-+++ ld/Makefile.in 2014-05-15 23:42:02.000000000 +0000
-@@ -473,6 +473,7 @@
- earmelf_nbsd.c \
- earmelf_vxworks.c \
- earmelfb.c \
-+ earmelfb_fbsd.c \
- earmelfb_linux.c \
- earmelfb_linux_eabi.c \
- earmelfb_nacl.c \
-@@ -1109,6 +1110,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/earmelf_nbsd.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/earmelf_vxworks.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/earmelfb.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/earmelfb_fbsd.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/earmelfb_linux.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/earmelfb_linux_eabi.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/earmelfb_nacl.Po at am__quote@
-@@ -2249,6 +2251,11 @@
- $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
- $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
- ${GENSCRIPTS} armelfb "$(tdir_armelfb)"
-+earmelfb_fbsd.c: $(srcdir)/emulparams/armelfb_fbsd.sh \
-+ $(srcdir)/emulparams/armelf_fbsd.sh \
-+ $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
-+ $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-+ ${GENSCRIPTS} armelfb_fbsd "$(tdir_armelfb_fbsd)"
- earmelfb_linux.c: $(srcdir)/emulparams/armelfb_linux.sh \
- $(srcdir)/emulparams/armelf_linux.sh \
- $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
Deleted: trunk/devel/binutils/files/patch-ld-emulparams-armelf_fbsd.sh
===================================================================
--- trunk/devel/binutils/files/patch-ld-emulparams-armelf_fbsd.sh 2015-05-23 18:28:14 UTC (rev 19077)
+++ trunk/devel/binutils/files/patch-ld-emulparams-armelf_fbsd.sh 2015-05-23 18:29:22 UTC (rev 19078)
@@ -1,11 +0,0 @@
---- ld/emulparams/armelf_fbsd.sh.orig 1970-01-01 00:21:26.000000000 +0000
-+++ ld/emulparams/armelf_fbsd.sh 1970-01-01 00:25:53.000000000 +0000
-@@ -1,3 +1,8 @@
- . ${srcdir}/emulparams/armelf.sh
- . ${srcdir}/emulparams/elf_fbsd.sh
- TARGET2_TYPE=got-rel
-+MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
-+GENERATE_PIE_SCRIPT=yes
-+
-+unset STACK_ADDR
-+unset EMBEDDED
Deleted: trunk/devel/binutils/files/patch-ld-emulparams-armelfb_fbsd.sh
===================================================================
--- trunk/devel/binutils/files/patch-ld-emulparams-armelfb_fbsd.sh 2015-05-23 18:28:14 UTC (rev 19077)
+++ trunk/devel/binutils/files/patch-ld-emulparams-armelfb_fbsd.sh 2015-05-23 18:29:22 UTC (rev 19078)
@@ -1,5 +0,0 @@
---- ld/emulparams/armelfb_fbsd.sh.orig 1970-01-01 00:21:38.000000000 +0000
-+++ ld/emulparams/armelfb_fbsd.sh 1970-01-01 00:25:49.000000000 +0000
-@@ -0,0 +1,2 @@
-+. ${srcdir}/emulparams/armelf_fbsd.sh
-+OUTPUT_FORMAT="elf32-bigarm"
More information about the Midnightbsd-cvs
mailing list