diff options
author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-12-18 09:39:23 +0000 |
---|---|---|
committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-12-18 09:39:23 +0000 |
commit | 871b22dbf2c7c78cf1a832407327c8009734ad76 (patch) | |
tree | c4844070b26856b310a5d96734ff82e54ca084dd /libstdc++-v3/src/Makefile.am | |
parent | 945865c5ef9259023618ab6c3108dc8adb543e1e (diff) | |
download | gcc-871b22dbf2c7c78cf1a832407327c8009734ad76.tar.gz |
2005-12-18 Benjamin Kosnik <bkoz@redhat.com>
* config/abi/post: New.
* config/abi/*-linux-gnu: Move to..
* config/abi/post/*-linux-gnu: ... here.
* config/abi/pre: New.
* config/linker-map.gnu: Move to ..
* config/abi/pre/gnu.ver: ... here.
* config/linker-map.dummy: Move to..
* config/abi/pre/none.ver: ... here.
* src/Makefile.am: Use ENABLE_SYMVERS_GNU,
ENABLE_SYMVERS_DARWIN, ENABLE_SYMVERS_GNU_NAMESPACE.
Use libstdc++-symbols.ver instead of libstdc++-symbol.ver.
* src/Makefile.in: Regnerate.
* acinclude.m4 (GLIBCXX_CONFIGURE_TESTSUITE): Adjust paths for new
placement of abi baseline files.
(GLIBCXX_ENABLE_SYMVERS): Add ENABLE_SYMVERS, ENABLE_SYMVERS_GNU,
ENABLE_SYMVERS_DARWIN. SYMVER_MAP to SYMVER_FILE.
* configure: Regnerate.
* config.h.in: Regnerate.
* src/compatibility.cc: Adjust macro usage.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@108748 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/src/Makefile.am')
-rw-r--r-- | libstdc++-v3/src/Makefile.am | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index b7cc1dd89ec..4d51036fe6b 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -28,12 +28,10 @@ include $(top_srcdir)/fragment.am toolexeclib_LTLIBRARIES = libstdc++.la # Symbol versioning for shared libraries. -# This could be conditional on -# ENABLE_SYMVERS_GNU || ENABLE_SYMVERS_DARWIN_EXPORT -# but automake doesn't support OR operations in conditionals. -libstdc++-symbol.ver: ${glibcxx_srcdir}/$(SYMVER_MAP) \ +if ENABLE_SYMVERS +libstdc++-symbols.ver: ${glibcxx_srcdir}/$(SYMVER_FILE) \ $(port_specific_symbol_files) - cp ${glibcxx_srcdir}/$(SYMVER_MAP) ./libstdc++-symbol.ver + cp ${glibcxx_srcdir}/$(SYMVER_FILE) ./libstdc++-symbols.ver if test "x$(port_specific_symbol_files)" != x; then \ sed -n '1,/DO NOT DELETE/p' $@ > tmp.top; \ sed -n '/DO NOT DELETE/,$$p' $@ > tmp.bottom; \ @@ -42,26 +40,26 @@ libstdc++-symbol.ver: ${glibcxx_srcdir}/$(SYMVER_MAP) \ fi if ENABLE_SYMVERS_GNU -version_arg = -Wl,--version-script=libstdc++-symbol.ver -version_dep = libstdc++-symbol.ver -else -if ENABLE_SYMVERS_DARWIN_EXPORT -version_arg = -Wl,-exported_symbols_list,libstdc++-symbol.explist -version_dep = libstdc++-symbol.explist -libstdc++-symbol.explist : libstdc++-symbol.ver \ +version_arg = -Wl,--version-script=libstdc++-symbols.ver +version_dep = libstdc++-symbols.ver +endif +if ENABLE_SYMVERS_DARWIN +version_arg = -Wl,-exported_symbols_list,libstdc++-symbols.explist +version_dep = libstdc++-symbols.explist +libstdc++-symbols.explist : libstdc++-symbols.ver \ ${glibcxx_srcdir}/scripts/make_exports.pl \ $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) perl ${glibcxx_srcdir}/scripts/make_exports.pl \ - libstdc++-symbol.ver \ + libstdc++-symbols.ver \ $(libstdc___la_OBJECTS:%.lo=.libs/%.o) \ `echo $(libstdc___la_LIBADD) | \ sed 's,/\([^/.]*\)\.la,/.libs/\1.a,g'` \ > $@ || (rm -f $@ ; exit 1) +endif else version_arg = version_dep = endif -endif # Source files linked in via configuration/make substitution for a |