diff options
| author | Patrick Mooney <pmooney@pfmooney.com> | 2019-06-13 16:03:23 +0000 |
|---|---|---|
| committer | Jason King <jason.king@joyent.com> | 2020-10-16 15:17:17 -0500 |
| commit | 91ab9467e54c18d8133142e5704929a65e13a449 (patch) | |
| tree | 8ffeb0fa940db40f4edc57059c3f6f55cc868ecb /usr/src/uts/sun4v | |
| parent | f0a052391861a2b96cf28973c3b7f2854591aa79 (diff) | |
| download | illumos-joyent-91ab9467e54c18d8133142e5704929a65e13a449.tar.gz | |
13221 mapfile name for unix should be less generic
Reviewed by: Robert Mustacchi <robert.mustacchi@joyent.com>
Reviewed by: John Levon <john.levon@joyent.com>
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/uts/sun4v')
| -rw-r--r-- | usr/src/uts/sun4v/Makefile.sun4v | 11 | ||||
| -rw-r--r-- | usr/src/uts/sun4v/unix/Makefile | 15 |
2 files changed, 14 insertions, 12 deletions
diff --git a/usr/src/uts/sun4v/Makefile.sun4v b/usr/src/uts/sun4v/Makefile.sun4v index 3a1b469d21..f1d8cc13d2 100644 --- a/usr/src/uts/sun4v/Makefile.sun4v +++ b/usr/src/uts/sun4v/Makefile.sun4v @@ -23,6 +23,7 @@ # Copyright 2010 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # Copyright (c) 2013 Andrew Stormont. All rights reserved. +# Copyright 2019 Joyent, Inc. # # This makefile contains the common definitions for the sun4v unix # and all sun4v implementation architecture dependent modules. @@ -114,7 +115,7 @@ DTRACESTUBS = $(OBJS_DIR)/libdtracestubs.so UNIX_O = $(UNIX_DIR)/$(OBJS_DIR)/unix.o MODSTUBS_O = $(MODSTUBS_DIR)/$(OBJS_DIR)/modstubs.o -GENLIB = $(GENLIB_DIR)/$(OBJS_DIR)/libgenunix.so +GENLIB = $(GENLIB_DIR)/$(OBJS_DIR)/libgenunix.so LINT_LIB = $(LINT_LIB_DIR)/llib-lunix.ln GEN_LINT_LIB = $(LINT_LIB_DIR)/llib-lgenunix.ln @@ -206,19 +207,19 @@ LINT_DEFS = -m64 # # The following must be defined for all implementations: # -# MAPFILE: ld mapfile for the build of kernel/unix. +# UNIX_MAPFILE: ld mapfile for the build of kernel/unix. # MODSTUBS: Module stubs source file. # GENCONST_SRC: genconst.c # OFFSETS: offsets.in # PLATFORM_OFFSETS: Platform specific mach_offsets.in # FDOFFSETS: fd_offsets.in # -MAPFILE = $(UTSBASE)/sun4/conf/Mapfile +UNIX_MAPFILE = $(UTSBASE)/sun4/conf/Mapfile MODSTUBS = $(UTSBASE)/sparc/ml/modstubs.s GENCONST_SRC = $(UTSBASE)/sun4/ml/genconst.c OFFSETS = $(UTSBASE)/sun4/ml/offsets.in PLATFORM_OFFSETS = $(UTSBASE)/sun4v/ml/mach_offsets.in -FDOFFSETS = $(UTSBASE)/sun/io/fd_offsets.in +FDOFFSETS = $(UTSBASE)/sun/io/fd_offsets.in # # Define the actual specific platforms @@ -266,7 +267,7 @@ IF_TRAPTRACE_OBJ = $(IF_DEBUG_OBJ) $(IF_TRAPTRACE_OBJ)mach_locore.o := DEBUG_DEFS += -DTRAPTRACE $(IF_TRAPTRACE_OBJ)mlsetup.o := DEBUG_DEFS += -DTRAPTRACE -$(IF_TRAPTRACE_OBJ)syscall_trap.o := DEBUG_DEFS += -DTRAPTRACE +$(IF_TRAPTRACE_OBJ)syscall_trap.o := DEBUG_DEFS += -DTRAPTRACE $(IF_TRAPTRACE_OBJ)startup.o := DEBUG_DEFS += -DTRAPTRACE $(IF_TRAPTRACE_OBJ)mach_startup.o := DEBUG_DEFS += -DTRAPTRACE $(IF_TRAPTRACE_OBJ)mp_startup.o := DEBUG_DEFS += -DTRAPTRACE diff --git a/usr/src/uts/sun4v/unix/Makefile b/usr/src/uts/sun4v/unix/Makefile index 084cad3622..ac0c02abe8 100644 --- a/usr/src/uts/sun4v/unix/Makefile +++ b/usr/src/uts/sun4v/unix/Makefile @@ -22,6 +22,7 @@ # # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. +# Copyright 2019 Joyent, Inc. # # @@ -102,7 +103,7 @@ CLOBBERFILES = $(CLEANFILES) $(UNIX_BIN) CLEANLINTFILES += $(LINT_LIB) # -# lint pass one enforcement +# lint pass one enforcement # Turn on doubleword alignment for 64 bit counter timer registers # CFLAGS += $(CCVERBOSE) -dalign @@ -148,13 +149,13 @@ lint: $(LINT_DEPS) clean.lint: $(CLEAN_LINT_DEPS) -install: $(INSTALL_DEPS) +install: $(INSTALL_DEPS) -$(UNIX_BIN): $(UNIX_O) $(KRTLD_O) $(MODSTUBS_O) $(MAPFILE) $(LIBS) \ - $(DTRACESTUBS) - $(LD) -dy -b -o $@ -e _start -M $(MAPFILE) \ - $(UNIX_O) $(KRTLD_O) $(MODSTUBS_O) $(LIBOPTS) $(DTRACESTUBS) +$(UNIX_BIN): $(UNIX_O) $(KRTLD_O) $(MODSTUBS_O) $(UNIX_MAPFILE) $(LIBS) \ + $(DTRACESTUBS) + $(LD) -dy -b -o $@ -e _start -M $(UNIX_MAPFILE) \ + $(UNIX_O) $(KRTLD_O) $(MODSTUBS_O) $(LIBOPTS) $(DTRACESTUBS) $(CTFMERGE_UNIQUIFY_AGAINST_GENUNIX) $(POST_PROCESS) @@ -162,7 +163,7 @@ $(UNIX32_LINK): $(ROOT_PSM_KERN_DIR_32) $(UNIX_BIN) -$(RM) $@; ln -s $(SUBDIR64)/$(UNIX) $@ symcheck: $(UNIX_O) $(KRTLD_O) $(MODSTUBS_O) $(LIBS) - $(LD) -dy -b -o $(SYM_MOD) -M $(MAPFILE) \ + $(LD) -dy -b -o $(SYM_MOD) -M $(UNIX_MAPFILE) \ $(UNIX_O) $(KRTLD_O) $(MODSTUBS_O) $(LIBOPTS) $(DTRACESTUBS) $(UNIX_O): $(OBJECTS) $(OBJS_DIR)/vers.o |