Always run check-abi

Remove the configure options for running of check-abi and always
run it as part of the testsuite

diff --git a/ChangeLog b/ChangeLog
index 67a29bddb8bf6e06191c62f407185249695b0d72..ed5b53363f966f426d5977035bbd42416434f714 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-04-29  Andreas Jaeger  <aj@suse.de>
+
+       * Makerules (tests): Remove enable-check-abi protection.
+       (check-abi-warn): Remove.
+       (check-abi-%): Remove check-abi-warn usage.
+
+       * configure.in: Remove check-abi configure option.
+       * configure: Regenerated.
+       * config.make.in (enable-check-abi): Remove.
+
 2012-04-28  Andreas Schwab  <schwab@linux-m68k.org>
 
        * math/bits/math-finite.h [__NO_LONG_DOUBLE_MATH]: Redirect long

diff --git a/Makerules b/Makerules
index caa758441af85516ca866bbf8e2a1e2502f9278f..de87ad6c2bdaf0a27178a153407491b51751f9cc 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -1163,11 +1163,8 @@ check-abi-%: $(common-objpfx)config.make %.abilist $(objpfx)%.symlist
 check-abi-%: $(common-objpfx)config.make %.abilist $(common-objpfx)%.symlist
        $(check-abi)
 define check-abi
-       diff -p -U 0 $(filter %.abilist,$^) $(filter %.symlist,$^) $(check-abi-warn)
+       diff -p -U 0 $(filter %.abilist,$^) $(filter %.symlist,$^)
 endef
-ifeq ($(enable-check-abi),warn)
-check-abi-warn = || echo '*** WARNING: $*.so failed ABI check'
-endif
 
 update-abi-%: $(objpfx)%.symlist %.abilist
        $(update-abi)
@@ -1200,12 +1197,10 @@ common-generated += libc.symlist
 endif
 
 ifeq ($(build-shared),yes)
-ifneq ($(enable-check-abi),no)
 ifdef subdir
 tests: check-abi
 endif
 endif
-endif
 
 endif
 

diff --git a/config.make.in b/config.make.in
index 9aff468fe59ec2d4ac89e72c58e330881954e5f4..1f4185b3aa5017a43aef4fce29391dda8bbfb65a 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -53,7 +53,6 @@ with-fp = @with_fp@
 old-glibc-headers = @old_glibc_headers@
 unwind-find-fde = @libc_cv_gcc_unwind_find_fde@
 have-cpp-asm-debuginfo = @libc_cv_cpp_asm_debuginfo@
-enable-check-abi = @enable_check_abi@
 have-forced-unwind = @libc_cv_forced_unwind@
 have-fpie = @libc_cv_fpie@
 have-mfma4 = @libc_cv_cc_fma4@

diff --git a/configure b/configure
index d4958f3ed76cc878dee824faf3ed6f849c5af7df..1c5f4adbea05c4ed615831d752f1921db7cb1b21 100755 (executable)
--- a/configure
+++ b/configure
@@ -692,7 +692,6 @@ all_warnings
 force_install
 bindnow
 oldest_abi
-enable_check_abi
 use_default_link
 with_fp
 ac_ct_CXX
@@ -766,7 +765,6 @@ with_selinux
 with_headers
 with_default_link
 enable_sanity_checks
-enable_check_abi
 enable_shared
 enable_profile
 enable_versioning
@@ -1413,8 +1411,6 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-sanity-checks really do not use threads (should not be used except
                           in special situations) [default=yes]
-  --enable-check-abi      do "make check-abi" in "make check" (no/warn/yes)
-                          [default=no]
   --enable-shared         build shared library [default=yes if GNU ld]
   --enable-profile        build profiled library [default=no]
   --disable-versioning    do not include versioning information in the library
@@ -3553,15 +3549,6 @@ else
 fi
 
 
-
-# Check whether --enable-check-abi was given.
-if test "${enable_check_abi+set}" = set; then :
-  enableval=$enable_check_abi; enable_check_abi=$enableval
-else
-  enable_check_abi=no
-fi
-
-
 # Check whether --enable-shared was given.
 if test "${enable_shared+set}" = set; then :
   enableval=$enable_shared; shared=$enableval

diff --git a/configure.in b/configure.in
index 0f5193e71709f91045fe784e93ba420151b974d4..19a2c1a0f0f410e039946a2cb6d87bd23d07a736 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -104,14 +104,6 @@ AC_ARG_ENABLE([sanity-checks],
              [enable_sanity=$enableval],
              [enable_sanity=yes])
 
-AC_SUBST(enable_check_abi)
-AC_ARG_ENABLE([check-abi],
-             AC_HELP_STRING([--enable-check-abi],
-                            [do "make check-abi" in "make check" (no/warn/yes)
-                             @<:@default=no@:>@]),
-             [enable_check_abi=$enableval],
-             [enable_check_abi=no])
-
 AC_ARG_ENABLE([shared],
              AC_HELP_STRING([--enable-shared],
                             [build shared library @<:@default=yes if GNU ld@:>@]),