aboutsummaryrefslogtreecommitdiff
path: root/gnu/lib/libstdc++
diff options
context:
space:
mode:
authorSimon J. Gerraty <sjg@FreeBSD.org>2012-11-04 02:52:03 +0000
committerSimon J. Gerraty <sjg@FreeBSD.org>2012-11-04 02:52:03 +0000
commit23090366f729c56cab62de74c7a51792357e98a9 (patch)
treec511c885796e28ec571b5267e8f11f3b103d35e9 /gnu/lib/libstdc++
parent7750ad47a9a7dbc83f87158464170c8640723293 (diff)
parent22ff74b2f44234d31540b1f7fd6c91489c37cad3 (diff)
Notes
Diffstat (limited to 'gnu/lib/libstdc++')
-rw-r--r--gnu/lib/libstdc++/Makefile3
-rw-r--r--gnu/lib/libstdc++/config.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile
index c3734429db0b..1005b5d96b54 100644
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@@ -625,3 +625,6 @@ ${VERSION_MAP}: ${SRCDIR}/config/abi/pre/gnu.ver
CLEANFILES+= ${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/libstdc++/config.h b/gnu/lib/libstdc++/config.h
index a4afbdbec30a..7955ab62a60d 100644
--- a/gnu/lib/libstdc++/config.h
+++ b/gnu/lib/libstdc++/config.h
@@ -371,7 +371,7 @@
/* #undef HAVE_TANL */
/* Define to 1 if the target supports thread-local storage. */
-#if !defined(__arm__) && !defined(__mips__)
+#if !defined(__mips__)
#define HAVE_TLS 1
#endif