Module Name:    src
Committed By:   christos
Date:           Fri Jan  6 15:48:29 UTC 2023

Modified Files:
        src/doc: HACKS
        src/share/mk: bsd.sys.mk

Log Message:
Now that the default page size is 4K again for x86_64 with the binutils
change to default to -z separate-code, remove the previous hack.


To generate a diff of this commit:
cvs rdiff -u -r1.233 -r1.234 src/doc/HACKS
cvs rdiff -u -r1.310 -r1.311 src/share/mk/bsd.sys.mk

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

Modified files:

Index: src/doc/HACKS
diff -u src/doc/HACKS:1.233 src/doc/HACKS:1.234
--- src/doc/HACKS:1.233	Thu Dec 29 21:05:38 2022
+++ src/doc/HACKS	Fri Jan  6 10:48:29 2023
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.233 2022/12/30 02:05:38 christos Exp $
+# $NetBSD: HACKS,v 1.234 2023/01/06 15:48:29 christos Exp $
 #
 # This file is intended to document workarounds for currently unsolved
 # (mostly) compiler bugs.
@@ -1072,17 +1072,3 @@ descr
 	clang 13.0.0 miscompiles copy{in,out}() with -O[12]. As a result,
 	kernel cannot execute /sbin/init.
 kcah
-
-hack	Clamp max-page-size in ld to 4K when using relro to avoid 2M binary
-	bloat
-cdate	Thu Dec 29 21:02:43 EST 2022
-who	christos
-port	x86, aarch64
-file	share/mk/bsd.sys.mk: 1.309
-pr	57147
-descr
-	binutils 2.38+ fix for
-	https://sourceware.org/bugzilla/show_bug.cgi?id=28824
-	results in a 2M binary bloat when using relro because of the relro
-	segment alignment. There is no upstream fix yet.
-kcah

Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.310 src/share/mk/bsd.sys.mk:1.311
--- src/share/mk/bsd.sys.mk:1.310	Thu Dec 29 21:01:42 2022
+++ src/share/mk/bsd.sys.mk	Fri Jan  6 10:48:29 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.sys.mk,v 1.310 2022/12/30 02:01:42 christos Exp $
+#	$NetBSD: bsd.sys.mk,v 1.311 2023/01/06 15:48:29 christos Exp $
 #
 # Build definitions used for NetBSD source tree builds.
 
@@ -138,10 +138,7 @@ CFLAGS+=	-Wno-maybe-uninitialized
 .endif
 
 .if ${MKRELRO:Uno} != "no"
-# 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 we only
-# support relro by default on x86 and aarch64
-LDFLAGS+=	-Wl,-z,relro -Wl,-z,max-page-size=4096
+LDFLAGS+=	-Wl,-z,relro
 .endif
 
 .if ${MKRELRO:Uno} == "full" && ${NOFULLRELRO:Uno} == "no"

Reply via email to