From cb8a6dbd176ee59d61068bed92e2c8d22bd28b13 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 30 Oct 2013 13:20:52 +1000 Subject: rename configure.in to configure.ac Autoconf has been deprecating configure.in for quite a long time. Rename all our configure.in and preconfigure.in files to .ac. Signed-off-by: Mike Frysinger --- nptl/ChangeLog | 9 +++++++ nptl/sysdeps/pthread/configure | 2 +- nptl/sysdeps/pthread/configure.ac | 49 +++++++++++++++++++++++++++++++++++++++ nptl/sysdeps/pthread/configure.in | 49 --------------------------------------- nptl/sysdeps/x86_64/configure | 2 +- nptl/sysdeps/x86_64/configure.ac | 23 ++++++++++++++++++ nptl/sysdeps/x86_64/configure.in | 23 ------------------ 7 files changed, 83 insertions(+), 74 deletions(-) create mode 100644 nptl/sysdeps/pthread/configure.ac delete mode 100644 nptl/sysdeps/pthread/configure.in create mode 100644 nptl/sysdeps/x86_64/configure.ac delete mode 100644 nptl/sysdeps/x86_64/configure.in (limited to 'nptl') diff --git a/nptl/ChangeLog b/nptl/ChangeLog index a089153..9d04a7b 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,12 @@ +2013-10-30 Mike Frysinger + + * sysdeps/pthread/configure.in: Moved to ... + * sysdeps/pthread/configure.ac: ... here. + * sysdeps/x86_64/configure.in: Moved to ... + * sysdeps/x86_64/configure.ac: ... here. + * sysdeps/pthread/configure: Regenerated. + * sysdeps/x86_64/configure: Likewise. + 2013-10-04 Maciej W. Rozycki * tst-mutex8.c (check_type) [ENABLE_PI]: Handle ENOTSUP failure diff --git a/nptl/sysdeps/pthread/configure b/nptl/sysdeps/pthread/configure index 7962ed6..239a039 100644 --- a/nptl/sysdeps/pthread/configure +++ b/nptl/sysdeps/pthread/configure @@ -1,4 +1,4 @@ -# This file is generated from configure.in by Autoconf. DO NOT EDIT! +# This file is generated from configure.ac by Autoconf. DO NOT EDIT! if test "x$libc_cv_gcc___thread" != xyes; then as_fn_error $? "compiler support for __thread is required" "$LINENO" 5 diff --git a/nptl/sysdeps/pthread/configure.ac b/nptl/sysdeps/pthread/configure.ac new file mode 100644 index 0000000..413af96 --- /dev/null +++ b/nptl/sysdeps/pthread/configure.ac @@ -0,0 +1,49 @@ +dnl configure fragment for new libpthread implementation. +GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. + +if test "x$libc_cv_gcc___thread" != xyes; then + AC_MSG_ERROR(compiler support for __thread is required) +fi + +if test "x${libc_cv_visibility_attribute}" != xyes || + test "x${libc_cv_broken_visibility_attribute}" != xno; then + AC_MSG_ERROR(working compiler support for visibility attribute is required) +fi + +if test "x$libc_cv_asm_cfi_directives" != xyes; then + dnl We need this only for some architectures. + case "$base_machine" in + i386 | x86_64 | powerpc | s390) + AC_MSG_ERROR(CFI directive support in assembler is required) ;; + *) ;; + esac +fi + +dnl Iff is available, make sure it is the right one and it +dnl contains struct _Unwind_Exception. +AC_CACHE_CHECK(dnl +for forced unwind support, libc_cv_forced_unwind, [dnl +AC_TRY_COMPILE([#include ], [ +struct _Unwind_Exception exc; +struct _Unwind_Context *context; +_Unwind_GetCFA (context)], +libc_cv_forced_unwind=yes, libc_cv_forced_unwind=no)]) +if test $libc_cv_forced_unwind = yes; then + AC_DEFINE(HAVE_FORCED_UNWIND) +dnl Check for C cleanup handling. + old_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror -fexceptions" + AC_CACHE_CHECK([for C cleanup handling], libc_cv_c_cleanup, [dnl + AC_TRY_COMPILE([ +extern void some_function (void); +void cl (void *a) { }], [ + int a __attribute__ ((cleanup (cl))); + some_function ()], +libc_cv_c_cleanup=yes, libc_cv_c_cleanup=no)]) + CFLAGS="$old_CFLAGS" + if test $libc_cv_c_cleanup = no; then + AC_MSG_ERROR([the compiler must support C cleanup handling]) + fi +else + AC_MSG_ERROR(forced unwind support is required) +fi diff --git a/nptl/sysdeps/pthread/configure.in b/nptl/sysdeps/pthread/configure.in deleted file mode 100644 index 413af96..0000000 --- a/nptl/sysdeps/pthread/configure.in +++ /dev/null @@ -1,49 +0,0 @@ -dnl configure fragment for new libpthread implementation. -GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. - -if test "x$libc_cv_gcc___thread" != xyes; then - AC_MSG_ERROR(compiler support for __thread is required) -fi - -if test "x${libc_cv_visibility_attribute}" != xyes || - test "x${libc_cv_broken_visibility_attribute}" != xno; then - AC_MSG_ERROR(working compiler support for visibility attribute is required) -fi - -if test "x$libc_cv_asm_cfi_directives" != xyes; then - dnl We need this only for some architectures. - case "$base_machine" in - i386 | x86_64 | powerpc | s390) - AC_MSG_ERROR(CFI directive support in assembler is required) ;; - *) ;; - esac -fi - -dnl Iff is available, make sure it is the right one and it -dnl contains struct _Unwind_Exception. -AC_CACHE_CHECK(dnl -for forced unwind support, libc_cv_forced_unwind, [dnl -AC_TRY_COMPILE([#include ], [ -struct _Unwind_Exception exc; -struct _Unwind_Context *context; -_Unwind_GetCFA (context)], -libc_cv_forced_unwind=yes, libc_cv_forced_unwind=no)]) -if test $libc_cv_forced_unwind = yes; then - AC_DEFINE(HAVE_FORCED_UNWIND) -dnl Check for C cleanup handling. - old_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Werror -fexceptions" - AC_CACHE_CHECK([for C cleanup handling], libc_cv_c_cleanup, [dnl - AC_TRY_COMPILE([ -extern void some_function (void); -void cl (void *a) { }], [ - int a __attribute__ ((cleanup (cl))); - some_function ()], -libc_cv_c_cleanup=yes, libc_cv_c_cleanup=no)]) - CFLAGS="$old_CFLAGS" - if test $libc_cv_c_cleanup = no; then - AC_MSG_ERROR([the compiler must support C cleanup handling]) - fi -else - AC_MSG_ERROR(forced unwind support is required) -fi diff --git a/nptl/sysdeps/x86_64/configure b/nptl/sysdeps/x86_64/configure index 8e5bcac..c9dea5a 100644 --- a/nptl/sysdeps/x86_64/configure +++ b/nptl/sysdeps/x86_64/configure @@ -1,4 +1,4 @@ -# This file is generated from configure.in by Autoconf. DO NOT EDIT! +# This file is generated from configure.ac by Autoconf. DO NOT EDIT! # Local configure fragment for sysdeps/i386. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for .cfi_personality and .cfi_lsda pseudo-ops" >&5 diff --git a/nptl/sysdeps/x86_64/configure.ac b/nptl/sysdeps/x86_64/configure.ac new file mode 100644 index 0000000..0ba0cc3 --- /dev/null +++ b/nptl/sysdeps/x86_64/configure.ac @@ -0,0 +1,23 @@ +GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. +# Local configure fragment for sysdeps/i386. + +AC_CACHE_CHECK([for .cfi_personality and .cfi_lsda pseudo-ops], + libc_cv_asm_cfi_personality, [dnl + cat > conftest.s <&AS_MESSAGE_LOG_FD); then + libc_cv_asm_cfi_personality=yes + else + libc_cv_asm_cfi_personality=no + fi + rm -f conftest* +]) +if test x"$libc_cv_asm_cfi_personality" != xyes; then + AC_MSG_ERROR([assembler too old, .cfi_personality support missing]) +fi diff --git a/nptl/sysdeps/x86_64/configure.in b/nptl/sysdeps/x86_64/configure.in deleted file mode 100644 index 0ba0cc3..0000000 --- a/nptl/sysdeps/x86_64/configure.in +++ /dev/null @@ -1,23 +0,0 @@ -GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. -# Local configure fragment for sysdeps/i386. - -AC_CACHE_CHECK([for .cfi_personality and .cfi_lsda pseudo-ops], - libc_cv_asm_cfi_personality, [dnl - cat > conftest.s <&AS_MESSAGE_LOG_FD); then - libc_cv_asm_cfi_personality=yes - else - libc_cv_asm_cfi_personality=no - fi - rm -f conftest* -]) -if test x"$libc_cv_asm_cfi_personality" != xyes; then - AC_MSG_ERROR([assembler too old, .cfi_personality support missing]) -fi -- cgit v1.1