diff options
author | Christian Weisgerber <naddy@cvs.openbsd.org> | 2019-09-03 15:12:33 +0000 |
---|---|---|
committer | Christian Weisgerber <naddy@cvs.openbsd.org> | 2019-09-03 15:12:33 +0000 |
commit | 0843ffd8b0d1b8725dbdaf80447cd775e33401fd (patch) | |
tree | c170352015380a3305b0dde445ad08ac2999139c /sys/arch/armv7/conf | |
parent | 778dfefb6f9580c1f4748628df1cd30fc0700c70 (diff) |
drop support for building with gcc; ok deraadt@
Diffstat (limited to 'sys/arch/armv7/conf')
-rw-r--r-- | sys/arch/armv7/conf/Makefile.armv7 | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/sys/arch/armv7/conf/Makefile.armv7 b/sys/arch/armv7/conf/Makefile.armv7 index ba34abc04b5..655d86b19e9 100644 --- a/sys/arch/armv7/conf/Makefile.armv7 +++ b/sys/arch/armv7/conf/Makefile.armv7 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.armv7,v 1.45 2019/06/21 15:34:07 deraadt Exp $ +# $OpenBSD: Makefile.armv7,v 1.46 2019/09/03 15:12:32 naddy Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -25,14 +25,10 @@ INCLUDES= -nostdinc -I$S -I. -I$S/arch CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D__${_mach}__ -MD -MP CWARNFLAGS= -Werror -Wall -Wimplicit-function-declaration \ -Wno-uninitialized -Wno-pointer-sign \ + -Wno-constant-conversion -Wno-address-of-packed-member \ -Wframe-larger-than=2047 -CMACHFLAGS= -msoft-float -.if ${COMPILER_VERSION:Mgcc4} -CMACHFLAGS+= -march=armv6 -Wa,-march=armv7a -.else -CMACHFLAGS+= -march=armv7a -.endif +CMACHFLAGS= -msoft-float -march=armv7a CMACHFLAGS+= -ffreestanding ${NOPIE_FLAGS} SORTR= sort -R .if ${IDENT:M-DNO_PROPOLICE} @@ -42,10 +38,6 @@ CMACHFLAGS+= -fno-stack-protector SORTR= cat COPTS?= -Oz .endif -.if ${COMPILER_VERSION:Mclang} -NO_INTEGR_AS= -no-integrated-as -CWARNFLAGS+= -Wno-address-of-packed-member -Wno-constant-conversion -.endif DEBUG?= -g COPTS?= -O2 @@ -103,7 +95,7 @@ LINKFLAGS+= -S assym.h: $S/kern/genassym.sh Makefile \ ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ - sh $S/kern/genassym.sh ${CC} ${NO_INTEGR_AS} ${CFLAGS} ${CPPFLAGS} -MF assym.P > assym.h.tmp + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} -no-integrated-as -MF assym.P > assym.h.tmp sed '1s/.*/assym.h: \\/' assym.P > assym.d sort -u assym.h.tmp > assym.h |