Wed Jan 23 02:15:53 2013 UTC ()
Handle CPUFLAGS being empty


(matt)
diff -r1.11.46.1 -r1.11.46.2 src/libexec/ld.elf_so/arch/arm/Makefile.inc
cvs diff -r1.11.46.1 -r1.11.46.2 src/libexec/ld.elf_so/arch/arm/Makefile.inc (expand / switch to unified diff)

--- src/libexec/ld.elf_so/arch/arm/Makefile.inc 2013/01/22 21:47:28 1.11.46.1
+++ src/libexec/ld.elf_so/arch/arm/Makefile.inc 2013/01/23 02:15:53 1.11.46.2
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.11.46.1 2013/01/22 21:47:28 matt Exp $ 1# $NetBSD: Makefile.inc,v 1.11.46.2 2013/01/23 02:15:53 matt Exp $
2 2
3SRCS+= rtld_start.S mdreloc.c 3SRCS+= rtld_start.S mdreloc.c
4 4
5# XXX Should not be in CPPFLAGS! 5# XXX Should not be in CPPFLAGS!
6CPPFLAGS+= -fpic 6CPPFLAGS+= -fpic
7 7
8CPPFLAGS+= -DELFSIZE=32 8CPPFLAGS+= -DELFSIZE=32
9.if ${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb" 9.if ${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb" \
 10 || (!empty(CPUFLAGS) && ${CPUFLAGS:M-mabi=aapcs*} != "")
10CPPFLAGS+= -DHAVE_INITFINI_ARRAY 11CPPFLAGS+= -DHAVE_INITFINI_ARRAY
11.endif 12.endif
12 13
13LDFLAGS+= -Wl,-e,_rtld_start 14LDFLAGS+= -Wl,-e,_rtld_start