diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2018-10-31 10:15:48 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2018-10-31 10:15:48 +0000 |
| commit | d09c6c4b7ec51b6fe17ec6ac4a28f9796cdf0fd2 (patch) | |
| tree | e6c9a4e14e10b25e30f1b6fcff90b45e65583208 | |
| parent | 98e95f84c45a956def773dfabbed69e8f4fa2a77 (diff) | |
Bring over gapdummy.c changes from amd64/amr64/armv7/i386.
ok deraadt@, mortimer@, visa@
| -rw-r--r-- | sys/arch/loongson/conf/Makefile.loongson | 4 | ||||
| -rw-r--r-- | sys/arch/octeon/conf/Makefile.octeon | 4 | ||||
| -rw-r--r-- | sys/arch/sgi/conf/Makefile.sgi | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/loongson/conf/Makefile.loongson b/sys/arch/loongson/conf/Makefile.loongson index d9c191ef474..449c099c0b2 100644 --- a/sys/arch/loongson/conf/Makefile.loongson +++ b/sys/arch/loongson/conf/Makefile.loongson @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.loongson,v 1.71 2018/09/14 13:49:01 naddy Exp $ +# $OpenBSD: Makefile.loongson,v 1.72 2018/10/31 10:15:47 kettenis Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -121,7 +121,7 @@ ld.script: ${_machdir}/conf/ld.script cp ${_machdir}/conf/ld.script $@ gapdummy.o: - echo 'const char gapdummy;' > gapdummy.c + echo '__asm(".section .rodata,\"a\"");' > gapdummy.c ${CC} -c ${CFLAGS} ${CPPFLAGS} gapdummy.c -o $@ makegap.sh: diff --git a/sys/arch/octeon/conf/Makefile.octeon b/sys/arch/octeon/conf/Makefile.octeon index efcfce8b750..73a548eab07 100644 --- a/sys/arch/octeon/conf/Makefile.octeon +++ b/sys/arch/octeon/conf/Makefile.octeon @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.octeon,v 1.50 2018/09/14 13:49:01 naddy Exp $ +# $OpenBSD: Makefile.octeon,v 1.51 2018/10/31 10:15:47 kettenis Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -121,7 +121,7 @@ ld.script: ${_machdir}/conf/ld.script cp ${_machdir}/conf/ld.script $@ gapdummy.o: - echo 'const char gapdummy;' > gapdummy.c + echo '__asm(".section .rodata,\"a\"");' > gapdummy.c ${CC} -c ${CFLAGS} ${CPPFLAGS} gapdummy.c -o $@ makegap.sh: diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi index abdae58c2b5..a1d4ca7fac9 100644 --- a/sys/arch/sgi/conf/Makefile.sgi +++ b/sys/arch/sgi/conf/Makefile.sgi @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sgi,v 1.95 2018/09/14 13:49:01 naddy Exp $ +# $OpenBSD: Makefile.sgi,v 1.96 2018/10/31 10:15:47 kettenis Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -121,7 +121,7 @@ ld.script: ${_machdir}/conf/ld.script cp ${_machdir}/conf/ld.script $@ gapdummy.o: - echo 'const char gapdummy;' > gapdummy.c + echo '__asm(".section .rodata,\"a\"");' > gapdummy.c ${CC} -c ${CFLAGS} ${CPPFLAGS} gapdummy.c -o $@ makegap.sh: |