Tue Jun 5 11:39:49 2018 UTC ()
use the compiler way of passing arguments to the linker.


(christos)
diff -r1.67 -r1.68 src/sys/arch/mips/conf/Makefile.mips
cvs diff -r1.67 -r1.68 src/sys/arch/mips/conf/Makefile.mips (expand / switch to unified diff)

--- src/sys/arch/mips/conf/Makefile.mips 2017/02/22 13:34:39 1.67
+++ src/sys/arch/mips/conf/Makefile.mips 2018/06/05 11:39:49 1.68
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.mips,v 1.67 2017/02/22 13:34:39 maya Exp $ 1# $NetBSD: Makefile.mips,v 1.68 2018/06/05 11:39:49 christos Exp $
2 2
3# Makefile for NetBSD 3# Makefile for NetBSD
4# 4#
5# This makefile is constructed from a machine description: 5# This makefile is constructed from a machine description:
6# config machineid 6# config machineid
7# Most changes should be made in the machine description 7# Most changes should be made in the machine description
8# /sys/arch/<machine>/conf/``machineid'' 8# /sys/arch/<machine>/conf/``machineid''
9# after which you should do 9# after which you should do
10# config machineid 10# config machineid
11# Machine generic makefile changes should be made in 11# Machine generic makefile changes should be made in
12# /sys/arch/mips/conf/Makefile.mips 12# /sys/arch/mips/conf/Makefile.mips
13# after which config should be rerun for all machines of that type. 13# after which config should be rerun for all machines of that type.
14# 14#
@@ -49,34 +49,34 @@ GP?= ${DEFGP} @@ -49,34 +49,34 @@ GP?= ${DEFGP}
49 49
50.if ${ACTIVE_CC} == "gcc" 50.if ${ACTIVE_CC} == "gcc"
51COPTS.mips_fpu.c+= -mhard-float -Wa,-mhard-float 51COPTS.mips_fpu.c+= -mhard-float -Wa,-mhard-float
52AFLAGS.fp.S+= -Wa,-mhard-float 52AFLAGS.fp.S+= -Wa,-mhard-float
53.endif 53.endif
54 54
55CFLAGS+= ${GP} -mno-abicalls -msoft-float -ffixed-24 55CFLAGS+= ${GP} -mno-abicalls -msoft-float -ffixed-24
56.if defined(LP64) && ${LP64} == "yes" 56.if defined(LP64) && ${LP64} == "yes"
57.if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" 57.if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
58CFLAGS+= -msym32 -mabi=64 58CFLAGS+= -msym32 -mabi=64
59AFLAGS+= -msym32 -mabi=64 59AFLAGS+= -msym32 -mabi=64
60.endif 60.endif
61.if ${MACHINE_ARCH} == "mips64eb" 61.if ${MACHINE_ARCH} == "mips64eb"
62LDFLAGS+= -m elf64btsmip 62LDFLAGS+= -Wl,-m,elf64btsmip
63LINKFORMAT+= -m elf64btsmip 63LINKFORMAT+= -m elf64btsmip
64SYSTEM_LD_TAIL_EXTRA+= \ 64SYSTEM_LD_TAIL_EXTRA+= \
65 ;echo ${OBJCOPY} -O elf32-ntradbigmips $@ $@.elf32; \ 65 ;echo ${OBJCOPY} -O elf32-ntradbigmips $@ $@.elf32; \
66 ${OBJCOPY} -O elf32-ntradbigmips $@ $@.elf32 66 ${OBJCOPY} -O elf32-ntradbigmips $@ $@.elf32
67.endif 67.endif
68.if ${MACHINE_ARCH} == "mips64el" 68.if ${MACHINE_ARCH} == "mips64el"
69LDFLAGS+= -m elf64ltsmip 69LDFLAGS+= -Wl,-m,elf64ltsmip
70LINKFORMAT+= -m elf64ltsmip 70LINKFORMAT+= -m elf64ltsmip
71SYSTEM_LD_TAIL_EXTRA+= \ 71SYSTEM_LD_TAIL_EXTRA+= \
72 ;echo ${OBJCOPY} -O elf32-ntradlittlemips $@ $@.elf32; \ 72 ;echo ${OBJCOPY} -O elf32-ntradlittlemips $@ $@.elf32; \
73 ${OBJCOPY} -O elf32-ntradlittlemips $@ $@.elf32 73 ${OBJCOPY} -O elf32-ntradlittlemips $@ $@.elf32
74.endif 74.endif
75.endif # LP64=yes 75.endif # LP64=yes
76AFLAGS+= -mno-abicalls -x assembler-with-cpp ${AOPTS} 76AFLAGS+= -mno-abicalls -x assembler-with-cpp ${AOPTS}
77 77
78## 78##
79## (3) libkern and compat 79## (3) libkern and compat
80## 80##
81OPT_MODULAR= %MODULAR% 81OPT_MODULAR= %MODULAR%
82.if !empty(OPT_MODULAR) 82.if !empty(OPT_MODULAR)