diff --git a/libexec/ld.elf_so/Makefile b/libexec/ld.elf_so/Makefile
index 1d08032b096e..776f637dee76 100644
--- a/libexec/ld.elf_so/Makefile
+++ b/libexec/ld.elf_so/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.139 2018/10/17 23:36:58 joerg Exp $
+#	$NetBSD: Makefile,v 1.140 2018/12/27 18:58:14 christos Exp $
 #
 # NOTE: when changing ld.so, ensure that ldd still compiles.
 #
@@ -97,6 +97,7 @@ CPPFLAGS+=	-I${.CURDIR} -I. -D_KERNTYPES
 CPPFLAGS+=	-DRTLD_LOADER
 CPPFLAGS+=	-DGNU_RELRO
 CPPFLAGS+=	-D_RTLD_SOURCE
+CPPFLAGS+=	-DHAVE_INITFINI_ARRAY
 #CPPFLAGS+=	-DDEBUG
 #CPPFLAGS+=	-DRTLD_DEBUG
 #CPPFLAGS+=	-DRTLD_DEBUG_RELOC
diff --git a/libexec/ld.elf_so/arch/aarch64/Makefile.inc b/libexec/ld.elf_so/arch/aarch64/Makefile.inc
index 15d68406d190..1d19a83fc941 100644
--- a/libexec/ld.elf_so/arch/aarch64/Makefile.inc
+++ b/libexec/ld.elf_so/arch/aarch64/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2014/08/10 05:47:37 matt Exp $
+# $NetBSD: Makefile.inc,v 1.2 2018/12/27 18:58:14 christos Exp $
 
 SRCS+=		rtld_start.S mdreloc.c
 
@@ -6,7 +6,6 @@ SRCS+=		rtld_start.S mdreloc.c
 CPPFLAGS+=	-fpic
 
 CPPFLAGS+=	-DELFSIZE=64
-CPPFLAGS+=	-DHAVE_INITFINI_ARRAY
 CPPFLAGS+=	-DELF_NOTE_MARCH_DESC=\"${LDELFSO_MACHINE_ARCH}\"
 
 LDFLAGS+=	-Wl,-e,_rtld_start
diff --git a/libexec/ld.elf_so/arch/arm/Makefile.inc b/libexec/ld.elf_so/arch/arm/Makefile.inc
index b21be59fe9d5..52d4520ff3dc 100644
--- a/libexec/ld.elf_so/arch/arm/Makefile.inc
+++ b/libexec/ld.elf_so/arch/arm/Makefile.inc
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.21 2018/04/03 21:10:27 joerg Exp $
+#	$NetBSD: Makefile.inc,v 1.22 2018/12/27 18:58:14 christos Exp $
 
 SRCS+=		rtld_start.S mdreloc.c
 #CPUFLAGS.rtld_start.S+=	-marm
@@ -9,7 +9,6 @@ CPPFLAGS+=	-fpic
 CPPFLAGS+=	-DELFSIZE=32
 CPPFLAGS+=	-DRTLD_COMMON_CALL_IFUNC_REL
 .if !empty(LDELFSO_MACHINE_ARCH:Mearm*)
-CPPFLAGS+=	-DHAVE_INITFINI_ARRAY
 CPPFLAGS+=	-DELF_NOTE_MARCH_DESC=\"${LDELFSO_MACHINE_ARCH}\"
 SRCS+=		find_exidx.c
 .endif
diff --git a/libexec/ld.elf_so/arch/riscv/Makefile.inc b/libexec/ld.elf_so/arch/riscv/Makefile.inc
index 74064faecd19..cbb3e61ab1da 100644
--- a/libexec/ld.elf_so/arch/riscv/Makefile.inc
+++ b/libexec/ld.elf_so/arch/riscv/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2014/09/19 17:36:25 matt Exp $
+# $NetBSD: Makefile.inc,v 1.2 2018/12/27 18:58:14 christos Exp $
 
 SRCS+=		rtld_start.S mdreloc.c
 
@@ -10,6 +10,5 @@ CPPFLAGS+=	-DELFSIZE=64
 .else
 CPPFLAGS+=	-DELFSIZE=32
 .endif
-CPPFLAGS+=	-DHAVE_INITFINI_ARRAY
 
 LDFLAGS+=	-Wl,-e,_rtld_start