summaryrefslogtreecommitdiff
path: root/libmudflap
diff options
context:
space:
mode:
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2005-09-23 16:33:47 +0000
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2005-09-23 16:33:47 +0000
commitddba3f6268d09491fbc45ea417474d6b3f0407c5 (patch)
tree9cbf55c3da9f19be71ffd49e2127da8c09829396 /libmudflap
parent227bfd81a551156c272ad30f3e8745fd0abe1e7d (diff)
downloadgcc-ddba3f6268d09491fbc45ea417474d6b3f0407c5.tar.gz
config:
* enable.m4: New file. * tls.m4: New file. libmudflap: * aclocal.m4, configure: Rebuilt. * configure.ac: Use GCC_CHECK_TLS. * acinclude.m4 (LIBMUDFLAP_CHECK_TLS, LIBMUDFLAP_ENABLE): Moved to ../config. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@104571 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libmudflap')
-rw-r--r--libmudflap/ChangeLog7
-rw-r--r--libmudflap/Makefile.in4
-rw-r--r--libmudflap/acinclude.m460
-rw-r--r--libmudflap/aclocal.m42
-rw-r--r--libmudflap/configure.ac2
-rw-r--r--libmudflap/testsuite/Makefile.in4
6 files changed, 16 insertions, 63 deletions
diff --git a/libmudflap/ChangeLog b/libmudflap/ChangeLog
index cae17d89a76..537c260a6d2 100644
--- a/libmudflap/ChangeLog
+++ b/libmudflap/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-23 Tom Tromey <tromey@redhat.com>
+
+ * aclocal.m4, configure: Rebuilt.
+ * configure.ac: Use GCC_CHECK_TLS.
+ * acinclude.m4 (LIBMUDFLAP_CHECK_TLS, LIBMUDFLAP_ENABLE): Moved
+ to ../config.
+
2005-08-22 Jim Wilson <wilson@specifix.com>
* mf-hooks2.c (MF_REGISTER_fopen): Define to __MF_TYPE_STATIC when
diff --git a/libmudflap/Makefile.in b/libmudflap/Makefile.in
index 24fa22102d4..43921f23c73 100644
--- a/libmudflap/Makefile.in
+++ b/libmudflap/Makefile.in
@@ -50,7 +50,9 @@ DIST_COMMON = $(am__configure_deps) $(include_HEADERS) \
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
- $(top_srcdir)/../config/lead-dot.m4 $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/../config/enable.m4 \
+ $(top_srcdir)/../config/lead-dot.m4 \
+ $(top_srcdir)/../config/tls.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
diff --git a/libmudflap/acinclude.m4 b/libmudflap/acinclude.m4
index 4308f508d84..38e0808ad93 100644
--- a/libmudflap/acinclude.m4
+++ b/libmudflap/acinclude.m4
@@ -1,25 +1,3 @@
-dnl Check whether the target supports TLS.
-AC_DEFUN([LIBMUDFLAP_CHECK_TLS], [
- LIBMUDFLAP_ENABLE(tls, yes, [Use thread-local storage])
- AC_CACHE_CHECK([whether the target supports thread-local storage],
- have_tls, [
- AC_RUN_IFELSE([__thread int a; int b; int main() { return a = b; }],
- [dnl If the test case passed with dynamic linking, try again with
- dnl static linking. This fails at least with some older Red Hat
- dnl releases.
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="-static $LDFLAGS"
- AC_RUN_IFELSE([__thread int a; int b; int main() { return a = b; }],
- [have_tls=yes], [have_tls=no], [])
- LDFLAGS="$save_LDFLAGS"],
- [have_tls=no],
- [AC_COMPILE_IFELSE([__thread int foo;], [have_tls=yes], [have_tls=no])]
- )])
- if test "$enable_tls $have_tls" = "yes yes"; then
- AC_DEFINE(HAVE_TLS, 1,
- [Define to 1 if the target supports thread-local storage.])
- fi])
-
dnl ----------------------------------------------------------------------
dnl This whole bit snagged from libgfortran.
@@ -32,41 +10,3 @@ AC_DEFUN([AM_PROG_LIBTOOL])
AC_DEFUN([AC_LIBTOOL_DLOPEN])
AC_DEFUN([AC_PROG_LD])
])
-
-dnl ----------------------------------------------------------------------
-dnl This whole bit snagged from libstdc++-v3.
-
-dnl
-dnl LIBMUDFLAP_ENABLE
-dnl (FEATURE, DEFAULT, HELP-ARG, HELP-STRING)
-dnl (FEATURE, DEFAULT, HELP-ARG, HELP-STRING, permit a|b|c)
-dnl (FEATURE, DEFAULT, HELP-ARG, HELP-STRING, SHELL-CODE-HANDLER)
-dnl
-dnl See docs/html/17_intro/configury.html#enable for documentation.
-dnl
-m4_define([LIBMUDFLAP_ENABLE],[dnl
-m4_define([_g_switch],[--enable-$1])dnl
-m4_define([_g_help],[AC_HELP_STRING(_g_switch$3,[$4 @<:@default=$2@:>@])])dnl
- AC_ARG_ENABLE($1,_g_help,
- m4_bmatch([$5],
- [^permit ],
- [[
- case "$enableval" in
- m4_bpatsubst([$5],[permit ])) ;;
- *) AC_MSG_ERROR(Unknown argument to enable/disable $1) ;;
- dnl Idea for future: generate a URL pointing to
- dnl "onlinedocs/configopts.html#whatever"
- esac
- ]],
- [^$],
- [[
- case "$enableval" in
- yes|no) ;;
- *) AC_MSG_ERROR(Argument to enable/disable $1 must be yes or no) ;;
- esac
- ]],
- [[$5]]),
- [enable_]m4_bpatsubst([$1],-,_)[=][$2])
-m4_undefine([_g_switch])dnl
-m4_undefine([_g_help])dnl
-])
diff --git a/libmudflap/aclocal.m4 b/libmudflap/aclocal.m4
index 95667ef84c1..db8245fc80b 100644
--- a/libmudflap/aclocal.m4
+++ b/libmudflap/aclocal.m4
@@ -915,5 +915,7 @@ AC_SUBST([am__untar])
]) # _AM_PROG_TAR
m4_include([../config/depstand.m4])
+m4_include([../config/enable.m4])
m4_include([../config/lead-dot.m4])
+m4_include([../config/tls.m4])
m4_include([acinclude.m4])
diff --git a/libmudflap/configure.ac b/libmudflap/configure.ac
index 4d0ff1311fa..038bac54618 100644
--- a/libmudflap/configure.ac
+++ b/libmudflap/configure.ac
@@ -245,7 +245,7 @@ else
fi
# See if we support thread-local storage.
-LIBMUDFLAP_CHECK_TLS
+GCC_CHECK_TLS
AC_CONFIG_FILES([Makefile testsuite/Makefile testsuite/mfconfig.exp])
AC_OUTPUT
diff --git a/libmudflap/testsuite/Makefile.in b/libmudflap/testsuite/Makefile.in
index a3f386dc868..02cf6ecadcf 100644
--- a/libmudflap/testsuite/Makefile.in
+++ b/libmudflap/testsuite/Makefile.in
@@ -41,7 +41,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/mfconfig.exp.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
- $(top_srcdir)/../config/lead-dot.m4 $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/../config/enable.m4 \
+ $(top_srcdir)/../config/lead-dot.m4 \
+ $(top_srcdir)/../config/tls.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)