summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2016-02-18 14:24:20 +0000
committerjsg <jsg@openbsd.org>2016-02-18 14:24:20 +0000
commitfe999ef50ca93e1e1048cc91462faf9f6388301c (patch)
tree325c2fba8d79ab6feb402ef1332ef0226aebf03e
parentregen (diff)
downloadwireguard-openbsd-fe999ef50ca93e1e1048cc91462faf9f6388301c.tar.xz
wireguard-openbsd-fe999ef50ca93e1e1048cc91462faf9f6388301c.zip
Disable the stack protector when building libstdc++ on arm. Fixes test
cases from dcoppa@ where incorrect behaviour was trigged when using std::ifstream and linking libpthread. Further investigation and patch from miod. ok deraadt@
-rw-r--r--gnu/lib/libstdc++-v3/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/gnu/lib/libstdc++-v3/Makefile b/gnu/lib/libstdc++-v3/Makefile
index de544bb2cea..8222d7abb52 100644
--- a/gnu/lib/libstdc++-v3/Makefile
+++ b/gnu/lib/libstdc++-v3/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.63.2.1 2009/08/03 08:13:06 kensmith Exp $
-# $OpenBSD: Makefile,v 1.8 2015/05/14 02:56:01 jsg Exp $
+# $OpenBSD: Makefile,v 1.9 2016/02/18 14:24:20 jsg Exp $
.include "${.CURDIR}/Makefile.common"
@@ -17,6 +17,9 @@ CFLAGS+= -frandom-seed=RepeatabilityConsideredGood
CXXFLAGS+= -frandom-seed=RepeatabilityConsideredGood
CXXFLAGS+= -fno-implicit-templates -ffunction-sections -fdata-sections \
-Wno-deprecated
+.if ${MACHINE_ARCH} == "arm"
+CXXFLAGS+= -fno-stack-protector
+.endif
DPADD= ${LIBM}
LDADD= -lm