diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2016-12-12 13:40:21 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2016-12-12 13:40:21 +0000 |
| commit | 66dbcf2d4d74b29f7188dd682116ace71f2fc977 (patch) | |
| tree | 6adf91a3937b4dc1a71205c5f014d2dbdb95f4eb /libitm | |
| parent | fba1216545a21ac5226d88e3ab1878acf08f9bce (diff) | |
| download | gcc-66dbcf2d4d74b29f7188dd682116ace71f2fc977.zip gcc-66dbcf2d4d74b29f7188dd682116ace71f2fc977.tar.gz gcc-66dbcf2d4d74b29f7188dd682116ace71f2fc977.tar.bz2 | |
Disable hwcaps on libgfortran
libgfortran:
* configure.ac: Call GCC_CHECK_LINKER_HWCAP.
* Makefile.am (libgfortran_la_LDFLAGS): Add HWCAP_LDFLAGS.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* Makefile.in: Regenerate.
config:
* hwcaps.m4: New file.
libitm:
* acinclude.m4 (LIBITM_CHECK_LINKER_FEATURES): Remove.
* aclocal.m4: Regenerate.
* configure.ac: Call GCC_CHECK_LINKER_HWCAP instead of
LIBITM_CHECK_LINKER_HWCAP.
From-SVN: r243552
Diffstat (limited to 'libitm')
| -rw-r--r-- | libitm/ChangeLog | 7 | ||||
| -rw-r--r-- | libitm/acinclude.m4 | 30 | ||||
| -rw-r--r-- | libitm/aclocal.m4 | 1 | ||||
| -rw-r--r-- | libitm/configure.ac | 2 |
4 files changed, 9 insertions, 31 deletions
diff --git a/libitm/ChangeLog b/libitm/ChangeLog index 4cff065..621622e 100644 --- a/libitm/ChangeLog +++ b/libitm/ChangeLog @@ -1,3 +1,10 @@ +2016-12-12 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + * acinclude.m4 (LIBITM_CHECK_LINKER_FEATURES): Remove. + * aclocal.m4: Regenerate. + * configure.ac: Call GCC_CHECK_LINKER_HWCAP instead of + LIBITM_CHECK_LINKER_HWCAP. + 2016-11-15 Matthias Klose <doko@ubuntu.com> * configure: Regenerate. diff --git a/libitm/acinclude.m4 b/libitm/acinclude.m4 index a82f6d6..c81b3e9 100644 --- a/libitm/acinclude.m4 +++ b/libitm/acinclude.m4 @@ -300,36 +300,6 @@ AC_DEFUN([LIBITM_CHECK_LINKER_FEATURES], [ dnl -dnl Check if the linker used supports linker maps to clear hardware -dnl capabilities. This is only supported on Solaris at the moment. -dnl -dnl Defines: -dnl HWCAP_LDFLAGS=-mclear-hwcap if possible -dnl LD (as a side effect of testing) -dnl -AC_DEFUN([LIBITM_CHECK_LINKER_HWCAP], [ - test -z "$HWCAP_LDFLAGS" && HWCAP_LDFLAGS='' - AC_REQUIRE([AC_PROG_LD]) - - ac_save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LFLAGS -mclear-hwcap" - - AC_MSG_CHECKING([for -mclear-hwcap]) - AC_TRY_LINK([], [return 0;], [ac_hwcap_ldflags=yes],[ac_hwcap_ldflags=no]) - if test "$ac_hwcap_ldflags" = "yes"; then - HWCAP_LDFLAGS="-mclear-hwcap $HWCAP_LDFLAGS" - fi - AC_MSG_RESULT($ac_hwcap_ldflags) - - LDFLAGS="$ac_save_LDFLAGS" - - AC_SUBST(HWCAP_LDFLAGS) - - AM_CONDITIONAL(HAVE_HWCAP, test $ac_hwcap_ldflags != no) -]) - - -dnl dnl Add version tags to symbols in shared library (or not), additionally dnl marking other symbols as private/local (or not). dnl diff --git a/libitm/aclocal.m4 b/libitm/aclocal.m4 index aeab414..26de26b 100644 --- a/libitm/aclocal.m4 +++ b/libitm/aclocal.m4 @@ -1015,6 +1015,7 @@ m4_include([../config/asmcfi.m4]) m4_include([../config/depstand.m4]) m4_include([../config/enable.m4]) m4_include([../config/futex.m4]) +m4_include([../config/hwcaps.m4]) m4_include([../config/lead-dot.m4]) m4_include([../config/mmap.m4]) m4_include([../config/multi.m4]) diff --git a/libitm/configure.ac b/libitm/configure.ac index 3875aa0..f345a01 100644 --- a/libitm/configure.ac +++ b/libitm/configure.ac @@ -215,7 +215,7 @@ LIBITM_CHECK_ATTRIBUTE_DLLEXPORT LIBITM_CHECK_ATTRIBUTE_ALIAS # Check linker hardware capability support. -LIBITM_CHECK_LINKER_HWCAP +GCC_CHECK_LINKER_HWCAP # If defaulting to -mavx, don't clear hwcaps. AC_CHECK_DECL([__AVX__], [HWCAP_LDFLAGS='']) |