Tue Jan 22 22:49:09 2013 UTC ()
If you are using aapcs, you must be using INITFINI


(matt)
diff -r1.12 -r1.13 src/libexec/ld.elf_so/arch/arm/Makefile.inc

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

--- src/libexec/ld.elf_so/arch/arm/Makefile.inc 2012/08/15 03:46:07 1.12
+++ src/libexec/ld.elf_so/arch/arm/Makefile.inc 2013/01/22 22:49:09 1.13
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.12 2012/08/15 03:46:07 matt Exp $ 1# $NetBSD: Makefile.inc,v 1.13 2013/01/22 22:49:09 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 ${CFLAGS: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