125 lines
4.5 KiB
Diff
125 lines
4.5 KiB
Diff
diff -Naur gcc-4.9.2-orig/libatomic/aclocal.m4 gcc-4.9.2/libatomic/aclocal.m4
|
|
--- gcc-4.9.2-orig/libatomic/aclocal.m4 2014-10-30 11:28:58.000000000 +0300
|
|
+++ gcc-4.9.2/libatomic/aclocal.m4 2014-11-04 00:10:56.719000000 +0300
|
|
@@ -993,6 +993,7 @@
|
|
m4_include([../config/acx.m4])
|
|
m4_include([../config/depstand.m4])
|
|
m4_include([../config/lead-dot.m4])
|
|
+m4_include([../config/lthostflags.m4])
|
|
m4_include([../config/multi.m4])
|
|
m4_include([../config/override.m4])
|
|
m4_include([../config/stdint.m4])
|
|
diff -Naur gcc-4.9.2-orig/libatomic/configure gcc-4.9.2/libatomic/configure
|
|
--- gcc-4.9.2-orig/libatomic/configure 2014-10-30 11:28:58.000000000 +0300
|
|
+++ gcc-4.9.2/libatomic/configure 2014-11-04 00:10:56.734600000 +0300
|
|
@@ -627,6 +627,7 @@
|
|
MAINTAINER_MODE_TRUE
|
|
enable_static
|
|
enable_shared
|
|
+lt_host_flags
|
|
CPP
|
|
OTOOL64
|
|
OTOOL
|
|
@@ -11106,7 +11107,7 @@
|
|
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
|
lt_status=$lt_dlunknown
|
|
cat > conftest.$ac_ext <<_LT_EOF
|
|
-#line 11109 "configure"
|
|
+#line 11110 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#if HAVE_DLFCN_H
|
|
@@ -11212,7 +11213,7 @@
|
|
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
|
lt_status=$lt_dlunknown
|
|
cat > conftest.$ac_ext <<_LT_EOF
|
|
-#line 11215 "configure"
|
|
+#line 11216 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#if HAVE_DLFCN_H
|
|
@@ -11450,6 +11451,28 @@
|
|
|
|
|
|
|
|
+
|
|
+
|
|
+case $host in
|
|
+ *-cygwin* | *-mingw*)
|
|
+ # 'host' will be top-level target in the case of a target lib,
|
|
+ # we must compare to with_cross_host to decide if this is a native
|
|
+ # or cross-compiler and select where to install dlls appropriately.
|
|
+ if test -n "$with_cross_host" &&
|
|
+ test x"$with_cross_host" != x"no"; then
|
|
+ lt_host_flags='-no-undefined -bindir "$(toolexeclibdir)"';
|
|
+ else
|
|
+ lt_host_flags='-no-undefined -bindir "$(bindir)"';
|
|
+ fi
|
|
+ ;;
|
|
+ *)
|
|
+ lt_host_flags=
|
|
+ ;;
|
|
+esac
|
|
+
|
|
+
|
|
+
|
|
+
|
|
|
|
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
|
diff -Naur gcc-4.9.2-orig/libatomic/configure.ac gcc-4.9.2/libatomic/configure.ac
|
|
--- gcc-4.9.2-orig/libatomic/configure.ac 2014-01-03 01:24:30.000000000 +0300
|
|
+++ gcc-4.9.2/libatomic/configure.ac 2014-11-04 00:10:56.750200000 +0300
|
|
@@ -143,6 +143,7 @@
|
|
|
|
# Configure libtool
|
|
AM_PROG_LIBTOOL
|
|
+ACX_LT_HOST_FLAGS
|
|
AC_SUBST(enable_shared)
|
|
AC_SUBST(enable_static)
|
|
AM_MAINTAINER_MODE
|
|
diff -Naur gcc-4.9.2-orig/libatomic/configure.tgt gcc-4.9.2/libatomic/configure.tgt
|
|
--- gcc-4.9.2-orig/libatomic/configure.tgt 2014-01-03 01:24:30.000000000 +0300
|
|
+++ gcc-4.9.2/libatomic/configure.tgt 2014-11-04 00:10:56.843800000 +0300
|
|
@@ -103,7 +103,7 @@
|
|
*-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu \
|
|
| *-*-netbsd* | *-*-freebsd* | *-*-openbsd* \
|
|
| *-*-solaris2* | *-*-sysv4* | *-*-irix6* | *-*-osf* | *-*-hpux11* \
|
|
- | *-*-darwin* | *-*-aix*)
|
|
+ | *-*-darwin* | *-*-aix* | *-*-cygwin*)
|
|
# POSIX system. The OS is supported.
|
|
config_path="${config_path} posix"
|
|
;;
|
|
diff -Naur gcc-4.9.2-orig/libatomic/Makefile.am gcc-4.9.2/libatomic/Makefile.am
|
|
--- gcc-4.9.2-orig/libatomic/Makefile.am 2014-01-03 01:24:30.000000000 +0300
|
|
+++ gcc-4.9.2/libatomic/Makefile.am 2014-11-04 00:10:56.843800000 +0300
|
|
@@ -66,7 +66,7 @@
|
|
endif
|
|
libatomic_version_info = -version-info $(libtool_VERSION)
|
|
|
|
-libatomic_la_LDFLAGS = $(libatomic_version_info) $(libatomic_version_script)
|
|
+libatomic_la_LDFLAGS = $(libatomic_version_info) $(libatomic_version_script) $(lt_host_flags)
|
|
libatomic_la_SOURCES = gload.c gstore.c gcas.c gexch.c glfree.c lock.c init.c \
|
|
fenv.c
|
|
|
|
diff -Naur gcc-4.9.2-orig/libatomic/Makefile.in gcc-4.9.2/libatomic/Makefile.in
|
|
--- gcc-4.9.2-orig/libatomic/Makefile.in 2014-10-30 11:28:58.000000000 +0300
|
|
+++ gcc-4.9.2/libatomic/Makefile.in 2014-11-04 00:10:56.843800000 +0300
|
|
@@ -244,6 +244,7 @@
|
|
libtool_VERSION = @libtool_VERSION@
|
|
localedir = @localedir@
|
|
localstatedir = @localstatedir@
|
|
+lt_host_flags = @lt_host_flags@
|
|
mandir = @mandir@
|
|
mkdir_p = @mkdir_p@
|
|
multi_basedir = @multi_basedir@
|
|
@@ -285,7 +286,7 @@
|
|
@LIBAT_BUILD_VERSIONED_SHLIB_GNU_TRUE@@LIBAT_BUILD_VERSIONED_SHLIB_TRUE@libatomic_version_dep = $(top_srcdir)/libatomic.map
|
|
@LIBAT_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBAT_BUILD_VERSIONED_SHLIB_TRUE@libatomic_version_dep = libatomic.map-sun
|
|
libatomic_version_info = -version-info $(libtool_VERSION)
|
|
-libatomic_la_LDFLAGS = $(libatomic_version_info) $(libatomic_version_script)
|
|
+libatomic_la_LDFLAGS = $(libatomic_version_info) $(libatomic_version_script) $(lt_host_flags)
|
|
libatomic_la_SOURCES = gload.c gstore.c gcas.c gexch.c glfree.c lock.c init.c \
|
|
fenv.c
|
|
|