diff options
| author | ro <> | 2012-02-27 13:51:50 +0000 |
|---|---|---|
| committer | ro <> | 2012-02-27 13:51:50 +0000 |
| commit | 7b2f0ab7bc35ebfdcc3c2bbcd43ec25a82a5e2ea (patch) | |
| tree | 1021fa2934b370402c6c9d89778a3c5d3dae290a /contrib | |
| parent | 6dfc249a740f67a2ce38f3a060415a5772ec563d (diff) | |
Fix Solaris symbol versioning (PR libstdc++/52188)
contrib:
PR libstdc++/52188
* make_sunver.pl: Remove #ifdef handling.
libgomp:
PR libstdc++/52188
* acinclude.m4 (LIBGOMP_ENABLE_SYMVERS): Remove symvers_renaming.
Remove ENABLE_SYMVERS_SOL2.
* configure: Regenerate.
* Makefile.am [LIBGOMP_BUILD_VERSIONED_SHLIB] (comma): New variable.
(PREPROCESS): New variable.
(libgomp.ver): New target.
[LIBGOMP_BUILD_VERSIONED_SHLIB &&
LIBGOMP_BUILD_VERSIONED_SHLIB_GNU]: Remove
LIBGOMP_BUILD_VERSIONED_SHLIB_SOL2 handling.
Use libgomp.ver.
[LIBGOMP_BUILD_VERSIONED_SHLIB_SUN]: Use libgomp.ver, libgomp.ver-sun.
* Makefile.in: Regenerate.
libstdc++-v3:
PR libstdc++/52188
* acinclude.m4 (GLIBCXX_ENABLE_SYMVERS): Remove symvers_renaming.
Remove ENABLE_SYMVERS_SOL2.
* configure: Regenerate.
* src/Makefile.am [ENABLE_SYMVERS] (libstdc++-symbols.ver):
Postprocess mapfile.
[ENABLE_SYMVERS_GNU]: Remove ENABLE_SYMVERS_SOL2 handling.
* src/Makefile.in: Regenerate.
* config/abi/pre/gnu.ver (GLIBCXX_3.4.5) [!__sun__ && !__svr4__]:
Don't export
_ZNSt19istreambuf_iteratorI[cw]St11char_traitsI[cw]EEppEv.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ChangeLog | 5 | ||||
| -rw-r--r-- | contrib/make_sunver.pl | 21 |
2 files changed, 5 insertions, 21 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog index aeaee192b36..50948870945 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2012-02-27 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + PR libstdc++/52188 + * make_sunver.pl: Remove #ifdef handling. + 2012-02-17 Doug Kwan <dougkwan@google.com> * contrib/testsuite-management/validate_failures.py diff --git a/contrib/make_sunver.pl b/contrib/make_sunver.pl index 96ad22c2311..afdf973f5da 100644 --- a/contrib/make_sunver.pl +++ b/contrib/make_sunver.pl @@ -156,9 +156,6 @@ my $glob = 'glob'; # We're currently inside `extern "C++"', which Sun ld doesn't understand. my $in_extern = 0; -# We're currently inside a conditional section: just skip it. -my $in_ifdef = 0; - # The c++filt command to use. This *must* be GNU c++filt; the Sun Studio # c++filt doesn't handle the GNU mangling style. my $cxxfilt = $ENV{'CXXFILT'} || "c++filt"; @@ -183,15 +180,6 @@ printf "# Omitted archives with corresponding shared libraries: %s\n", print "#\n\n"; while (<F>) { - # End of skipped section. - if (/^[ \t]*\#endif/) { - $in_ifdef = 0; - next; - } - - # Just skip a conditional section. - if ($in_ifdef) { next; } - # Lines of the form '};' if (/^([ \t]*)(\}[ \t]*;[ \t]*)$/) { $glob = 'glob'; @@ -216,15 +204,6 @@ while (<F>) { print; next; } - # Special comments that look like C preprocessor conditionals. - # Just skip the contents for now. - # FIXME: Allow passing in conditionals from the command line to really - # control the skipping. - if (/^[ \t]*\#ifdef/) { - $in_ifdef = 1; - next; - } - # Comment and blank lines if (/^[ \t]*\#/) { print; next; } if (/^[ \t]*$/) { print; next; } |