From: guenther <guenther@openbsd.org>
Date: Mon, 15 Aug 2016 03:09:02 +0000 (+0000)
Subject: Drop -z nocombreloc.  It was a rev 1.1 commit like on arm, so not clear
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=2cf96f4558b085ff2d90ed4d1387b082eabb854c;p=openbsd

Drop -z nocombreloc.  It was a rev 1.1 commit like on arm, so not clear
why it was needed then; perhaps fixed by the bump in binutils?
Removing it enables the full relro layout for ld.so.
---

diff --git a/libexec/ld.so/sh/Makefile.inc b/libexec/ld.so/sh/Makefile.inc
index 6c78297fbb9..9f63b862d5b 100644
--- a/libexec/ld.so/sh/Makefile.inc
+++ b/libexec/ld.so/sh/Makefile.inc
@@ -1,9 +1,8 @@
-#	$OpenBSD: Makefile.inc,v 1.5 2012/09/02 16:32:52 jsg Exp $
+#	$OpenBSD: Makefile.inc,v 1.6 2016/08/15 03:09:02 guenther Exp $
 
 CFLAGS += -fpic
 CFLAGS+=-m4-nofpu
 AFLAGS += -D_STANDALONE
 CPPFLAGS += -I${.CURDIR}/../../lib/libc/arch/sh
-ELF_LDFLAGS+=-z nocombreloc
 LIBCSRCDIR=${.CURDIR}/../../lib/libc
 LDADD=	`$(CC) -print-libgcc-file-name`