From 4b934fe6cc885e53ae00e47539449258b996d639 Mon Sep 17 00:00:00 2001 From: maya Date: Wed, 22 Feb 2017 12:44:21 +0000 Subject: [PATCH] GC gcc < 4.8 logic. -marm implies -mno-thumb, and -mno-thumb-interwork is a GCC default. --- sys/arch/acorn26/stand/Makefile.buildboot | 6 +----- sys/arch/acorn32/stand/Makefile.buildboot | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/sys/arch/acorn26/stand/Makefile.buildboot b/sys/arch/acorn26/stand/Makefile.buildboot index 0583a3ed637b..9564dc18eb0c 100644 --- a/sys/arch/acorn26/stand/Makefile.buildboot +++ b/sys/arch/acorn26/stand/Makefile.buildboot @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.buildboot,v 1.21 2014/01/12 15:26:28 tsutsui Exp $ +# $NetBSD: Makefile.buildboot,v 1.22 2017/02/22 12:44:21 maya Exp $ S?= ${.CURDIR}/../../../.. @@ -35,11 +35,7 @@ CPPFLAGS+= -D_STANDALONE -DHIMEM=0x28000 CPPFLAGS+= -I. -I${.CURDIR}/../../.. -I${.CURDIR}/../../../.. CPPFLAGS+= -I${.CURDIR}/../lib CPPFLAGS+= ${ARM_APCS_FLAGS} -march=armv2 -.if ${HAVE_GCC} < 48 -CPPFLAGS+= -mno-thumb -mno-thumb-interwork -.else CPPFLAGS+= -marm -.endif CFLAGS= -O2 CFLAGS+= -ffreestanding -fno-unwind-tables CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes diff --git a/sys/arch/acorn32/stand/Makefile.buildboot b/sys/arch/acorn32/stand/Makefile.buildboot index 01c83557cdcd..8bd2c39ed838 100644 --- a/sys/arch/acorn32/stand/Makefile.buildboot +++ b/sys/arch/acorn32/stand/Makefile.buildboot @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.buildboot,v 1.21 2014/01/12 15:26:28 tsutsui Exp $ +# $NetBSD: Makefile.buildboot,v 1.22 2017/02/22 12:44:21 maya Exp $ S?= ${.CURDIR}/../../../.. @@ -45,11 +45,7 @@ CPPFLAGS+= -D_STANDALONE CPPFLAGS+= -I. -I${.CURDIR}/../../.. -I${.CURDIR}/../../../.. CPPFLAGS+= -I${.CURDIR}/../lib CPPFLAGS+= ${ARM_APCS_FLAGS} -march=armv3m -.if ${HAVE_GCC} < 48 -CPPFLAGS+= -mno-thumb -mno-thumb-interwork -.else CPPFLAGS+= -marm -.endif CPUFLAGS= CFLAGS= -O2 CFLAGS+= -ffreestanding -fno-unwind-tables