Print this page
3806 illumos build execs echo unnecessarily
Reviewed by: Garrett D'Amore <garrett.damore@gmail.com>
Reviewed by: Gary Mills <gary_mills@fastmail.fm>
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/uts/i86pc/Makefile.i86pc.shared
+++ new/usr/src/uts/i86pc/Makefile.i86pc.shared
1 1 #
2 2 # CDDL HEADER START
3 3 #
4 4 # The contents of this file are subject to the terms of the
5 5 # Common Development and Distribution License (the "License").
6 6 # You may not use this file except in compliance with the License.
7 7 #
8 8 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9 9 # or http://www.opensolaris.org/os/licensing.
10 10 # See the License for the specific language governing permissions
11 11 # and limitations under the License.
12 12 #
13 13 # When distributing Covered Code, include this CDDL HEADER in each
14 14 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
15 15 # If applicable, add the following below this CDDL HEADER, with the
|
↓ open down ↓ |
15 lines elided |
↑ open up ↑ |
16 16 # fields enclosed by brackets "[]" replaced with your own identifying
17 17 # information: Portions Copyright [yyyy] [name of copyright owner]
18 18 #
19 19 # CDDL HEADER END
20 20 #
21 21
22 22 #
23 23 # uts/i86pc/Makefile.i86pc
24 24 #
25 25 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
26 +# Copyright (c) 2013 Andrew Stormont. All rights reserved.
26 27 #
27 28 #
28 29 # This makefile contains the common definitions for the i86pc unix
29 30 # and all i86pc implementation architecture dependent modules.
30 31 #
31 32
32 33 #
33 34 # Machine type (implementation architecture):
34 35 #
35 36 PLATFORM = i86pc
36 37
37 38 #
38 39 # uname -m value
39 40 #
40 41 UNAME_M = $(PLATFORM)
41 42
42 43 #
43 44 # Definitions for the platform-specific /platform directories.
44 45 #
45 46 # IMPLEMENTATIONS is used to designate i86pc machines which have
46 47 # platform specific modules. All code specific to a given implementation
47 48 # resides in the appropriately named subdirectory. This requires
48 49 # these platforms to have their own Makefiles to define ROOT_PLAT_DIRS,
49 50 # USR_PLAT_DIRS, etc.
50 51 #
51 52 IMPLEMENTATIONS = i86hvm
52 53
53 54 #
54 55 # Everybody needs to know how to build modstubs.o and to locate unix.o
55 56 #
56 57 UNIX_DIR = $(UTSBASE)/$(PLATFORM)/unix
57 58 GENLIB_DIR = $(UTSBASE)/intel/genunix
58 59 MODSTUBS_DIR = $(UNIX_DIR)
59 60 DSF_DIR = $(UTSBASE)/$(PLATFORM)/genassym
60 61 LINTS_DIR = $(OBJS_DIR)
61 62 LINT_LIB_DIR = $(UTSBASE)/$(PLATFORM)/lint-libs/$(OBJS_DIR)
62 63 GEN_LINT_LIB_DIR = $(UTSBASE)/intel/lint-libs/$(OBJS_DIR)
63 64
64 65 LINT32_DIRS = $(LINT32_BUILDS:%=$(UTSBASE)/$(PLATFORM)/lint-libs/%)
65 66 LINT32_FILES = $(LINT32_DIRS:%=%/llib-l$(MODULE).ln)
66 67
67 68 DTRACESTUBS_O = $(OBJS_DIR)/dtracestubs.o
68 69 DTRACESTUBS = $(OBJS_DIR)/libdtracestubs.so
69 70
70 71 SYM_MOD = $(OBJS_DIR)/unix.sym
71 72
72 73 UNIX_O = $(UNIX_DIR)/$(OBJS_DIR)/unix.o
73 74 MODSTUBS_O = $(MODSTUBS_DIR)/$(OBJS_DIR)/modstubs.o
74 75 GENLIB = $(GENLIB_DIR)/$(OBJS_DIR)/libgenunix.so
75 76 LINT_LIB = $(LINT_LIB_DIR)/llib-lunix.ln
76 77 DBOOT_LINT_LIB = $(LINT_LIB_DIR)/llib-ldboot.ln
77 78 GEN_LINT_LIB = $(GEN_LINT_LIB_DIR)/llib-lgenunix.ln
78 79
79 80 #
80 81 # Include the makefiles which define build rule templates, the
81 82 # collection of files per module, and a few specific flags. Note
82 83 # that order is significant, just as with an include path. The
83 84 # first build rule template which matches the files name will be
84 85 # used. By including these in order from most machine dependent
85 86 # to most machine independent, we allow a machine dependent file
86 87 # to be used in preference over a machine independent version
87 88 # (Such as a machine specific optimization, which preserves the
88 89 # interfaces.)
89 90 #
90 91 include $(UTSTREE)/$(PLATFORM)/Makefile.files
91 92 include $(UTSTREE)/intel/Makefile.files
92 93 include $(UTSTREE)/common/Makefile.files
93 94
94 95 #
95 96 # Include machine independent rules. Note that this does not imply
96 97 # that the resulting module from rules in Makefile.uts is machine
97 98 # independent. Only that the build rules are machine independent.
98 99 #
99 100 include $(UTSBASE)/Makefile.uts
100 101
101 102 #
102 103 # Define supported builds
103 104 #
104 105 DEF_BUILDS = $(DEF_BUILDS64) $(DEF_BUILDS32)
105 106 ALL_BUILDS = $(ALL_BUILDS64) $(ALL_BUILDS32)
106 107
107 108 #
108 109 # x86 or amd64 inline templates
109 110 #
110 111 INLINES_32 = $(UTSBASE)/intel/ia32/ml/ia32.il \
111 112 $(UTSBASE)/$(PLATFORM)/ml/ia32.il
112 113 INLINES_64 = $(UTSBASE)/intel/amd64/ml/amd64.il \
113 114 $(UTSBASE)/$(PLATFORM)/ml/amd64.il
114 115 INLINES += $(INLINES_$(CLASS))
115 116
116 117 #
117 118 # kernel-specific optimizations; override default in Makefile.master
118 119 #
119 120
120 121 CFLAGS_XARCH_32 = $(i386_CFLAGS)
121 122 CFLAGS_XARCH_64 = $(amd64_CFLAGS)
122 123 CFLAGS_XARCH = $(CFLAGS_XARCH_$(CLASS))
123 124
124 125 COPTFLAG_32 = $(COPTFLAG)
125 126 COPTFLAG_64 = $(COPTFLAG64)
126 127 COPTIMIZE = $(COPTFLAG_$(CLASS))
127 128
128 129 CFLAGS = $(CFLAGS_XARCH)
129 130 CFLAGS += $(COPTIMIZE)
130 131 CFLAGS += $(INLINES) -D_ASM_INLINES
131 132 CFLAGS += $(CCMODE)
132 133 CFLAGS += $(SPACEFLAG)
133 134 CFLAGS += $(CCUNBOUND)
134 135 CFLAGS += $(CFLAGS_uts)
135 136 CFLAGS += -xstrconst
136 137
137 138 ASFLAGS_XARCH_32 = $(i386_ASFLAGS)
138 139 ASFLAGS_XARCH_64 = $(amd64_ASFLAGS)
139 140 ASFLAGS_XARCH = $(ASFLAGS_XARCH_$(CLASS))
140 141
141 142 ASFLAGS += $(ASFLAGS_XARCH)
142 143
143 144 AS_INC_PATH += -I$(DSF_DIR)/$(OBJS_DIR)
144 145
145 146 #
146 147 # The following must be defined for all implementations:
147 148 #
148 149 # MAPFILE: ld mapfile for the build of kernel/unix.
149 150 # MODSTUBS: Module stubs source file.
150 151 # GENASSYM_SRC: genassym.c
151 152 #
152 153 MAPFILE = $(UTSBASE)/$(PLATFORM)/conf/Mapfile
153 154 MODSTUBS = $(UTSBASE)/intel/ia32/ml/modstubs.s
154 155 GENASSYM_SRC = $(UTSBASE)/$(PLATFORM)/ml/genassym.c
155 156 OFFSETS_SRC = $(UTSBASE)/$(PLATFORM)/ml/offsets.in
156 157 PLATFORM_OFFSETS_32 = $(UTSBASE)/$(PLATFORM)/ml/mach_offsets.in
157 158 PLATFORM_OFFSETS_64 = $(UTSBASE)/intel/amd64/ml/mach_offsets.in
158 159 PLATFORM_OFFSETS_SRC = $(PLATFORM_OFFSETS_$(CLASS))
159 160 KDI_OFFSETS_SRC = $(UTSBASE)/intel/kdi/kdi_offsets.in
160 161
161 162 #
162 163 # Define the actual specific platforms
163 164 #
164 165 MACHINE_DEFS = -D$(PLATFORM) -D_MACHDEP
165 166
166 167 #
167 168 # Software workarounds for hardware "features"
168 169 #
169 170
170 171 include $(UTSBASE)/$(PLATFORM)/Makefile.workarounds
171 172
172 173 #
173 174 # Debugging level
174 175 #
175 176 # Special knowledge of which special debugging options effect which
176 177 # file is used to optimize the build if these flags are changed.
177 178 #
|
↓ open down ↓ |
142 lines elided |
↑ open up ↑ |
178 179 # XXX: The above could possibly be done for more flags and files, but
179 180 # is left as an experiment to the interested reader. Be forewarned,
180 181 # that excessive use could lead to maintenance difficulties.
181 182 #
182 183 DEBUG_DEFS_OBJ32 =
183 184 DEBUG_DEFS_DBG32 = -DDEBUG
184 185 DEBUG_DEFS_OBJ64 =
185 186 DEBUG_DEFS_DBG64 = -DDEBUG
186 187 DEBUG_DEFS = $(DEBUG_DEFS_$(BUILD_TYPE))
187 188
188 -DEBUG_COND_OBJ32 :sh = echo \\043
189 +DEBUG_COND_OBJ32 = $(POUND_SIGN)
189 190 DEBUG_COND_DBG32 =
190 -DEBUG_COND_OBJ64 :sh = echo \\043
191 +DEBUG_COND_OBJ64 = $(POUND_SIGN)
191 192 DEBUG_COND_DBG64 =
192 193 IF_DEBUG_OBJ = $(DEBUG_COND_$(BUILD_TYPE))$(OBJS_DIR)/
193 194
194 195 $(IF_DEBUG_OBJ)trap.o := DEBUG_DEFS += -DTRAPDEBUG -DTRAPTRACE
195 196 $(IF_DEBUG_OBJ)syscall_asm.o := DEBUG_DEFS += -DSYSCALLTRACE -DTRAPTRACE
196 197 $(IF_DEBUG_OBJ)syscall_asm_amd64.o := DEBUG_DEFS += -DSYSCALLTRACE -DTRAPTRACE
197 198 $(IF_DEBUG_OBJ)fast_trap_asm.o := DEBUG_DEFS += -DTRAPTRACE
198 199 $(IF_DEBUG_OBJ)interrupt.o := DEBUG_DEFS += -DTRAPTRACE
199 200 $(IF_DEBUG_OBJ)intr.o := DEBUG_DEFS += -DTRAPTRACE
200 201 $(IF_DEBUG_OBJ)locore.o := DEBUG_DEFS += -DTRAPTRACE
201 202 $(IF_DEBUG_OBJ)mp_startup.o := DEBUG_DEFS += -DTRAPTRACE
202 203 $(IF_DEBUG_OBJ)machdep.o := DEBUG_DEFS += -DTRAPTRACE
203 204 $(IF_DEBUG_OBJ)exception.o := DEBUG_DEFS += -DTRAPTRACE
204 205 $(IF_DEBUG_OBJ)x_call.o := DEBUG_DEFS += -DTRAPTRACE
205 206 $(IF_DEBUG_OBJ)mp_call.o := DEBUG_DEFS += -DTRAPTRACE
206 207 $(IF_DEBUG_OBJ)cbe.o := DEBUG_DEFS += -DTRAPTRACE
207 208
208 209 #
209 210 # Collect the preprocessor definitions to be associated with *all*
210 211 # files.
211 212 #
212 213 ALL_DEFS = $(MACHINE_DEFS) $(WORKAROUND_DEFS) $(DEBUG_DEFS) \
213 214 $(OPTION_DEFS)
214 215 GENASSYM_DEFS = $(MACHINE_DEFS) $(OPTION_DEFS) \
215 216 -_gcc=-fno-eliminate-unused-debug-symbols \
216 217 -_gcc=-fno-eliminate-unused-debug-types
217 218
218 219 #
219 220 # ----- TRANSITIONAL SECTION --------------------------------------------------
220 221 #
221 222
222 223 #
223 224 # Not everything which *should* be a module is a module yet. The
224 225 # following is a list of such objects which are currently part of
225 226 # the base kernel but should soon become kmods.
226 227 #
227 228 # XXX: $(KMACCT_OBJS) is neither in the MT kernel nor was it ever
228 229 # made into a module. If it is made MT safe before being made
229 230 # into a module, it should be added to this list. It was in
230 231 # this list pre ON-4.0.
231 232 #
232 233 #
233 234 MACH_NOT_YET_KMODS = $(AUTOCONF_OBJS)
234 235
235 236 #
236 237 # ----- END OF TRANSITIONAL SECTION -------------------------------------------
237 238 #
238 239
239 240 #
240 241 # The kernels modules which are "implementation architecture"
241 242 # specific for this machine are enumerated below. Note that most
242 243 # of these modules must exist (in one form or another) for each
243 244 # architecture.
244 245 #
245 246 # Machine Specific Driver Modules (/kernel/drv)
246 247 # DRV_KMODS are built both 32-bit and 64-bit
247 248 # DRV_KMODS_32 are built only 32-bit
248 249 # DRV_KMODS_64 are built only 64-bit
249 250 #
250 251 DRV_KMODS += rootnex
251 252 DRV_KMODS += isa
252 253 DRV_KMODS += pcplusmp
253 254 DRV_KMODS += apix
254 255 DRV_KMODS += cpc
255 256 DRV_KMODS += pci
256 257 DRV_KMODS += npe
257 258 DRV_KMODS += pci-ide
258 259 DRV_KMODS += xsvc
259 260 DRV_KMODS += tzmon
260 261 DRV_KMODS += acpi_drv
261 262 DRV_KMODS += acpinex
262 263 DRV_KMODS += amd_iommu
263 264 DRV_KMODS += dr
264 265 DRV_KMODS += ioat
265 266 DRV_KMODS += fipe
266 267
267 268 DRV_KMODS += cpudrv
268 269
269 270
270 271 #
271 272 # Platform Power Modules
272 273 #
273 274 DRV_KMODS += ppm acpippm
274 275
275 276 #
276 277 # CPU Modules
277 278 #
278 279 CPU_KMODS += amd_opteron
279 280 CPU_KMODS += generic_cpu
280 281 CPU_KMODS += authenticamd
281 282 CPU_KMODS += genuineintel
282 283
283 284 #
284 285 # Don't build some of these for OpenSolaris, since they will be
285 286 # replaced by binaries that are signed by Sun Release Engineering.
286 287 #
287 288 $(CLOSED_BUILD)CLOSED_CPU_KMODS += intel_nhmex
288 289
289 290 #
290 291 # Exec Class Modules (/kernel/exec):
291 292 #
292 293 EXEC_KMODS +=
293 294
294 295 #
295 296 # Scheduling Class Modules (/kernel/sched):
296 297 #
297 298 SCHED_KMODS +=
298 299
299 300 #
300 301 # File System Modules (/kernel/fs):
301 302 #
302 303 FS_KMODS +=
303 304
304 305 #
305 306 # Streams Modules (/kernel/strmod):
306 307 #
307 308 STRMOD_KMODS +=
308 309
309 310 #
310 311 # 'System' Modules (/kernel/sys):
311 312 #
312 313 SYS_KMODS +=
313 314
314 315 #
315 316 # 'Misc' Modules (/kernel/misc):
316 317 #
317 318 MISC_KMODS += gfx_private pcie
318 319 MISC_KMODS += acpidev
319 320 MISC_KMODS += drmach_acpi
320 321
321 322 #
322 323 # 'Dacf' modules (/kernel/dacf)
323 324 #
324 325 DACF_KMODS += consconfig_dacf
325 326
326 327 #
327 328 # 'Mach' Modules (/kernel/mach):
328 329 #
329 330 MACH_KMODS += uppc
330 331
331 332 #
332 333 # CPR Misc Module.
333 334 #
334 335 MISC_KMODS += cpr
|
↓ open down ↓ |
134 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX