Module Name: src
Committed By: christos
Date: Fri Jan 6 15:35:06 UTC 2023
Modified Files:
src/sys/arch/amd64/conf: Makefile.amd64
src/sys/arch/i386/conf: Makefile.i386
Log Message:
Explicitly set -z noseparate-code because the default is about to change
and the boot blocks might not be able to load binaries with more than two
PT_LOAD sections.
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/amd64/conf/Makefile.amd64
cvs rdiff -u -r1.196 -r1.197 src/sys/arch/i386/conf/Makefile.i386
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.85 src/sys/arch/amd64/conf/Makefile.amd64:1.86
--- src/sys/arch/amd64/conf/Makefile.amd64:1.85 Mon May 11 11:15:15 2020
+++ src/sys/arch/amd64/conf/Makefile.amd64 Fri Jan 6 10:35:06 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.85 2020/05/11 15:15:15 joerg Exp $
+# $NetBSD: Makefile.amd64,v 1.86 2023/01/06 15:35:06 christos Exp $
# Makefile for NetBSD
#
@@ -109,6 +109,7 @@ EXTRA_LINKFLAGS= -z max-page-size=0x2000
KERNLDSCRIPT?= ${AMD64}/conf/kern.ldscript
.endif
LINKFLAGS_NORMAL= -X
+EXTRA_LINKFLAGS+= -z noseparate-code
##
## (6) port specific target dependencies
Index: src/sys/arch/i386/conf/Makefile.i386
diff -u src/sys/arch/i386/conf/Makefile.i386:1.196 src/sys/arch/i386/conf/Makefile.i386:1.197
--- src/sys/arch/i386/conf/Makefile.i386:1.196 Mon May 11 11:15:15 2020
+++ src/sys/arch/i386/conf/Makefile.i386 Fri Jan 6 10:35:05 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.i386,v 1.196 2020/05/11 15:15:15 joerg Exp $
+# $NetBSD: Makefile.i386,v 1.197 2023/01/06 15:35:05 christos Exp $
# Makefile for NetBSD
#
@@ -45,6 +45,7 @@ CFLAGS+= ${${ACTIVE_CC} == "gcc" :? -min
CFLAGS+= ${${ACTIVE_CC} == "gcc" :? -mindirect-branch-register :}
.endif
EXTRA_INCLUDES= -I$S/external/mit/xen-include-public/dist/
+EXTRA_LINKFLAGS= -z noseparate-code
##
## (3) libkern and compat
