Module Name: src
Committed By: matt
Date: Wed Jan 23 02:15:53 UTC 2013
Modified Files:
src/libexec/ld.elf_so/arch/arm [matt-nb6-plus]: Makefile.inc
Log Message:
Handle CPUFLAGS being empty
To generate a diff of this commit:
cvs rdiff -u -r1.11.46.1 -r1.11.46.2 \
src/libexec/ld.elf_so/arch/arm/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/arch/arm/Makefile.inc
diff -u src/libexec/ld.elf_so/arch/arm/Makefile.inc:1.11.46.1 src/libexec/ld.elf_so/arch/arm/Makefile.inc:1.11.46.2
--- src/libexec/ld.elf_so/arch/arm/Makefile.inc:1.11.46.1 Tue Jan 22 21:47:28 2013
+++ src/libexec/ld.elf_so/arch/arm/Makefile.inc Wed Jan 23 02:15:53 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.11.46.1 2013/01/22 21:47:28 matt Exp $
+# $NetBSD: Makefile.inc,v 1.11.46.2 2013/01/23 02:15:53 matt Exp $
SRCS+= rtld_start.S mdreloc.c
@@ -6,7 +6,8 @@ SRCS+= rtld_start.S mdreloc.c
CPPFLAGS+= -fpic
CPPFLAGS+= -DELFSIZE=32
-.if ${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb"
+.if ${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb" \
+ || (!empty(CPUFLAGS) && ${CPUFLAGS:M-mabi=aapcs*} != "")
CPPFLAGS+= -DHAVE_INITFINI_ARRAY
.endif
