Module Name: src
Committed By: mrg
Date: Fri Dec 18 17:10:07 UTC 2009
Modified Files:
src/libexec/ld.elf_so/arch/mips: Makefile.inc
Log Message:
use COPTS for -G0.
replace ${CPUFLAGS:M-mabi=64:M-mabi=o64} with two constructs.
the former doesn't seem to work anymore.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/libexec/ld.elf_so/arch/mips/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/arch/mips/Makefile.inc
diff -u src/libexec/ld.elf_so/arch/mips/Makefile.inc:1.17 src/libexec/ld.elf_so/arch/mips/Makefile.inc:1.18
--- src/libexec/ld.elf_so/arch/mips/Makefile.inc:1.17 Mon Dec 14 00:41:18 2009
+++ src/libexec/ld.elf_so/arch/mips/Makefile.inc Fri Dec 18 17:10:07 2009
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.inc,v 1.17 2009/12/14 00:41:18 matt Exp $
+# $NetBSD: Makefile.inc,v 1.18 2009/12/18 17:10:07 mrg Exp $
SRCS+= rtld_start.S mips_reloc.c
-# XXX Should not be in CPPFLAGS!
-CPUFLAGS+= -G0
+COPTS+= -G0
-ABI64?= ${CPUFLAGS:M-mabi=64:M-mabi=o64}
-.if !empty(ABI64)
+ABI64?= ${CFLAGS:M-mabi=64}
+ABIO64?= ${CFLAGS:M-mabi=o64}
+.if !empty(ABI64) || !empty(ABIO64)
CPPFLAGS+= -DELFSIZE=64
.else
CPPFLAGS+= -DELFSIZE=32
