Drop -z nocombreloc. That's a rev 1.1 commit so not clear why it was needed

then; perhaps fixed by the bump in binutils?  Anyway, builds seem good without
it and that enables the full relro layout for ld.so.

ok kettenis@

diff --git a/libexec/ld.so/arm/Makefile.inc b/libexec/ld.so/arm/Makefile.inc
index e7fadb4..844566f 100644 (file)
--- a/libexec/ld.so/arm/Makefile.inc
+++ b/libexec/ld.so/arm/Makefile.inc
@@ -1,9 +1,8 @@
-#      $OpenBSD: Makefile.inc,v 1.4 2012/09/02 16:32:52 jsg Exp $
+#      $OpenBSD: Makefile.inc,v 1.5 2016/08/14 18:46:03 guenther Exp $
 
 CFLAGS += -fpic -msoft-float
 AFLAGS += -D_STANDALONE
 CPPFLAGS += -I${.CURDIR}/../../lib/libc/arch/arm
 SRCS+= divsi3.S
-ELF_LDFLAGS+=-z nocombreloc
 LIBCSRCDIR=${.CURDIR}/../../lib/libc
 .PATH: ${LIBCSRCDIR}/arch/arm/gen