diff options
| author | Patrick Wildt <patrick@cvs.openbsd.org> | 2016-09-01 11:03:10 +0000 |
|---|---|---|
| committer | Patrick Wildt <patrick@cvs.openbsd.org> | 2016-09-01 11:03:10 +0000 |
| commit | 9b29a0c9dd265acbfde2fe1fcf012e05035514ba (patch) | |
| tree | 1b0c67e0d46f20af18036db65ef8577de740be39 /gnu/lib | |
| parent | cc0ba76d1364499a76720de2920f78d97327cc80 (diff) | |
Switch OpenBSD/armv7 to ARM EABI (soft-float). This is a complete ABI
break which cannot be easily crossed.
ok kettenis@ jsg@
Diffstat (limited to 'gnu/lib')
| -rw-r--r-- | gnu/lib/Makefile | 5 | ||||
| -rw-r--r-- | gnu/lib/libstdc++-v3/Makefile | 5 | ||||
| -rw-r--r-- | gnu/lib/libsupc++-v3/Makefile | 6 |
3 files changed, 6 insertions, 10 deletions
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index 5aa9429368e..2fdfd6dc03a 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2013/08/06 19:11:53 miod Exp $ +# $OpenBSD: Makefile,v 1.18 2016/09/01 11:03:09 patrick Exp $ .include <bsd.own.mk> @@ -10,7 +10,10 @@ SUBDIR+=libobjc libstdc++ libstdc++-v3 libsupc++-v3 ../usr.bin/cc/libobjc SUBDIR+=libobjc libstdc++ . else # XXX make sure we build libobjc & libstdc++-v3 from gcc4 +# XXX arm: libocj from gcc 4.2.1 does not build with ARM EHABI +. if ${MACHINE_ARCH} != "arm" SUBDIR+=../usr.bin/cc/libobjc +. endif SUBDIR+=libstdc++-v3 libsupc++-v3 . endif .endif diff --git a/gnu/lib/libstdc++-v3/Makefile b/gnu/lib/libstdc++-v3/Makefile index 8203a96bb7f..97cc97b436c 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.10 2016/03/28 00:04:26 deraadt Exp $ +# $OpenBSD: Makefile,v 1.11 2016/09/01 11:03:09 patrick Exp $ .include "${.CURDIR}/Makefile.common" @@ -8,9 +8,6 @@ GCC_TARGET= ${MACHINE_ARCH}-unknown-openbsd${OSREV} LIB= stdc++ CPPFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H -.if ${MACHINE_ARCH} == "arm" -CPPFLAGS+= -D_GLIBCXX_SJLJ_EXCEPTIONS=1 -.endif CPPFLAGS+= -I${.CURDIR} -I${SUPDIR} -I${GCCDIR} -I${SRCDIR}/include CPPFLAGS+= -I${GCCLIB}/include -I${SRCDIR}/include -I${.CURDIR}/../libiberty/include -I. CFLAGS+= -frandom-seed=RepeatabilityConsideredGood diff --git a/gnu/lib/libsupc++-v3/Makefile b/gnu/lib/libsupc++-v3/Makefile index 08ebd18c00d..41e22ee67f3 100644 --- a/gnu/lib/libsupc++-v3/Makefile +++ b/gnu/lib/libsupc++-v3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2015/05/14 02:56:01 jsg Exp $ +# $OpenBSD: Makefile,v 1.5 2016/09/01 11:03:09 patrick Exp $ .include "${.CURDIR}/../libstdc++-v3/Makefile.common" @@ -8,10 +8,6 @@ LIB= supc++ # Pulled from Makefile.common SRCS= ${SUPSRCS} -.if ${MACHINE_ARCH} == "arm" -CPPFLAGS+= -D_GLIBCXX_SJLJ_EXCEPTIONS=1 -.endif - # Build a standard .a lib with PIC objects NOPIC= CFLAGS+= ${PICFLAG} |