Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk compat: Disable relro in 32-bit arm compat.



details:   https://anonhg.NetBSD.org/src/rev/d0384083a019
branches:  trunk
changeset: 374795:d0384083a019
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sat May 13 10:56:54 2023 +0000

description:
compat: Disable relro in 32-bit arm compat.

Not supported by binutils:

ld: warning: -z relro ignored

PR toolchain/57405

diffstat:

 compat/arm/eabi/bsd.eabi.mk     |  5 ++++-
 compat/arm/eabihf/bsd.eabihf.mk |  5 ++++-
 share/mk/bsd.own.mk             |  5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diffs (57 lines):

diff -r 0212e8e29400 -r d0384083a019 compat/arm/eabi/bsd.eabi.mk
--- a/compat/arm/eabi/bsd.eabi.mk       Sat May 13 10:56:08 2023 +0000
+++ b/compat/arm/eabi/bsd.eabi.mk       Sat May 13 10:56:54 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.eabi.mk,v 1.6 2023/05/13 10:56:08 riastradh Exp $
+#      $NetBSD: bsd.eabi.mk,v 1.7 2023/05/13 10:56:54 riastradh Exp $
 
 .if !defined(MLIBDIR)
 
@@ -62,6 +62,9 @@ LDADD+=                       ${EARM_COMPAT_FLAGS}
 LDFLAGS+=              ${EARM_COMPAT_FLAGS}
 MKDEPFLAGS+=           ${EARM_COMPAT_FLAGS}
 
+# sync with MKRELRO in bsd.own.mk
+NORELRO=               # defined
+
 .include "${.PARSEDIR}/../../Makefile.compat"
 
 .endif
diff -r 0212e8e29400 -r d0384083a019 compat/arm/eabihf/bsd.eabihf.mk
--- a/compat/arm/eabihf/bsd.eabihf.mk   Sat May 13 10:56:08 2023 +0000
+++ b/compat/arm/eabihf/bsd.eabihf.mk   Sat May 13 10:56:54 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.eabihf.mk,v 1.4 2023/05/13 10:56:08 riastradh Exp $
+#      $NetBSD: bsd.eabihf.mk,v 1.5 2023/05/13 10:56:55 riastradh Exp $
 
 .if !defined(MLIBDIR)
 
@@ -62,6 +62,9 @@ LDADD+=                       ${EARM_COMPAT_FLAGS}
 LDFLAGS+=              ${EARM_COMPAT_FLAGS}
 MKDEPFLAGS+=           ${EARM_COMPAT_FLAGS}
 
+# sync with MKRELRO in bsd.own.mk
+NORELRO=               # defined
+
 .include "${.PARSEDIR}/../../Makefile.compat"
 
 .endif
diff -r 0212e8e29400 -r d0384083a019 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Sat May 13 10:56:08 2023 +0000
+++ b/share/mk/bsd.own.mk       Sat May 13 10:56:54 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.1318 2023/05/12 11:49:47 ryoon Exp $
+#      $NetBSD: bsd.own.mk,v 1.1319 2023/05/13 10:56:55 riastradh Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1137,6 +1137,9 @@ MKPIE?=           no
 #
 # RELRO is enabled on i386, amd64, and aarch64 by default
 #
+# sync with NORELRO in compat/*/*/bsd.*.mk for the relro-enabled 64-bit
+# platforms with relro-disabled 32-bit compat
+#
 .if ${MACHINE} == "i386" || \
     ${MACHINE} == "amd64" || \
     ${MACHINE_ARCH:Maarch64*}



Home | Main Index | Thread Index | Old Index