binutils: Update to 2.25

This commit is contained in:
Alexpux
2014-12-23 20:52:14 +03:00
parent 10470cb345
commit 1ec8aa42e0
6 changed files with 40 additions and 157 deletions

View File

@@ -128,7 +128,7 @@ diff -Naur binutils-2.24.51/bfd/configure binutils-2.24.51-msys2/bfd/configure
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
;;
+
+ msys*)
+ msys*)
+ # Msys DLLs use 'msys-' prefix rather than 'lib'
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+
@@ -178,9 +178,9 @@ diff -Naur binutils-2.24.51/bfd/configure binutils-2.24.51-msys2/bfd/configure
if test -n "$SHARED_LIBADD"; then
if test -n "$LIBM"; then
if test x"$bfd_cv_ld_as_needed" = xyes; then
diff -Naur binutils-2.24.51/bfd/configure.in binutils-2.24.51-msys2/bfd/configure.in
--- binutils-2.24.51/bfd/configure.in 2013-10-03 18:46:06.000000000 +0400
+++ binutils-2.24.51-msys2/bfd/configure.in 2013-10-24 16:05:08.356000000 +0400
diff -Naur binutils-2.24.51/bfd/configure.ac binutils-2.24.51-msys2/bfd/configure.ac
--- binutils-2.24.51/bfd/configure.ac 2013-10-03 18:46:06.000000000 +0400
+++ binutils-2.24.51-msys2/bfd/configure.ac 2013-10-24 16:05:08.356000000 +0400
@@ -577,8 +577,12 @@
SHARED_LDFLAGS="-no-undefined"
SHARED_LIBADD="-L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin -lkernel32"
@@ -385,9 +385,9 @@ diff -Naur binutils-2.24.51/binutils/configure binutils-2.24.51-msys2/binutils/c
BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
if test -z "$DLLTOOL_DEFAULT"; then
DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_I386"
diff -Naur binutils-2.24.51/binutils/configure.in binutils-2.24.51-msys2/binutils/configure.in
--- binutils-2.24.51/binutils/configure.in 2013-04-05 08:13:41.000000000 +0400
+++ binutils-2.24.51-msys2/binutils/configure.in 2013-10-24 16:05:08.387200000 +0400
diff -Naur binutils-2.24.51/binutils/configure.ac binutils-2.24.51-msys2/binutils/configure.ac
--- binutils-2.24.51/binutils/configure.ac 2013-04-05 08:13:41.000000000 +0400
+++ binutils-2.24.51-msys2/binutils/configure.ac 2013-10-24 16:05:08.387200000 +0400
@@ -302,7 +302,7 @@
BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
@@ -492,6 +492,26 @@ diff -Naur binutils-2.24.51/binutils/testsuite/binutils-all/objcopy.exp binutils
set test_prog "testprog.exe"
} else {
set test_prog "testprog"
@@ -654,6 +654,7 @@
setup_xfail "arm*-*-pe"
setup_xfail "*-*-mingw*"
setup_xfail "*-*-cygwin*"
+ setup_xfail "*-*-msys*"
fail $test1
}
diff -Naur binutils-2.24.51/binutils/testsuite/binutils-all/windres/windres.exp binutils-2.24.51-msys2/binutils/testsuite/binutils-all/windres/windres.exp
--- binutils-2.24.51/binutils/testsuite/binutils-all/windres/windres.exp 2012-03-13 04:41:22.000000000 +0400
+++ binutils-2.24.51-msys2/binutils/testsuite/binutils-all/windres/windres.exp 2013-10-24 16:05:08.402800000 +0400
@@ -19,7 +19,7 @@
# Written by DJ Delorie <dj@redhat.com>
-if {![istarget "i*86-*-*"] && ![istarget "x86_64-*-mingw*"] && ![istarget "x86_64-*-cygwin"] } {
+if {![istarget "i*86-*-*"] && ![istarget "x86_64-*-mingw*"] && ![istarget "x86_64-*-cygwin"] && ![istarget "x86_64-*-msys"] } {
verbose "Not a Cygwin/Mingw target" 1
return
}
diff -Naur binutils-2.24.51/binutils/testsuite/lib/binutils-common.exp binutils-2.24.51-msys2/binutils/testsuite/lib/binutils-common.exp
--- binutils-2.24.51/binutils/testsuite/lib/binutils-common.exp 2013-05-01 21:27:46.000000000 +0400
+++ binutils-2.24.51-msys2/binutils/testsuite/lib/binutils-common.exp 2013-10-24 16:05:08.402800000 +0400
@@ -1599,10 +1619,10 @@ diff -Naur binutils-2.24.51/ld/testsuite/lib/ld-lib.exp binutils-2.24.51-msys2/l
@@ -410,7 +410,7 @@
}
# Windows targets need __main, prefixed with underscore.
# Windows targets need __main, some prefixed with underscore.
- if {[istarget *-*-cygwin* ] || [istarget *-*-mingw*]} {
+ if {[istarget *-*-cygwin* ] || [istarget *-*-mingw*] || [istarget *-*-msys*]} {
append flags " --defsym ___main=0"
append flags " --defsym __main=0 --defsym ___main=0"
}
@@ -1532,6 +1532,7 @@
@@ -2178,9 +2198,9 @@ diff -Naur binutils-2.24.51/opcodes/configure binutils-2.24.51-msys2/opcodes/con
*-*-darwin*)
SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.dylib ${SHARED_LIBADD}"
SHARED_DEPENDENCIES="../bfd/libbfd.la"
diff -Naur binutils-2.24.51/opcodes/configure.in binutils-2.24.51-msys2/opcodes/configure.in
--- binutils-2.24.51/opcodes/configure.in 2013-06-21 19:01:57.000000000 +0400
+++ binutils-2.24.51-msys2/opcodes/configure.in 2013-10-24 16:05:08.605600000 +0400
diff -Naur binutils-2.24.51/opcodes/configure.ac binutils-2.24.51-msys2/opcodes/configure.ac
--- binutils-2.24.51/opcodes/configure.ac 2013-06-21 19:01:57.000000000 +0400
+++ binutils-2.24.51-msys2/opcodes/configure.ac 2013-10-24 16:05:08.605600000 +0400
@@ -170,6 +170,10 @@
SHARED_LDFLAGS="-no-undefined"
SHARED_LIBADD="-L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin"