Wed Mar 30 17:35:43 2016 UTC ()
Remove hacks for ancient vax gcc


(martin)
diff -r1.128 -r1.129 src/share/mk/sys.mk
cvs diff -r1.128 -r1.129 src/share/mk/sys.mk (switch to unified diff)

--- src/share/mk/sys.mk 2015/07/06 00:21:51 1.128
+++ src/share/mk/sys.mk 2016/03/30 17:35:43 1.129
@@ -1,238 +1,236 @@ @@ -1,238 +1,236 @@
1# $NetBSD: sys.mk,v 1.128 2015/07/06 00:21:51 chs Exp $ 1# $NetBSD: sys.mk,v 1.129 2016/03/30 17:35:43 martin Exp $
2# @(#)sys.mk 8.2 (Berkeley) 3/21/94 2# @(#)sys.mk 8.2 (Berkeley) 3/21/94
3# 3#
4# This file contains the basic rules for make(1) and is read first 4# This file contains the basic rules for make(1) and is read first
5# Do not put conditionals that are set on different files here and 5# Do not put conditionals that are set on different files here and
6# expect them to work. 6# expect them to work.
7 7
8unix?= We run NetBSD. 8unix?= We run NetBSD.
9 9
10.SUFFIXES: .a .o .ln .s .S .c .cc .cpp .cxx .C .f .F .r .p .l .y .sh 10.SUFFIXES: .a .o .ln .s .S .c .cc .cpp .cxx .C .f .F .r .p .l .y .sh
11 11
12.LIBS: .a 12.LIBS: .a
13 13
14AR?= ar 14AR?= ar
15ARFLAGS?= rl 15ARFLAGS?= rl
16RANLIB?= ranlib 16RANLIB?= ranlib
17 17
18AS?= as 18AS?= as
19AFLAGS?= 19AFLAGS?=
20COMPILE.s?= ${CC} ${AFLAGS} ${AFLAGS.${<:T}} -c 20COMPILE.s?= ${CC} ${AFLAGS} ${AFLAGS.${<:T}} -c
21LINK.s?= ${CC} ${AFLAGS} ${AFLAGS.${<:T}} ${LDFLAGS} 21LINK.s?= ${CC} ${AFLAGS} ${AFLAGS.${<:T}} ${LDFLAGS}
22_ASM_TRADITIONAL_CPP= -x assembler-with-cpp 22_ASM_TRADITIONAL_CPP= -x assembler-with-cpp
23COMPILE.S?= ${CC} ${AFLAGS} ${AFLAGS.${<:T}} ${CPPFLAGS} ${_ASM_TRADITIONAL_CPP} -c 23COMPILE.S?= ${CC} ${AFLAGS} ${AFLAGS.${<:T}} ${CPPFLAGS} ${_ASM_TRADITIONAL_CPP} -c
24LINK.S?= ${CC} ${AFLAGS} ${AFLAGS.${<:T}} ${CPPFLAGS} ${LDFLAGS} 24LINK.S?= ${CC} ${AFLAGS} ${AFLAGS.${<:T}} ${CPPFLAGS} ${LDFLAGS}
25 25
26CC?= cc 26CC?= cc
27.if ${MACHINE_ARCH} == "sh3el" || ${MACHINE_ARCH} == "sh3eb" 27.if ${MACHINE_ARCH} == "sh3el" || ${MACHINE_ARCH} == "sh3eb"
28# -O2 is too -falign-* zealous for low-memory sh3 machines 28# -O2 is too -falign-* zealous for low-memory sh3 machines
29DBG?= -Os -freorder-blocks 29DBG?= -Os -freorder-blocks
30.elif ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "m68000" 30.elif ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "m68000"
31# -freorder-blocks (enabled by -O2) produces much bigger code 31# -freorder-blocks (enabled by -O2) produces much bigger code
32DBG?= -O2 -fno-reorder-blocks 32DBG?= -O2 -fno-reorder-blocks
33.elif ${MACHINE_ARCH} == "coldfire" 33.elif ${MACHINE_ARCH} == "coldfire"
34DBG?= -O1 34DBG?= -O1
35.elif !empty(MACHINE_ARCH:Maarch64*) 35.elif !empty(MACHINE_ARCH:Maarch64*)
36DBG?= -O2 ${"${.TARGET:M*.po}" == "":? -fomit-frame-pointer:} 36DBG?= -O2 ${"${.TARGET:M*.po}" == "":? -fomit-frame-pointer:}
37.elif ${MACHINE_ARCH} == "vax" 
38DBG?= -O1 -fgcse -fstrength-reduce -fgcse-after-reload 
39.else 37.else
40DBG?= -O2 38DBG?= -O2
41.endif 39.endif
42CFLAGS?= ${DBG} 40CFLAGS?= ${DBG}
43LDFLAGS?= 41LDFLAGS?=
44COMPILE.c?= ${CC} ${CFLAGS} ${CPPFLAGS} -c 42COMPILE.c?= ${CC} ${CFLAGS} ${CPPFLAGS} -c
45LINK.c?= ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} 43LINK.c?= ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
46 44
47# C Type Format data is required for DTrace 45# C Type Format data is required for DTrace
48CTFFLAGS ?= -g -L VERSION 46CTFFLAGS ?= -g -L VERSION
49CTFMFLAGS ?= -t -g -L VERSION 47CTFMFLAGS ?= -t -g -L VERSION
50 48
51CXX?= c++ 49CXX?= c++
52CXXFLAGS?= ${CFLAGS:N-Wno-traditional:N-Wstrict-prototypes:N-Wmissing-prototypes:N-Wno-pointer-sign:N-ffreestanding:N-std=gnu[0-9][0-9]:N-Wold-style-definition:N-Wno-format-zero-length} 50CXXFLAGS?= ${CFLAGS:N-Wno-traditional:N-Wstrict-prototypes:N-Wmissing-prototypes:N-Wno-pointer-sign:N-ffreestanding:N-std=gnu[0-9][0-9]:N-Wold-style-definition:N-Wno-format-zero-length}
53 51
54__ALLSRC1= ${empty(DESTDIR):?${.ALLSRC}:${.ALLSRC:S|^${DESTDIR}|^destdir|}} 52__ALLSRC1= ${empty(DESTDIR):?${.ALLSRC}:${.ALLSRC:S|^${DESTDIR}|^destdir|}}
55__ALLSRC2= ${empty(MAKEOBJDIR):?${__ALLSRC1}:${__ALLSRC1:S|^${MAKEOBJDIR}|^obj|}} 53__ALLSRC2= ${empty(MAKEOBJDIR):?${__ALLSRC1}:${__ALLSRC1:S|^${MAKEOBJDIR}|^obj|}}
56__ALLSRC3= ${empty(NETBSDSRCDIR):?${__ALLSRC2}:${__ALLSRC2:S|^${NETBSDSRCDIR}|^src|}} 54__ALLSRC3= ${empty(NETBSDSRCDIR):?${__ALLSRC2}:${__ALLSRC2:S|^${NETBSDSRCDIR}|^src|}}
57__BUILDSEED= ${BUILDSEED}/${__ALLSRC3:O}/${.TARGET} 55__BUILDSEED= ${BUILDSEED}/${__ALLSRC3:O}/${.TARGET}
58_CXXSEED?= ${BUILDSEED:D-frandom-seed=${__BUILDSEED:hash}} 56_CXXSEED?= ${BUILDSEED:D-frandom-seed=${__BUILDSEED:hash}}
59 57
60COMPILE.cc?= ${CXX} ${_CXXSEED} ${CXXFLAGS} ${CPPFLAGS} -c 58COMPILE.cc?= ${CXX} ${_CXXSEED} ${CXXFLAGS} ${CPPFLAGS} -c
61LINK.cc?= ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS} 59LINK.cc?= ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS}
62 60
63OBJC?= ${CC} 61OBJC?= ${CC}
64OBJCFLAGS?= ${CFLAGS} 62OBJCFLAGS?= ${CFLAGS}
65COMPILE.m?= ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c 63COMPILE.m?= ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c
66LINK.m?= ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} ${LDFLAGS} 64LINK.m?= ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} ${LDFLAGS}
67 65
68CPP?= cpp 66CPP?= cpp
69CPPFLAGS?= 67CPPFLAGS?=
70 68
71FC?= f77 69FC?= f77
72FFLAGS?= -O 70FFLAGS?= -O
73RFLAGS?= 71RFLAGS?=
74COMPILE.f?= ${FC} ${FFLAGS} -c 72COMPILE.f?= ${FC} ${FFLAGS} -c
75LINK.f?= ${FC} ${FFLAGS} ${LDFLAGS} 73LINK.f?= ${FC} ${FFLAGS} ${LDFLAGS}
76COMPILE.F?= ${FC} ${FFLAGS} ${CPPFLAGS} -c 74COMPILE.F?= ${FC} ${FFLAGS} ${CPPFLAGS} -c
77LINK.F?= ${FC} ${FFLAGS} ${CPPFLAGS} ${LDFLAGS} 75LINK.F?= ${FC} ${FFLAGS} ${CPPFLAGS} ${LDFLAGS}
78COMPILE.r?= ${FC} ${FFLAGS} ${RFLAGS} -c 76COMPILE.r?= ${FC} ${FFLAGS} ${RFLAGS} -c
79LINK.r?= ${FC} ${FFLAGS} ${RFLAGS} ${LDFLAGS} 77LINK.r?= ${FC} ${FFLAGS} ${RFLAGS} ${LDFLAGS}
80 78
81INSTALL?= install 79INSTALL?= install
82 80
83LD?= ld 81LD?= ld
84 82
85LEX?= lex 83LEX?= lex
86LFLAGS?= 84LFLAGS?=
87LEX.l?= ${LEX} ${LFLAGS} 85LEX.l?= ${LEX} ${LFLAGS}
88 86
89LINT?= lint 87LINT?= lint
90LINTFLAGS?= -chapbxzgFS 88LINTFLAGS?= -chapbxzgFS
91 89
92LORDER?= lorder 90LORDER?= lorder
93 91
94MAKE?= make 92MAKE?= make
95 93
96NM?= nm 94NM?= nm
97 95
98PC?= pc 96PC?= pc
99PFLAGS?= 97PFLAGS?=
100COMPILE.p?= ${PC} ${PFLAGS} ${CPPFLAGS} -c 98COMPILE.p?= ${PC} ${PFLAGS} ${CPPFLAGS} -c
101LINK.p?= ${PC} ${PFLAGS} ${CPPFLAGS} ${LDFLAGS} 99LINK.p?= ${PC} ${PFLAGS} ${CPPFLAGS} ${LDFLAGS}
102 100
103SHELL?= sh 101SHELL?= sh
104 102
105SIZE?= size 103SIZE?= size
106 104
107TSORT?= tsort -q 105TSORT?= tsort -q
108 106
109YACC?= yacc 107YACC?= yacc
110YFLAGS?= 108YFLAGS?=
111YACC.y?= ${YACC} ${YFLAGS} 109YACC.y?= ${YACC} ${YFLAGS}
112 110
113# C 111# C
114.c: 112.c:
115 ${LINK.c} -o ${.TARGET} ${.IMPSRC} ${LDLIBS} 113 ${LINK.c} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
116# XXX: disable for now 114# XXX: disable for now
117# ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:} 115# ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:}
118.c.o: 116.c.o:
119 ${COMPILE.c} ${.IMPSRC} 117 ${COMPILE.c} ${.IMPSRC}
120 ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:} 118 ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:}
121.c.a: 119.c.a:
122 ${COMPILE.c} ${.IMPSRC} 120 ${COMPILE.c} ${.IMPSRC}
123 ${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o 121 ${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
124 rm -f ${.PREFIX}.o 122 rm -f ${.PREFIX}.o
125.c.ln: 123.c.ln:
126 ${LINT} ${LINTFLAGS} \ 124 ${LINT} ${LINTFLAGS} \
127 ${CPPFLAGS:C/-([IDU])[ ]*/-\1/Wg:M-[IDU]*} \ 125 ${CPPFLAGS:C/-([IDU])[ ]*/-\1/Wg:M-[IDU]*} \
128 -i ${.IMPSRC} 126 -i ${.IMPSRC}
129 127
130# C++ 128# C++
131.cc .cpp .cxx .C: 129.cc .cpp .cxx .C:
132 ${LINK.cc} -o ${.TARGET} ${.IMPSRC} ${LDLIBS} 130 ${LINK.cc} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
133.cc.o .cpp.o .cxx.o .C.o: 131.cc.o .cpp.o .cxx.o .C.o:
134 ${COMPILE.cc} ${.IMPSRC} 132 ${COMPILE.cc} ${.IMPSRC}
135.cc.a .cpp.a .cxx.a .C.a: 133.cc.a .cpp.a .cxx.a .C.a:
136 ${COMPILE.cc} ${.IMPSRC} 134 ${COMPILE.cc} ${.IMPSRC}
137 ${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o 135 ${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
138 rm -f ${.PREFIX}.o 136 rm -f ${.PREFIX}.o
139 137
140# Fortran/Ratfor 138# Fortran/Ratfor
141.f: 139.f:
142 ${LINK.f} -o ${.TARGET} ${.IMPSRC} ${LDLIBS} 140 ${LINK.f} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
143.f.o: 141.f.o:
144 ${COMPILE.f} ${.IMPSRC} 142 ${COMPILE.f} ${.IMPSRC}
145 ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:} 143 ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:}
146.f.a: 144.f.a:
147 ${COMPILE.f} ${.IMPSRC} 145 ${COMPILE.f} ${.IMPSRC}
148 ${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o 146 ${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
149 rm -f ${.PREFIX}.o 147 rm -f ${.PREFIX}.o
150 148
151.F: 149.F:
152 ${LINK.F} -o ${.TARGET} ${.IMPSRC} ${LDLIBS} 150 ${LINK.F} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
153 ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:} 151 ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:}
154.F.o: 152.F.o:
155 ${COMPILE.F} ${.IMPSRC} 153 ${COMPILE.F} ${.IMPSRC}
156 ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:} 154 ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:}
157.F.a: 155.F.a:
158 ${COMPILE.F} ${.IMPSRC} 156 ${COMPILE.F} ${.IMPSRC}
159 ${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o 157 ${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
160 rm -f ${.PREFIX}.o 158 rm -f ${.PREFIX}.o
161 159
162.r: 160.r:
163 ${LINK.r} -o ${.TARGET} ${.IMPSRC} ${LDLIBS} 161 ${LINK.r} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
164.r.o: 162.r.o:
165 ${COMPILE.r} ${.IMPSRC} 163 ${COMPILE.r} ${.IMPSRC}
166 ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:} 164 ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:}
167.r.a: 165.r.a:
168 ${COMPILE.r} ${.IMPSRC} 166 ${COMPILE.r} ${.IMPSRC}
169 ${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o 167 ${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
170 rm -f ${.PREFIX}.o 168 rm -f ${.PREFIX}.o
171 169
172# Pascal 170# Pascal
173.p: 171.p:
174 ${LINK.p} -o ${.TARGET} ${.IMPSRC} ${LDLIBS} 172 ${LINK.p} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
175 ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:} 173 ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:}
176.p.o: 174.p.o:
177 ${COMPILE.p} ${.IMPSRC} 175 ${COMPILE.p} ${.IMPSRC}
178 ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:} 176 ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:}
179.p.a: 177.p.a:
180 ${COMPILE.p} ${.IMPSRC} 178 ${COMPILE.p} ${.IMPSRC}
181 ${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o 179 ${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
182 rm -f ${.PREFIX}.o 180 rm -f ${.PREFIX}.o
183 181
184# Assembly 182# Assembly
185.s: 183.s:
186 ${LINK.s} -o ${.TARGET} ${.IMPSRC} ${LDLIBS} 184 ${LINK.s} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
187 ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:} 185 ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:}
188.s.o: 186.s.o:
189 ${COMPILE.s} ${.IMPSRC} 187 ${COMPILE.s} ${.IMPSRC}
190 ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:} 188 ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:}
191.s.a: 189.s.a:
192 ${COMPILE.s} ${.IMPSRC} 190 ${COMPILE.s} ${.IMPSRC}
193 ${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o 191 ${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
194 rm -f ${.PREFIX}.o 192 rm -f ${.PREFIX}.o
195.S: 193.S:
196 ${LINK.S} -o ${.TARGET} ${.IMPSRC} ${LDLIBS} 194 ${LINK.S} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
197 ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:} 195 ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:}
198.S.o: 196.S.o:
199 ${COMPILE.S} ${.IMPSRC} 197 ${COMPILE.S} ${.IMPSRC}
200 ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:} 198 ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:}
201.S.a: 199.S.a:
202 ${COMPILE.S} ${.IMPSRC} 200 ${COMPILE.S} ${.IMPSRC}
203 ${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o 201 ${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
204 rm -f ${.PREFIX}.o 202 rm -f ${.PREFIX}.o
205 203
206# Lex 204# Lex
207.l: 205.l:
208 ${LEX.l} ${.IMPSRC} 206 ${LEX.l} ${.IMPSRC}
209 ${LINK.c} -o ${.TARGET} lex.yy.c ${LDLIBS} -ll 207 ${LINK.c} -o ${.TARGET} lex.yy.c ${LDLIBS} -ll
210 rm -f lex.yy.c 208 rm -f lex.yy.c
211.l.c: 209.l.c:
212 ${LEX.l} ${.IMPSRC} 210 ${LEX.l} ${.IMPSRC}
213 mv lex.yy.c ${.TARGET} 211 mv lex.yy.c ${.TARGET}
214.l.o: 212.l.o:
215 ${LEX.l} ${.IMPSRC} 213 ${LEX.l} ${.IMPSRC}
216 ${COMPILE.c} -o ${.TARGET} lex.yy.c 214 ${COMPILE.c} -o ${.TARGET} lex.yy.c
217 ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:} 215 ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:}
218 rm -f lex.yy.c 216 rm -f lex.yy.c
219 217
220# Yacc 218# Yacc
221.y: 219.y:
222 ${YACC.y} ${.IMPSRC} 220 ${YACC.y} ${.IMPSRC}
223 ${LINK.c} -o ${.TARGET} y.tab.c ${LDLIBS} 221 ${LINK.c} -o ${.TARGET} y.tab.c ${LDLIBS}
224 rm -f y.tab.c 222 rm -f y.tab.c
225.y.c: 223.y.c:
226 ${YACC.y} ${.IMPSRC} 224 ${YACC.y} ${.IMPSRC}
227 mv y.tab.c ${.TARGET} 225 mv y.tab.c ${.TARGET}
228.y.o: 226.y.o:
229 ${YACC.y} ${.IMPSRC} 227 ${YACC.y} ${.IMPSRC}
230 ${COMPILE.c} -o ${.TARGET} y.tab.c 228 ${COMPILE.c} -o ${.TARGET} y.tab.c
231 ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:} 229 ${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:}
232 rm -f y.tab.c 230 rm -f y.tab.c
233 231
234# Shell 232# Shell
235.sh: 233.sh:
236 rm -f ${.TARGET} 234 rm -f ${.TARGET}
237 cp ${.IMPSRC} ${.TARGET} 235 cp ${.IMPSRC} ${.TARGET}
238 chmod a+x ${.TARGET} 236 chmod a+x ${.TARGET}