Skip to content

Commit 57f1bae

Browse files
riastradhriastradh
riastradh
authored and
riastradh
committed
compat: Disable relro in 32-bit arm compat.
Not supported by binutils: ld: warning: -z relro ignored PR toolchain/57405
1 parent af3f411 commit 57f1bae

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

compat/arm/eabi/bsd.eabi.mk

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: bsd.eabi.mk,v 1.6 2023/05/13 10:56:08 riastradh Exp $
1+
# $NetBSD: bsd.eabi.mk,v 1.7 2023/05/13 10:56:54 riastradh Exp $
22

33
.if !defined(MLIBDIR)
44

@@ -62,6 +62,9 @@ LDADD+= ${EARM_COMPAT_FLAGS}
6262
LDFLAGS+= ${EARM_COMPAT_FLAGS}
6363
MKDEPFLAGS+= ${EARM_COMPAT_FLAGS}
6464

65+
# sync with MKRELRO in bsd.own.mk
66+
NORELRO= # defined
67+
6568
.include "${.PARSEDIR}/../../Makefile.compat"
6669

6770
.endif

compat/arm/eabihf/bsd.eabihf.mk

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: bsd.eabihf.mk,v 1.4 2023/05/13 10:56:08 riastradh Exp $
1+
# $NetBSD: bsd.eabihf.mk,v 1.5 2023/05/13 10:56:55 riastradh Exp $
22

33
.if !defined(MLIBDIR)
44

@@ -62,6 +62,9 @@ LDADD+= ${EARM_COMPAT_FLAGS}
6262
LDFLAGS+= ${EARM_COMPAT_FLAGS}
6363
MKDEPFLAGS+= ${EARM_COMPAT_FLAGS}
6464

65+
# sync with MKRELRO in bsd.own.mk
66+
NORELRO= # defined
67+
6568
.include "${.PARSEDIR}/../../Makefile.compat"
6669

6770
.endif

share/mk/bsd.own.mk

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: bsd.own.mk,v 1.1318 2023/05/12 11:49:47 ryoon Exp $
1+
# $NetBSD: bsd.own.mk,v 1.1319 2023/05/13 10:56:55 riastradh Exp $
22

33
# This needs to be before bsd.init.mk
44
.if defined(BSD_MK_COMPAT_FILE)
@@ -1137,6 +1137,9 @@ MKPIE?= no
11371137
#
11381138
# RELRO is enabled on i386, amd64, and aarch64 by default
11391139
#
1140+
# sync with NORELRO in compat/*/*/bsd.*.mk for the relro-enabled 64-bit
1141+
# platforms with relro-disabled 32-bit compat
1142+
#
11401143
.if ${MACHINE} == "i386" || \
11411144
${MACHINE} == "amd64" || \
11421145
${MACHINE_ARCH:Maarch64*}

0 commit comments

Comments
 (0)