summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2013-02-02 13:38:08 +0000
committermiod <miod@openbsd.org>2013-02-02 13:38:08 +0000
commit5b317fc52138616b1339649c0fd57fc1b3cb415a (patch)
treea35a93c14f5c9f883ec296371323c8f095d424c4
parentBe sure to pass a NULL cleanup pointer to CSU. (diff)
downloadwireguard-openbsd-5b317fc52138616b1339649c0fd57fc1b3cb415a.tar.xz
wireguard-openbsd-5b317fc52138616b1339649c0fd57fc1b3cb415a.zip
Compile stdexcepti.cc with -O0 on m68k when compiling it -fPIC to avoid an ICE
in the compiler. Not investigated further since the compiler will hopefully get an upgrade soon.
-rw-r--r--gnu/egcs/libstdc++/Makefile.bsd-wrapper8
1 files changed, 7 insertions, 1 deletions
diff --git a/gnu/egcs/libstdc++/Makefile.bsd-wrapper b/gnu/egcs/libstdc++/Makefile.bsd-wrapper
index 7b5e7898912..17411187d18 100644
--- a/gnu/egcs/libstdc++/Makefile.bsd-wrapper
+++ b/gnu/egcs/libstdc++/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.17 2012/08/31 00:11:27 deraadt Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.18 2013/02/02 13:38:08 miod Exp $
.if (${MACHINE_ARCH} == "mips")
NOPIC=
@@ -131,8 +131,14 @@ stdexcepti.po: stdexcepti.cc
@rm -f ${.TARGET}.o
stdexcepti.so: stdexcepti.cc
+# XXX workaround for compiler ICE
+.if ${MACHINE_ARCH} == "m68k"
+ @echo "${COMPILE.cc} -O0 -frtti ${PICFLAG} -DPIC ${.CURDIR}/stdexcepti.cc -o ${.TARGET}"
+ @${COMPILE.cc} -O0 -frtti ${PICFLAG} -DPIC ${.CURDIR}/stdexcepti.cc -o ${.TARGET}.o
+.else
@echo "${COMPILE.cc} -frtti ${PICFLAG} -DPIC ${.CURDIR}/stdexcepti.cc -o ${.TARGET}"
@${COMPILE.cc} -frtti ${PICFLAG} -DPIC ${.CURDIR}/stdexcepti.cc -o ${.TARGET}.o
+.endif
@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
@rm -f ${.TARGET}.o