From 96e3c4c3cb599348f328646f9cc9d52d2a8c2c04 Mon Sep 17 00:00:00 2001 From: kcook Date: Fri, 8 Apr 2005 23:09:32 +0000 Subject: [PATCH] 2005-04-08 Kelley Cook * acinclude.m4 (GLIBCXX_ENABLE_SYMVERS): Define _GLIBCXX_ASM_SYMVER. * acconfig.h: Delete file. * Makefile.in, acinclude.m4, configure: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@97868 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/Makefile.in | 4 ++-- libstdc++-v3/acconfig.h | 14 -------------- libstdc++-v3/acinclude.m4 | 14 ++++++++++++++ libstdc++-v3/config.h.in | 26 +++++++++++++------------- libstdc++-v3/configure | 3 +++ 6 files changed, 38 insertions(+), 29 deletions(-) delete mode 100644 libstdc++-v3/acconfig.h diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e7c0c3b..fc8b84a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,11 @@ 2005-04-08 Kelley Cook + * acinclude.m4 (GLIBCXX_ENABLE_SYMVERS): Define _GLIBCXX_ASM_SYMVER. + * acconfig.h: Delete file. + * Makefile.in, acinclude.m4, configure: Regenerate. + +2005-04-08 Kelley Cook + * linkage.m4 (GLIBCXX_MAYBE_UNDERSCORED_FUNCS): New macro. (GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1, GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2, diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in index 4c9cad6..1a46a54 100644 --- a/libstdc++-v3/Makefile.in +++ b/libstdc++-v3/Makefile.in @@ -42,7 +42,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/../config.guess \ $(srcdir)/../mkinstalldirs $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/configure $(top_srcdir)/fragment.am \ - $(top_srcdir)/scripts/testsuite_flags.in ChangeLog acconfig.h + $(top_srcdir)/scripts/testsuite_flags.in ChangeLog subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/no-executables.m4 \ @@ -369,7 +369,7 @@ config.h: stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(top_srcdir)/acconfig.h +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_srcdir) && $(AUTOHEADER) rm -f stamp-h1 touch $@ diff --git a/libstdc++-v3/acconfig.h b/libstdc++-v3/acconfig.h deleted file mode 100644 index 9bee01f..0000000 --- a/libstdc++-v3/acconfig.h +++ /dev/null @@ -1,14 +0,0 @@ -// Symbols and macros for libstdc++ -*- C++ -*- - -// @BOTTOM@ -// -// Define symbol versioning in assember directives. If symbol -// versioning is beigng used, and the assembler supports this kind of -// thing, then use it. -// NB: _GLIBCXX_AT_AT is a hack to work around quoting issues in m4. -#if _GLIBCXX_SYMVER - #define _GLIBCXX_ASM_SYMVER(cur, old, version) \ - asm (".symver " #cur "," #old _GLIBCXX_AT_AT #version); -#else - #define _GLIBCXX_ASM_SYMVER(cur, old, version) -#endif diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 2478071..601e456 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -1764,6 +1764,20 @@ case $enable_symvers in ;; esac +AH_VERBATIM([_GLIBCXX_SYMVERextra], +[/* Define symbol versioning in assember directives. If symbol + versioning is being used, and the assembler supports this kind of + thing, then use it. + + NB: _GLIBCXX_AT_AT is a hack to work around quoting issues in m4. */ + +#if _GLIBCXX_SYMVER + #define _GLIBCXX_ASM_SYMVER(cur, old, version) \ + asm (".symver " #cur "," #old _GLIBCXX_AT_AT #version); +#else + #define _GLIBCXX_ASM_SYMVER(cur, old, version) +#endif]) + AC_SUBST(SYMVER_MAP) AC_SUBST(port_specific_symbol_files) GLIBCXX_CONDITIONAL(GLIBCXX_BUILD_VERSIONED_SHLIB, test $enable_symvers != no) diff --git a/libstdc++-v3/config.h.in b/libstdc++-v3/config.h.in index 6a4871c..f8e5305 100644 --- a/libstdc++-v3/config.h.in +++ b/libstdc++-v3/config.h.in @@ -1,6 +1,4 @@ /* config.h.in. Generated from configure.ac by autoheader. */ -// Symbols and macros for libstdc++ -*- C++ -*- - /* Define to 1 if you have the `acosf' function. */ #undef HAVE_ACOSF @@ -666,6 +664,19 @@ /* Define to use symbol versioning in the shared library. */ #undef _GLIBCXX_SYMVER +/* Define symbol versioning in assember directives. If symbol + versioning is being used, and the assembler supports this kind of + thing, then use it. + + NB: _GLIBCXX_AT_AT is a hack to work around quoting issues in m4. */ + +#if _GLIBCXX_SYMVER + #define _GLIBCXX_ASM_SYMVER(cur, old, version) \ + asm (".symver " #cur "," #old _GLIBCXX_AT_AT #version); +#else + #define _GLIBCXX_ASM_SYMVER(cur, old, version) +#endif + /* Define if C99 functions or macros from , , , , and can be used or exposed. */ #undef _GLIBCXX_USE_C99 @@ -1023,14 +1034,3 @@ # define HAVE_TANL 1 # define tanl _tanl #endif -// -// Define symbol versioning in assember directives. If symbol -// versioning is beigng used, and the assembler supports this kind of -// thing, then use it. -// NB: _GLIBCXX_AT_AT is a hack to work around quoting issues in m4. -#if _GLIBCXX_SYMVER - #define _GLIBCXX_ASM_SYMVER(cur, old, version) \ - asm (".symver " #cur "," #old _GLIBCXX_AT_AT #version); -#else - #define _GLIBCXX_ASM_SYMVER(cur, old, version) -#endif diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 4e9fbc2..97a1a85 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -87296,6 +87296,9 @@ esac + + + { echo "$as_me:$LINENO: versioning on shared library symbols is $enable_symvers" >&5 echo "$as_me: versioning on shared library symbols is $enable_symvers" >&6;} -- 2.7.4