summaryrefslogtreecommitdiff
path: root/patches/binutils
diff options
context:
space:
mode:
authorBryan Hundven <bryanhundven@gmail.com>2015-11-13 05:50:31 (GMT)
committerBryan Hundven <bryanhundven@gmail.com>2015-11-13 05:50:31 (GMT)
commit57de8dcf22d5ddddee6a44f87f45f2c279fdb1ac (patch)
tree9477fd0a23bbe297fd11178b7ed6cd8c3c8a268a /patches/binutils
parent4c9218d51dc3c6c84a8d5c488f234ed7575107c6 (diff)
parent5f3774cd656ba54200cb192fc1454c5232347b70 (diff)
Merge pull request #239 from diorcety-ctng/cc-cygwin-mingw-linux
Canadian cross build = x86_64 Cygwin host = x86_64 MinGW_W64 target = x86_64 GNU/Linux
Diffstat (limited to 'patches/binutils')
-rwxr-xr-xpatches/binutils/2.25.1/310-fix-gold-pthreads-typo.patch14
-rwxr-xr-xpatches/binutils/2.25.1/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch11
-rw-r--r--patches/binutils/2.25.1/330-Dont-link-to-libfl-as-its-unnecessary.patch102
3 files changed, 127 insertions, 0 deletions
diff --git a/patches/binutils/2.25.1/310-fix-gold-pthreads-typo.patch b/patches/binutils/2.25.1/310-fix-gold-pthreads-typo.patch
new file mode 100755
index 0000000..f2e6ff2
--- /dev/null
+++ b/patches/binutils/2.25.1/310-fix-gold-pthreads-typo.patch
@@ -0,0 +1,14 @@
+--- binutils-2.25.1/gold/gold-threads.cc.orig 2014-10-14 08:32:04.000000000 +0100
++++ binutils-2.25.1/gold/gold-threads.cc 2015-10-20 22:38:18.640819300 +0100
+@@ -102,9 +102,9 @@
+ if (err != 0)
+ gold_fatal(_("pthead_mutextattr_init failed: %s"), strerror(err));
+ #ifdef PTHREAD_MUTEX_ADAPTIVE_NP
+- err = pthread_mutextattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP);
++ err = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP);
+ if (err != 0)
+- gold_fatal(_("pthread_mutextattr_settype failed: %s"), strerror(err));
++ gold_fatal(_("pthread_mutexattr_settype failed: %s"), strerror(err));
+ #endif
+
+ err = pthread_mutex_init(&this->mutex_, &attr);
diff --git a/patches/binutils/2.25.1/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch b/patches/binutils/2.25.1/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
new file mode 100755
index 0000000..f9a8af6
--- /dev/null
+++ b/patches/binutils/2.25.1/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
@@ -0,0 +1,11 @@
+--- binutils-2.25.1/gold/gold-threads.cc.orig 2015-10-20 22:39:36.371169400 +0100
++++ binutils-2.25.1/gold/gold-threads.cc 2015-10-20 22:39:38.182772700 +0100
+@@ -101,7 +101,7 @@
+ int err = pthread_mutexattr_init(&attr);
+ if (err != 0)
+ gold_fatal(_("pthead_mutextattr_init failed: %s"), strerror(err));
+-#ifdef PTHREAD_MUTEX_ADAPTIVE_NP
++#if defined(PTHREAD_MUTEX_ADAPTIVE_NP) && !defined(_WIN32)
+ err = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP);
+ if (err != 0)
+ gold_fatal(_("pthread_mutexattr_settype failed: %s"), strerror(err));
diff --git a/patches/binutils/2.25.1/330-Dont-link-to-libfl-as-its-unnecessary.patch b/patches/binutils/2.25.1/330-Dont-link-to-libfl-as-its-unnecessary.patch
new file mode 100644
index 0000000..af4032a
--- /dev/null
+++ b/patches/binutils/2.25.1/330-Dont-link-to-libfl-as-its-unnecessary.patch
@@ -0,0 +1,102 @@
+diff -urN binutils-2.25.1.orig/binutils/configure binutils-2.25.1/binutils/configure
+--- binutils-2.25.1.orig/binutils/configure 2015-10-25 13:18:46.249052806 +0000
++++ binutils-2.25.1/binutils/configure 2015-10-25 13:39:21.339034801 +0000
+@@ -12067,6 +12067,7 @@
+ done
+ test -n "$YACC" || YACC="yacc"
+
++save_LIBS=$LIBS
+ for ac_prog in flex lex
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -12227,6 +12228,8 @@
+ if test "$LEX" = :; then
+ LEX=${am_missing_run}flex
+ fi
++LIBS=$save_LIBS
++LEXLIB=
+
+ ALL_LINGUAS="bg da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr"
+ # If we haven't got the data from the intl directory,
+diff -urN binutils-2.25.1.orig/binutils/configure.ac binutils-2.25.1/binutils/configure.ac
+--- binutils-2.25.1.orig/binutils/configure.ac 2015-10-25 13:18:46.249052806 +0000
++++ binutils-2.25.1/binutils/configure.ac 2015-10-25 13:38:52.969035216 +0000
+@@ -87,7 +87,10 @@
+ fi
+
+ AC_PROG_YACC
++save_LIBS=$LIBS
+ AM_PROG_LEX
++LIBS=$save_LIBS
++LEXLIB=
+
+ ALL_LINGUAS="bg da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr"
+ ZW_GNU_GETTEXT_SISTER_DIR
+diff -urN binutils-2.25.1.orig/gas/configure binutils-2.25.1/gas/configure
+--- binutils-2.25.1.orig/gas/configure 2015-10-25 13:18:46.389052803 +0000
++++ binutils-2.25.1/gas/configure 2015-10-25 15:16:55.988949456 +0000
+@@ -12795,6 +12795,7 @@
+ done
+ test -n "$YACC" || YACC="yacc"
+
++save_LIBS=$LIBS
+ for ac_prog in flex lex
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -12955,6 +12956,8 @@
+ if test "$LEX" = :; then
+ LEX=${am_missing_run}flex
+ fi
++LIBS=$save_LIBS
++LEXLIB=
+
+ ALL_LINGUAS="fr tr es rw id ru fi ja"
+ # If we haven't got the data from the intl directory,
+diff -urN binutils-2.25.1.orig/gas/configure.ac binutils-2.25.1/gas/configure.ac
+--- binutils-2.25.1.orig/gas/configure.ac 2015-10-25 15:15:06.000000000 +0000
++++ binutils-2.25.1/gas/configure.ac 2015-10-25 14:45:32.000000000 +0000
+@@ -717,7 +717,10 @@
+ AC_DEFINE_UNQUOTED(TARGET_OS, "${target_os}", [Target OS.])
+
+ AC_PROG_YACC
++save_LIBS=$LIBS
+ AM_PROG_LEX
++LIBS=$save_LIBS
++LEXLIB=
+
+ ALL_LINGUAS="fr tr es rw id ru fi ja"
+ ZW_GNU_GETTEXT_SISTER_DIR
+diff -urN binutils-2.25.1.orig/ld/configure binutils-2.25.1/ld/configure
+--- binutils-2.25.1.orig/ld/configure 2015-10-25 13:18:47.399052788 +0000
++++ binutils-2.25.1/ld/configure 2015-10-25 15:17:06.472282637 +0000
+@@ -16071,6 +16071,7 @@
+ done
+ test -n "$YACC" || YACC="yacc"
+
++save_LIBS=$LIBS
+ for ac_prog in flex lex
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -16231,6 +16232,8 @@
+ if test "$LEX" = :; then
+ LEX=${am_missing_run}flex
+ fi
++LIBS=$save_LIBS
++LEXLIB=
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+diff -urN binutils-2.25.1.orig/ld/configure.ac binutils-2.25.1/ld/configure.ac
+--- binutils-2.25.1.orig/ld/configure.ac 2015-10-25 13:18:47.415719456 +0000
++++ binutils-2.25.1/ld/configure.ac 2015-10-25 15:14:43.000000000 +0000
+@@ -173,7 +173,10 @@
+ AC_EXEEXT
+
+ AC_PROG_YACC
++save_LIBS=$LIBS
+ AM_PROG_LEX
++LIBS=$save_LIBS
++LEXLIB=
+
+ AM_MAINTAINER_MODE
+ AM_CONDITIONAL(GENINSRC_NEVER, false)