[pkgsrc/trunk]: pkgsrc/mk/compiler mk: remove relro hack for NetBSD-current, ...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/de8fa32a332f
branches:  trunk
changeset: 391249:de8fa32a332f
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Jan 06 23:11:31 2023 +0000

description:
mk: remove relro hack for NetBSD-current, fixed in the base system

diffstat:

 mk/compiler/clang.mk |  8 +-------
 mk/compiler/gcc.mk   |  8 +-------
 2 files changed, 2 insertions(+), 14 deletions(-)

diffs (44 lines):

diff -r fc1134f03a94 -r de8fa32a332f mk/compiler/clang.mk
--- a/mk/compiler/clang.mk      Fri Jan 06 17:42:13 2023 +0000
+++ b/mk/compiler/clang.mk      Fri Jan 06 23:11:31 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: clang.mk,v 1.38 2022/12/31 08:35:37 wiz Exp $
+# $NetBSD: clang.mk,v 1.39 2023/01/06 23:11:31 wiz Exp $
 #
 # This is the compiler definition for the clang compiler.
 #
@@ -62,12 +62,6 @@
 .else
 _RELRO_LDFLAGS=                -Wl,-zrelro
 .endif
-# XXX Workaround for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1014301
-# Set manually the maxpagesize to 4096 which is ok for now since NetBSD only
-# supports relro by default on x86 and aarch64
-.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} > 109901
-_RELRO_LDFLAGS+=       -Wl,-z,max-page-size=4096
-.endif
 
 # The user can choose the level of stack smashing protection.
 .if ${PKGSRC_USE_SSP} == "all"
diff -r fc1134f03a94 -r de8fa32a332f mk/compiler/gcc.mk
--- a/mk/compiler/gcc.mk        Fri Jan 06 17:42:13 2023 +0000
+++ b/mk/compiler/gcc.mk        Fri Jan 06 23:11:31 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.248 2022/12/31 08:35:37 wiz Exp $
+# $NetBSD: gcc.mk,v 1.249 2023/01/06 23:11:31 wiz Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -444,12 +444,6 @@
 .else
 _RELRO_LDFLAGS=                -Wl,-zrelro
 .endif
-# XXX Workaround for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1014301
-# Set manually the maxpagesize to 4096 which is ok for now since NetBSD only
-# supports relro by default on x86 and aarch64
-.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} > 109901
-_RELRO_LDFLAGS+=       -Wl,-z,max-page-size=4096
-.endif
 
 .if !empty(_RELRO_LDFLAGS) && !empty(MACHINE_PLATFORM:MNetBSD-*-*mips*)
 _RELRO_LDFLAGS+=       -Wl,-z,common-page-size=0x10000