Module Name: src
Committed By: christos
Date: Sun Apr 25 23:24:00 UTC 2021
Modified Files:
src/sys/arch/mips/conf: Makefile.mips
Log Message:
use ${MACHINE_MIPS64}
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/mips/conf/Makefile.mips
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/conf/Makefile.mips
diff -u src/sys/arch/mips/conf/Makefile.mips:1.70 src/sys/arch/mips/conf/Makefile.mips:1.71
--- src/sys/arch/mips/conf/Makefile.mips:1.70 Tue Jan 1 14:41:04 2019
+++ src/sys/arch/mips/conf/Makefile.mips Sun Apr 25 19:24:00 2021
@@ -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}
