Module Name: src Committed By: joerg Date: Thu Dec 5 16:26:04 UTC 2013
Modified Files: src/sys/arch/evbarm/stand/boot2440: Makefile src/sys/arch/evbarm/stand/bootimx23: Makefile src/sys/arch/evbarm/stand/gzboot: Makefile.gzboot src/sys/arch/zaurus/stand/zboot: Makefile Log Message: Use -marm for clang builds, too. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/stand/boot2440/Makefile cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/stand/bootimx23/Makefile cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot cvs rdiff -u -r1.13 -r1.14 src/sys/arch/zaurus/stand/zboot/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/evbarm/stand/boot2440/Makefile diff -u src/sys/arch/evbarm/stand/boot2440/Makefile:1.13 src/sys/arch/evbarm/stand/boot2440/Makefile:1.14 --- src/sys/arch/evbarm/stand/boot2440/Makefile:1.13 Mon Nov 4 21:25:05 2013 +++ src/sys/arch/evbarm/stand/boot2440/Makefile Thu Dec 5 16:26:04 2013 @@ -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+= -DDM9000MAC="0x08,0x08,0x11,0 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 -CPPFLAGS+= -mno-thumb -mno-thumb-interwork -.else +.if ${HAVE_LLVM:Uno} != "no" || ${HAVE_GCC:U0} >= 48 CPPFLAGS+= -marm +.else +CPPFLAGS+= -mno-thumb -mno-thumb-interwork .endif CPUFLAGS= DBG= -Os +CWARNFLAGS.clang+= -Wno-asm-operand-widths + LIBCRT0= # nothing LIBCRTBEGIN= # nothing LIBCRTEND= # nothing Index: src/sys/arch/evbarm/stand/bootimx23/Makefile diff -u src/sys/arch/evbarm/stand/bootimx23/Makefile:1.10 src/sys/arch/evbarm/stand/bootimx23/Makefile:1.11 --- src/sys/arch/evbarm/stand/bootimx23/Makefile:1.10 Mon Nov 4 21:25:05 2013 +++ src/sys/arch/evbarm/stand/bootimx23/Makefile Thu Dec 5 16:26:04 2013 @@ -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+= -D_STANDALONE -DMEMSIZE=64 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 -CPPFLAGS+= -mno-thumb -mno-thumb-interwork -.else +.if ${HAVE_LLVM:Uno} != "no" || ${HAVE_GCC:U0} >= 48 CPPFLAGS+= -marm +.else +CPPFLAGS+= -mno-thumb -mno-thumb-interwork .endif #CPPFLAGS+= -DDEBUG #CPPFLAGS+= -DDIAGNOSTIC Index: src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot diff -u src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.27 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.28 --- src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.27 Mon Nov 4 21:25:05 2013 +++ src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot Thu Dec 5 16:26:04 2013 @@ -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+= -nostdinc -I. -I${EVBARM_STAN 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 Index: src/sys/arch/zaurus/stand/zboot/Makefile diff -u src/sys/arch/zaurus/stand/zboot/Makefile:1.13 src/sys/arch/zaurus/stand/zboot/Makefile:1.14 --- src/sys/arch/zaurus/stand/zboot/Makefile:1.13 Mon Nov 4 21:30:16 2013 +++ src/sys/arch/zaurus/stand/zboot/Makefile Thu Dec 5 16:26:04 2013 @@ -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+= -nostdinc -I. -I${.CURDIR} -I CPPFLAGS+= -D_STANDALONE -DHEAP_VARIABLE CPPFLAGS+= -DLIBSA_ENABLE_LS_OP CPPFLAGS+= -mabi=apcs-gnu -mfloat-abi=soft -mcpu=xscale -.if ${HAVE_GCC} < 48 -CPPFLAGS+= -mno-thumb -mno-thumb-interwork -.else +.if ${HAVE_LLVM:Uno} != "no" || ${HAVE_GCC:U0} >= 48 CPPFLAGS+= -marm +.else +CPPFLAGS+= -mno-thumb -mno-thumb-interwork .endif CPUFLAGS= AFLAGS+= -D_LOCORE