diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2012-11-04 02:52:03 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2012-11-04 02:52:03 +0000 |
| commit | 23090366f729c56cab62de74c7a51792357e98a9 (patch) | |
| tree | c511c885796e28ec571b5267e8f11f3b103d35e9 /gnu/lib/libsupc++ | |
| parent | 7750ad47a9a7dbc83f87158464170c8640723293 (diff) | |
| parent | 22ff74b2f44234d31540b1f7fd6c91489c37cad3 (diff) | |
Notes
Diffstat (limited to 'gnu/lib/libsupc++')
| -rw-r--r-- | gnu/lib/libsupc++/Makefile | 3 | ||||
| -rw-r--r-- | gnu/lib/libsupc++/Version.map | 20 |
2 files changed, 15 insertions, 8 deletions
diff --git a/gnu/lib/libsupc++/Makefile b/gnu/lib/libsupc++/Makefile index a65198970530..90686158bddb 100644 --- a/gnu/lib/libsupc++/Makefile +++ b/gnu/lib/libsupc++/Makefile @@ -42,3 +42,6 @@ VERSION_MAP= ${.CURDIR}/Version.map .include <bsd.lib.mk> + +# Filter out libc++-specific flags, and -std= flags above c++98 or gnu++98. +CXXFLAGS:= ${CXXFLAGS:N-stdlib=libc++:N-std=c++[01][13x]:N-std=gnu++[01][13x]} diff --git a/gnu/lib/libsupc++/Version.map b/gnu/lib/libsupc++/Version.map index dfe453a1c238..ec6303ef78ec 100644 --- a/gnu/lib/libsupc++/Version.map +++ b/gnu/lib/libsupc++/Version.map @@ -126,18 +126,22 @@ CXXABI_1.3 { # __gnu_cxx::_verbose_terminate_handler() _ZN9__gnu_cxx27__verbose_terminate_handlerEv; - # new / delete operators - _Znaj; - _ZnajRKSt9nothrow_t; - _Znwj; - _ZnwjRKSt9nothrow_t; + local: + *; +}; + +GLIBCXX_3.4 { + # operator new and new[] + _Znai[jm]; + _Zna[jm]RKSt9nothrow_t; + _Znw[jm]; + _Znw[jm]RKSt9nothrow_t; + + # operator delete and delete[] _ZdaPv; _ZdaPvRKSt9nothrow_t; _ZdlPv; _ZdlPvRKSt9nothrow_t; - - local: - *; }; CXXABI_1.3.1 { |