[src/trunk]: src If you are using aapcs, you must be using INITFINI

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/12cee1349e3e
branches:  trunk
changeset: 784243:12cee1349e3e
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Jan 22 22:49:09 2013 +0000

description:
If you are using aapcs, you must be using INITFINI

diffstat:

 lib/csu/arch/arm/Makefile.inc           |  6 +++++-
 libexec/ld.elf_so/arch/arm/Makefile.inc |  5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r bbac4952c905 -r 12cee1349e3e lib/csu/arch/arm/Makefile.inc
--- a/lib/csu/arch/arm/Makefile.inc     Tue Jan 22 22:40:31 2013 +0000
+++ b/lib/csu/arch/arm/Makefile.inc     Tue Jan 22 22:49:09 2013 +0000
@@ -1,3 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.2 2012/09/16 13:46:49 skrll Exp $
+# $NetBSD: Makefile.inc,v 1.3 2013/01/22 22:49:48 matt Exp $
 
 CPPFLAGS+=     -DELFSIZE=32
+.if ${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb" \
+    || ${CPUFLAGS:M-mabi=aapcs*} != ""
+CPPFLAGS+=      -DHAVE_INITFINI_ARRAY
+.endif
diff -r bbac4952c905 -r 12cee1349e3e libexec/ld.elf_so/arch/arm/Makefile.inc
--- a/libexec/ld.elf_so/arch/arm/Makefile.inc   Tue Jan 22 22:40:31 2013 +0000
+++ b/libexec/ld.elf_so/arch/arm/Makefile.inc   Tue Jan 22 22:49:09 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.12 2012/08/15 03:46:07 matt Exp $
+#      $NetBSD: Makefile.inc,v 1.13 2013/01/22 22:49:09 matt Exp $
 
 SRCS+=         rtld_start.S mdreloc.c
 
@@ -6,7 +6,8 @@
 CPPFLAGS+=     -fpic
 
 CPPFLAGS+=     -DELFSIZE=32
-.if ${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb"
+.if ${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb" || \
+  ${CFLAGS:Mabi=aapcs} != ""
 CPPFLAGS+=     -DHAVE_INITFINI_ARRAY
 .endif