CVS commit: pkgsrc/mk/compiler

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jan  6 23:11:32 UTC 2023

Modified Files:
        pkgsrc/mk/compiler: clang.mk gcc.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/mk/compiler/clang.mk
cvs rdiff -u -r1.248 -r1.249 pkgsrc/mk/compiler/gcc.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/compiler/clang.mk
diff -u pkgsrc/mk/compiler/clang.mk:1.38 pkgsrc/mk/compiler/clang.mk:1.39
--- pkgsrc/mk/compiler/clang.mk:1.38    Sat Dec 31 08:35:37 2022
+++ pkgsrc/mk/compiler/clang.mk Fri Jan  6 23:11:31 2023
@@ -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 @@ _RELRO_LDFLAGS=              -Wl,-zrelro -Wl,-znow
 .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"

Index: pkgsrc/mk/compiler/gcc.mk
diff -u pkgsrc/mk/compiler/gcc.mk:1.248 pkgsrc/mk/compiler/gcc.mk:1.249
--- pkgsrc/mk/compiler/gcc.mk:1.248     Sat Dec 31 08:35:37 2022
+++ pkgsrc/mk/compiler/gcc.mk   Fri Jan  6 23:11:31 2023
@@ -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 @@ _RELRO_LDFLAGS=            -Wl,-zrelro -Wl,-znow
 .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