summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormartynas <martynas@openbsd.org>2014-04-08 23:18:21 +0000
committermartynas <martynas@openbsd.org>2014-04-08 23:18:21 +0000
commitb153ee0a2ba3f69ff9aa19b41cfcf08ecb2f6a17 (patch)
tree950c2038903925f21eeeed13284d011e977441c7
parentvarious fixes for the options list, and use the same Nd as less (which was (diff)
downloadwireguard-openbsd-b153ee0a2ba3f69ff9aa19b41cfcf08ecb2f6a17.tar.xz
wireguard-openbsd-b153ee0a2ba3f69ff9aa19b41cfcf08ecb2f6a17.zip
Build libgcc without SSP. With the new SSP-strong heuristics,
_moddi3.o gets protected and landisk bootblocks got broken. Fundamentally this causes a link dependency on libc that we'll not always be able to satisfy. Spotted by deraadt@. OK matthew@, kettenis@, guenther@.
-rw-r--r--gnu/usr.bin/cc/libgcc/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/usr.bin/cc/libgcc/Makefile b/gnu/usr.bin/cc/libgcc/Makefile
index 5f8fb98d3da..1320231aa90 100644
--- a/gnu/usr.bin/cc/libgcc/Makefile
+++ b/gnu/usr.bin/cc/libgcc/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.58.8.1 2009/04/15 03:14:26 kensmith Exp $
-# $OpenBSD: Makefile,v 1.25 2013/05/08 15:30:38 miod Exp $
+# $OpenBSD: Makefile,v 1.26 2014/04/08 23:18:21 martynas Exp $
.include <bsd.own.mk>
@@ -37,7 +37,8 @@ CFLAGS+= -DIN_GCC -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED \
-DHAVE_GTHR_DEFAULT \
-I${GCCLIB}/include \
-I${GCCDIR}/config -I${GCCDIR} -I. \
- -I${.CURDIR}/../cc_tools
+ -I${.CURDIR}/../cc_tools \
+ -fno-stack-protector
LDFLAGS+= -nodefaultlibs
LDADD+= -lc