Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/libexec/ld.elf_so/arch/mips use COPTS for -G0.



details:   https://anonhg.NetBSD.org/src/rev/eb6db2c1d77e
branches:  trunk
changeset: 750134:eb6db2c1d77e
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Dec 18 17:10:07 2009 +0000

description:
use COPTS for -G0.
replace ${CPUFLAGS:M-mabi=64:M-mabi=o64} with two constructs.
the former doesn't seem to work anymore.

diffstat:

 libexec/ld.elf_so/arch/mips/Makefile.inc |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (21 lines):

diff -r 8f0962934956 -r eb6db2c1d77e libexec/ld.elf_so/arch/mips/Makefile.inc
--- a/libexec/ld.elf_so/arch/mips/Makefile.inc  Fri Dec 18 15:49:48 2009 +0000
+++ b/libexec/ld.elf_so/arch/mips/Makefile.inc  Fri Dec 18 17:10:07 2009 +0000
@@ -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



Home | Main Index | Thread Index | Old Index