Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Use -marm for clang builds, too.
details: https://anonhg.NetBSD.org/src/rev/6824e37f6e13
branches: trunk
changeset: 791837:6824e37f6e13
user: joerg <joerg%NetBSD.org@localhost>
date: Thu Dec 05 16:26:04 2013 +0000
description:
Use -marm for clang builds, too.
diffstat:
sys/arch/evbarm/stand/boot2440/Makefile | 10 ++++++----
sys/arch/evbarm/stand/bootimx23/Makefile | 8 ++++----
sys/arch/evbarm/stand/gzboot/Makefile.gzboot | 8 ++++----
sys/arch/zaurus/stand/zboot/Makefile | 8 ++++----
4 files changed, 18 insertions(+), 16 deletions(-)
diffs (98 lines):
diff -r 7ef9db0b4221 -r 6824e37f6e13 sys/arch/evbarm/stand/boot2440/Makefile
--- a/sys/arch/evbarm/stand/boot2440/Makefile Thu Dec 05 15:55:35 2013 +0000
+++ b/sys/arch/evbarm/stand/boot2440/Makefile Thu Dec 05 16:26:04 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2013/11/04 21:25:05 christos Exp $
+# $NetBSD: Makefile,v 1.14 2013/12/05 16:26:04 joerg Exp $
S= ${.CURDIR}/../../../..
@@ -16,14 +16,16 @@
CPPFLAGS+= -DDEFAULT_BOOTFILE="ld0a:netbsd;net:"
CPPFLAGS+= -nostdinc -I. -I${.OBJDIR} -I${S} -I${S}/arch
CPPFLAGS+= -march=armv4 -mabi=apcs-gnu -mfloat-abi=soft
-.if ${HAVE_GCC} < 48
+.if ${HAVE_LLVM:Uno} != "no" || ${HAVE_GCC:U0} >= 48
+CPPFLAGS+= -marm
+.else
CPPFLAGS+= -mno-thumb -mno-thumb-interwork
-.else
-CPPFLAGS+= -marm
.endif
CPUFLAGS=
DBG= -Os
+CWARNFLAGS.clang+= -Wno-asm-operand-widths
+
LIBCRT0= # nothing
LIBCRTBEGIN= # nothing
LIBCRTEND= # nothing
diff -r 7ef9db0b4221 -r 6824e37f6e13 sys/arch/evbarm/stand/bootimx23/Makefile
--- a/sys/arch/evbarm/stand/bootimx23/Makefile Thu Dec 05 15:55:35 2013 +0000
+++ b/sys/arch/evbarm/stand/bootimx23/Makefile Thu Dec 05 16:26:04 2013 +0000
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.10 2013/11/04 21:25:05 christos Exp $
+# $Id: Makefile,v 1.11 2013/12/05 16:26:04 joerg Exp $
S= ${.CURDIR}/../../../../
PROG= bootimx23
@@ -13,10 +13,10 @@
CPPFLAGS+= -DKERNEL_BOOT_ARGS=\"root=ld0a\"
CPPFLAGS+= -nostdinc -I. -I${.CURDIR} -I${.OBJDIR} -I${S} -I${S}/arch
CPPFLAGS+= -mabi=apcs-gnu -mfloat-abi=soft
-.if ${HAVE_GCC} < 48
+.if ${HAVE_LLVM:Uno} != "no" || ${HAVE_GCC:U0} >= 48
+CPPFLAGS+= -marm
+.else
CPPFLAGS+= -mno-thumb -mno-thumb-interwork
-.else
-CPPFLAGS+= -marm
.endif
#CPPFLAGS+= -DDEBUG
#CPPFLAGS+= -DDIAGNOSTIC
diff -r 7ef9db0b4221 -r 6824e37f6e13 sys/arch/evbarm/stand/gzboot/Makefile.gzboot
--- a/sys/arch/evbarm/stand/gzboot/Makefile.gzboot Thu Dec 05 15:55:35 2013 +0000
+++ b/sys/arch/evbarm/stand/gzboot/Makefile.gzboot Thu Dec 05 16:26:04 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.gzboot,v 1.27 2013/11/04 21:25:05 christos Exp $
+# $NetBSD: Makefile.gzboot,v 1.28 2013/12/05 16:26:04 joerg Exp $
NOMAN= # defined
@@ -37,10 +37,10 @@
CPPFLAGS+= -I${S} -I${S}/arch -I${S}/lib/libsa
CPPFLAGS+= -I${S}/../common/dist/zlib
CPPFLAGS+= -mabi=apcs-gnu -mfloat-abi=soft
-.if ${HAVE_GCC} < 48
-CPPFLAGS+= -mno-thumb -mno-thumb-interwork
+.if ${HAVE_LLVM:Uno} != "no" || ${HAVE_GCC:U0} >= 48
+CPPFLAGS+= -marm
.else
-CPPFLAGS+= -marm
+CPPFLAGS+= -mno-thumb -mno-thumb-interwork
.endif
CPPFLAGS+= -D_STANDALONE
diff -r 7ef9db0b4221 -r 6824e37f6e13 sys/arch/zaurus/stand/zboot/Makefile
--- a/sys/arch/zaurus/stand/zboot/Makefile Thu Dec 05 15:55:35 2013 +0000
+++ b/sys/arch/zaurus/stand/zboot/Makefile Thu Dec 05 16:26:04 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2013/11/04 21:30:16 christos Exp $
+# $NetBSD: Makefile,v 1.14 2013/12/05 16:26:04 joerg Exp $
PROG= zboot
@@ -22,10 +22,10 @@
CPPFLAGS+= -D_STANDALONE -DHEAP_VARIABLE
CPPFLAGS+= -DLIBSA_ENABLE_LS_OP
CPPFLAGS+= -mabi=apcs-gnu -mfloat-abi=soft -mcpu=xscale
-.if ${HAVE_GCC} < 48
+.if ${HAVE_LLVM:Uno} != "no" || ${HAVE_GCC:U0} >= 48
+CPPFLAGS+= -marm
+.else
CPPFLAGS+= -mno-thumb -mno-thumb-interwork
-.else
-CPPFLAGS+= -marm
.endif
CPUFLAGS=
AFLAGS+= -D_LOCORE
Home |
Main Index |
Thread Index |
Old Index