Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/mips/conf use ${MACHINE_MIPS64}



details:   https://anonhg.NetBSD.org/src/rev/bd484f2815ca
branches:  trunk
changeset: 378833:bd484f2815ca
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Apr 25 23:24:00 2021 +0000

description:
use ${MACHINE_MIPS64}

diffstat:

 sys/arch/mips/conf/Makefile.mips |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 3cfaaadba0b4 -r bd484f2815ca sys/arch/mips/conf/Makefile.mips
--- a/sys/arch/mips/conf/Makefile.mips  Sun Apr 25 23:23:19 2021 +0000
+++ b/sys/arch/mips/conf/Makefile.mips  Sun Apr 25 23:24:00 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.mips,v 1.70 2019/01/01 19:41:04 christos Exp $
+#      $NetBSD: Makefile.mips,v 1.71 2021/04/25 23:24:00 christos Exp $
 
 # Makefile for NetBSD
 #
@@ -54,7 +54,7 @@ AFLAGS.fp.S+=         -Wa,-mhard-float
 
 CFLAGS+=       ${GP} -mno-abicalls -msoft-float -ffixed-24
 .if defined(LP64) && ${LP64} == "yes"
-.if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
+.if ${MACHINE_MIPS64}
 CFLAGS+=       -msym32 -mabi=64
 AFLAGS+=       -msym32 -mabi=64
 .endif
@@ -65,7 +65,7 @@ SYSTEM_LD_TAIL_EXTRA+= \
                ;echo ${OBJCOPY} -O elf32-ntradbigmips $@ $@.elf32; \
                ${OBJCOPY} -O elf32-ntradbigmips $@ $@.elf32
 .endif
-.if ${MACHINE_ARCH} == "mips64el"
+.if !empty(MACHINE_ARCH:Mmips*64el)
 LDFLAGS+=      -Wl,-m,elf64ltsmip
 LINKFORMAT+=   -m elf64ltsmip
 SYSTEM_LD_TAIL_EXTRA+= \
@@ -96,7 +96,7 @@ locore_machdep.o: ${THISMIPS}/${MACHINE}
 ##
 ## (5) link settings
 ##
-.if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
+.if ${MACHINE_MIPS64}
 TEXTADDR?=              ${DEFTEXTADDR:C/0x8/0xFFFFFFFF8/}
 .else   
 TEXTADDR?=             ${DEFTEXTADDR}



Home | Main Index | Thread Index | Old Index