diff --git a/compat/arm/eabi/bsd.eabi.mk b/compat/arm/eabi/bsd.eabi.mk index 44b5b5c305d1..f0c9ea875c62 100644 --- a/compat/arm/eabi/bsd.eabi.mk +++ b/compat/arm/eabi/bsd.eabi.mk @@ -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 --git a/compat/arm/eabihf/bsd.eabihf.mk b/compat/arm/eabihf/bsd.eabihf.mk index b6386fcd58ae..917e2b56d752 100644 --- a/compat/arm/eabihf/bsd.eabihf.mk +++ b/compat/arm/eabihf/bsd.eabihf.mk @@ -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 --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 2e51036f5ca5..2635df63dc94 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -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*}