diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2012-10-19 13:52:00 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2012-10-19 13:52:00 +0000 |
| commit | 3a6a5cd97b932882a2e060287770c5cf3a4d48b4 (patch) | |
| tree | 0d16b9100c1df314f722140c0df7cbb57be78d37 | |
| parent | 5f33ca72e5675cd08a24fcb228649c1a3ef7d74f (diff) | |
Be sure to compile boot block objects with -D_NO_ABICALLS, to prevent .S files
in libkern from getting a ".abicalls" pseudo-op from including <machine/asm.h>;
this will in turn flag the .o file as PIC even though it doesn't contain PIC
code, really.
This gets rid of the annoying "linking PIC files with non-PIC files" warnings
spewed by ld at link time.
| -rw-r--r-- | sys/arch/sgi/stand/Makefile.inc | 4 | ||||
| -rw-r--r-- | sys/arch/sgi/stand/Makefile32.inc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/sgi/stand/Makefile.inc b/sys/arch/sgi/stand/Makefile.inc index 4b1eb631c6b..b99376334ec 100644 --- a/sys/arch/sgi/stand/Makefile.inc +++ b/sys/arch/sgi/stand/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.9 2012/08/31 08:14:08 pascal Exp $ +# $OpenBSD: Makefile.inc,v 1.10 2012/10/19 13:51:59 miod Exp $ # $NetBSD: Makefile.inc,v 1.7 2000/08/20 14:57:16 mrg Exp $ .ifndef __INCLUDED_STAND_MAKEFILE_INC @@ -15,7 +15,7 @@ CPPFLAGS+= -I. CFLAGS+= -fno-stack-protector -Wall CFLAGS+= -fno-builtin-vprintf -fno-builtin-printf -fno-builtin-putchar CFLAGS+= -fno-builtin-exit -SAABI?= -mips3 -mno-abicalls -G 0 -fno-pic -fno-common +SAABI?= -mips3 -mno-abicalls -D_NO_ABICALLS -G 0 -fno-pic -fno-common AS?= as LD?= ld LIBSA_CPPFLAGS?= -DNEEDS_HEAP_H diff --git a/sys/arch/sgi/stand/Makefile32.inc b/sys/arch/sgi/stand/Makefile32.inc index fe3c00b9b0c..1ab3306ff10 100644 --- a/sys/arch/sgi/stand/Makefile32.inc +++ b/sys/arch/sgi/stand/Makefile32.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile32.inc,v 1.4 2010/09/14 08:46:13 miod Exp $ +# $OpenBSD: Makefile32.inc,v 1.5 2012/10/19 13:51:59 miod Exp $ .ifndef __INCLUDED_STAND_MAKEFILE32_INC __INCLUDED_STAND_MAKEFILE32_INC= @@ -12,7 +12,7 @@ CFLAGS+= -fno-builtin-memset CFLAGS+= -fno-builtin-strncpy CFLAGS+= -fno-builtin-strncmp # Override toolchain options to force 32 bit binaries -SAABI= -mno-abicalls -mabi=32 -mips2 -Wa,-G0 +SAABI= -mno-abicalls -D_NO_ABICALLS -mabi=32 -mips2 -Wa,-G0 AS?= as AS+= -32 LD?= ld |