diff options
Diffstat (limited to 'usr/src/uts/i86xpv')
54 files changed, 94 insertions, 1251 deletions
diff --git a/usr/src/uts/i86xpv/Makefile b/usr/src/uts/i86xpv/Makefile index 7d3866b4ee..2b62799664 100644 --- a/usr/src/uts/i86xpv/Makefile +++ b/usr/src/uts/i86xpv/Makefile @@ -32,37 +32,13 @@ UTSBASE = .. include Makefile.i86xpv -# -# The following are x86 specific (rather than i86pc) specific modules -# which are required for the i86pc kernel to completely lint. They are -# not involved in the build in any other way. In order to minimize -# build time, it is assumed that they are up to date. -# -INTEL_LIB_DIR = $(UTSBASE)/intel/lint-libs/$(OBJS_DIR) - -INTEL_LINTS = genunix - -LINT_LIBS = \ - $(GENUNIX_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \ - $(PARALLEL_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \ - $(INTEL_LINTS:%=$(INTEL_LIB_DIR)/llib-l%.ln) - -I86XPV_LINTS = xdb xnb xnbe xnbo xnbu xpvtap - -# -# -# def := TARGET= def all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -lintlib := TARGET= lintlib -machmodlintlib := TARGET= modlintlib modlist := TARGET= modlist modlist modlist.intel := NO_STATE= -K $$MODSTATE$$$$ -clean.lint := TARGET= clean.lint check := TARGET= check .KEEP_STATE: @@ -74,14 +50,13 @@ INITIAL_TARGETS = \ unix \ cpu/scripts -def all clean clobber clean.lint: setup genassym unix .WAIT \ +def all clean clobber: setup genassym unix .WAIT \ $(KMODS) $(XMODS) install: install_platforms setup genassym unix .WAIT \ $(KMODS) $(XMODS) -# Need to clean in here too because of lint. -clean: $(I86XPV_LINTS) +clean: # list the modules under i86xpv. modlist: unix $(KMODS) $(XMODS) @@ -92,10 +67,6 @@ modlist.karch: modlist modlist.intel modlist.intel: @cd $(SRC)/uts/intel; pwd; $(MAKE) $(NO_STATE) modlist -lintlib: unix - -modlintlib: $(KMODS) - genassym unix $(KMODS): FRC @cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET) @@ -103,11 +74,7 @@ setup: FRC @cd cpu/scripts; pwd; $(MAKE) $(TARGET) $(XMODS): FRC - @if [ -f $@/Makefile ]; then \ - cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET); \ - else \ - true; \ - fi + cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET) install_h check: FRC @cd sys; pwd; $(MAKE) $(TARGET) @@ -128,23 +95,6 @@ install_platforms: $(ROOT_PSM_DIR) $(USR_PSM_DIR) \ $(ROOT_PLAT_LINKS) $(USR_PLAT_LINKS) \ $(OEM_USR_PLAT_LINKS) -# -# Full kernel lint target. -# -LINT_TARGET = globallint - -# workaround for multiply defined errors -globallint := LINTFLAGS += -erroff=E_NAME_MULTIPLY_DEF2 - -globallint: - @-$(ECHO) "\nFULL KERNEL: global crosschecks:" - @-$(LINT) $(LINTFLAGS) $(LINT_LIB) $(LINT_LIBS) 2>&1 | $(LGREP.2) - -lint: lintlib .WAIT modlintlib .WAIT $(INTEL_LINTS) $(LINT_DEPS) - -$(INTEL_LINTS): FRC - @cd $(UTSBASE)/intel/$@; pwd; $(MAKE) modlintlib - FRC: include ../Makefile.targ diff --git a/usr/src/uts/i86xpv/Makefile.files b/usr/src/uts/i86xpv/Makefile.files index 2362519fc7..5c9acfabed 100644 --- a/usr/src/uts/i86xpv/Makefile.files +++ b/usr/src/uts/i86xpv/Makefile.files @@ -95,7 +95,6 @@ CORE_OBJS += \ pci_orion.o \ pmem.o \ ppage.o \ - smt.o \ startup.o \ ssp.o \ xpv_timestamp.o \ @@ -154,21 +153,13 @@ CORE_OBJS += \ # locore.o is special. It must be the first file relocated so that it # it is relocated just where its name implies. # -SPECIAL_OBJS_32 += \ - locore.o \ - fast_trap_asm.o \ - interrupt.o \ - syscall_asm.o - -SPECIAL_OBJS_64 += \ +SPECIAL_OBJS += \ locore.o \ fast_trap_asm.o \ interrupt.o \ syscall_asm_amd64.o \ kpti_trampolines.o -SPECIAL_OBJS += $(SPECIAL_OBJS_$(CLASS)) - # # object files used to boot into full kernel # @@ -232,10 +223,7 @@ INC_PATH += -I$(UTSBASE)/i86xpv -I$(UTSBASE)/i86pc -I$(SRC)/common \ # # Since the assym files are derived, the dependencies must be explicit for -# all files including this file. (This is only actually required in the -# instance when the .nse_depinfo file does not exist.) It may seem that -# the lint targets should also have a similar dependency, but they don't -# since only C headers are included when #defined(__lint) is true. +# all files including this file. # ASSYM_DEPS += \ @@ -254,7 +242,6 @@ ASSYM_DEPS += \ panic_asm.o \ sseblk.o \ swtch.o \ - syscall_asm.o \ syscall_asm_amd64.o $(KDI_ASSYM_DEPS:%=$(OBJS_DIR)/%): $(DSF_DIR)/$(OBJS_DIR)/kdi_assym.h diff --git a/usr/src/uts/i86xpv/Makefile.i86xpv b/usr/src/uts/i86xpv/Makefile.i86xpv index cfa20151b8..5a504700f0 100644 --- a/usr/src/uts/i86xpv/Makefile.i86xpv +++ b/usr/src/uts/i86xpv/Makefile.i86xpv @@ -50,9 +50,6 @@ UNIX_DIR = $(UTSBASE)/$(PLATFORM)/unix GENLIB_DIR = $(UTSBASE)/intel/genunix MODSTUBS_DIR = $(UNIX_DIR) DSF_DIR = $(UTSBASE)/$(PLATFORM)/genassym -LINTS_DIR = $(OBJS_DIR) -LINT_LIB_DIR = $(UTSBASE)/$(PLATFORM)/lint-libs/$(OBJS_DIR) -GEN_LINT_LIB_DIR = $(UTSBASE)/intel/lint-libs/$(OBJS_DIR) DTRACESTUBS_O = $(OBJS_DIR)/dtracestubs.o DTRACESTUBS = $(OBJS_DIR)/libdtracestubs.so @@ -62,12 +59,6 @@ SYM_MOD = $(OBJS_DIR)/unix.sym UNIX_O = $(UNIX_DIR)/$(OBJS_DIR)/unix.o MODSTUBS_O = $(MODSTUBS_DIR)/$(OBJS_DIR)/modstubs.o GENLIB = $(GENLIB_DIR)/$(OBJS_DIR)/libgenunix.so -LINT_LIB = $(LINT_LIB_DIR)/llib-lunix.ln -DBOOT_LINT_LIB = $(LINT_LIB_DIR)/llib-ldboot.ln -GEN_LINT_LIB = $(GEN_LINT_LIB_DIR)/llib-lgenunix.ln - -LINT32_DIRS = $(LINT32_BUILDS:%=$(UTSBASE)/$(PLATFORM)/lint-libs/%) -LINT32_FILES = $(LINT32_DIRS:%=%/llib-l$(MODULE).ln) # # Include the makefiles which define build rule templates, the @@ -98,15 +89,6 @@ DEF_BUILDS = $(DEF_BUILDS64) ALL_BUILDS = $(ALL_BUILDS64) # -# x86 or amd64 inline templates -# -INLINES_32 = $(UTSBASE)/intel/ia32/ml/ia32.il \ - $(UTSBASE)/$(PLATFORM)/ml/ia32.il -INLINES_64 = $(UTSBASE)/intel/amd64/ml/amd64.il \ - $(UTSBASE)/$(PLATFORM)/ml/amd64.il -INLINES += $(INLINES_$(CLASS)) - -# # kernel-specific optimizations; override default in Makefile.master # @@ -120,7 +102,7 @@ COPTIMIZE = $(COPTFLAG_$(CLASS)) CFLAGS = $(CFLAGS_XARCH) CFLAGS += $(COPTIMIZE) -CFLAGS += $(INLINES) -D_ASM_INLINES +CFLAGS += -D_ASM_INLINES CFLAGS += $(CCMODE) CFLAGS += $(SPACEFLAG) CFLAGS += $(CCUNBOUND) @@ -142,14 +124,11 @@ AS_INC_PATH += -I$(DSF_DIR)/$(OBJS_DIR) # GENASSYM_SRC: genassym.c UNIX_MAPFILE = $(UTSBASE)/$(PLATFORM)/conf/Mapfile -MODSTUBS = $(UTSBASE)/intel/ia32/ml/modstubs.s +MODSTUBS = $(UTSBASE)/intel/ml/modstubs.s GENASSYM_SRC = $(UTSBASE)/i86pc/ml/genassym.c OFFSETS_SRC = $(UTSBASE)/i86pc/ml/offsets.in -#PLATFORM_OFFSETS_32 = $(UTSBASE)/$(PLATFORM)/ml/mach_offsets.in -PLATFORM_OFFSETS_32 = $(UTSBASE)/i86pc/ml/mach_offsets.in -PLATFORM_OFFSETS_64 = $(UTSBASE)/intel/amd64/ml/mach_offsets.in -PLATFORM_OFFSETS_SRC = $(PLATFORM_OFFSETS_$(CLASS)) +PLATFORM_OFFSETS_SRC = $(UTSBASE)/intel/amd64/ml/mach_offsets.in KDI_OFFSETS_SRC = $(UTSBASE)/intel/kdi/kdi_offsets.in # @@ -186,7 +165,6 @@ DEBUG_COND_DBG64 = IF_DEBUG_OBJ = $(DEBUG_COND_$(BUILD_TYPE))$(OBJS_DIR)/ $(IF_DEBUG_OBJ)trap.o := DEBUG_DEFS += -DTRAPDEBUG -DTRAPTRACE -$(IF_DEBUG_OBJ)syscall_asm.o := DEBUG_DEFS += -DSYSCALLTRACE -DTRAPTRACE $(IF_DEBUG_OBJ)syscall_asm_amd64.o := DEBUG_DEFS += -DSYSCALLTRACE -DTRAPTRACE $(IF_DEBUG_OBJ)fast_trap_asm.o := DEBUG_DEFS += -DTRAPTRACE $(IF_DEBUG_OBJ)interrupt.o := DEBUG_DEFS += -DTRAPTRACE diff --git a/usr/src/uts/i86xpv/Makefile.rules b/usr/src/uts/i86xpv/Makefile.rules index 1ae9301b22..dfabbd6897 100644 --- a/usr/src/uts/i86xpv/Makefile.rules +++ b/usr/src/uts/i86xpv/Makefile.rules @@ -112,8 +112,6 @@ $(OBJS_DIR)/%.o: $(UTSBASE)/common/io/pciex/%.c # We need this one to make sure we share dtrace_subr.c with i86pc # Otherwise we pick up common/os/dtrace_subr.c instead :( -# Note that only the non-commented versions of this hack end up -# in the lint section below. $(OBJS_DIR)/dtrace_subr.o: $(UTSBASE)/i86pc/os/dtrace_subr.c $(COMPILE.c) -o $@ $(UTSBASE)/i86pc/os/dtrace_subr.c @@ -135,42 +133,6 @@ $(OBJS_DIR)/%.o: $(UTSBASE)/common/xen/os/%.c $(OBJS_DIR)/%.o: $(UTSBASE)/common/xen/dtrace/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) - -# -# Section 1b: Lint `object' build rules -# -$(LINTS_DIR)/%.ln: $(UTSBASE)/i86xpv/conf/%.c - @($(LHEAD) $(LINT.c) $< $(LTAIL)) - -$(LINTS_DIR)/%.ln: $(UTSBASE)/i86xpv/io/%.c - @($(LHEAD) $(LINT.c) $< $(LTAIL)) - -$(LINTS_DIR)/%.ln: $(UTSBASE)/i86xpv/io/psm/%.c - @($(LHEAD) $(LINT.c) $< $(LTAIL)) - -$(LINTS_DIR)/%.ln: $(UTSBASE)/i86xpv/ml/%.s - @($(LHEAD) $(LINT.s) $< $(LTAIL)) - -$(LINTS_DIR)/%.ln: $(UTSBASE)/i86xpv/os/%.c - @($(LHEAD) $(LINT.c) $< $(LTAIL)) - -$(LINTS_DIR)/%.ln: $(UTSBASE)/i86xpv/vm/%.c - @($(LHEAD) $(LINT.c) $< $(LTAIL)) - -$(LINTS_DIR)/%.ln: $(UTSBASE)/i86xpv/boot/%.c - @($(LHEAD) $(LINT.c) $< $(LTAIL)) - -$(LINTS_DIR)/%.ln: $(UTSBASE)/i86pc/boot/%.c - @($(LHEAD) $(LINT.c) $< $(LTAIL)) - -$(LINTS_DIR)/%.ln: $(UTSBASE)/common/xen/dtrace/%.c - @($(LHEAD) $(LINT.c) $< $(LTAIL)) - -# See note above. - -$(LINTS_DIR)/dtrace_subr.ln: $(UTSBASE)/i86pc/os/dtrace_subr.c - @($(LHEAD) $(LINT.c) $(UTSBASE)/i86pc/os/dtrace_subr.c $(LTAIL)) - # # stuff for dboot # @@ -191,8 +153,6 @@ DBOOT_AS_XARCH_32 = $(i386_AS_XARCH) DBOOT_AS_XARCH_64 = $(amd64_AS_XARCH) DBOOT_ASFLAGS = $(DBOOT_AS_XARCH_$(CLASS)) -P -D_ASM -DBOOT_LINTFLAGS_i86xpv = $(LINTFLAGS_i386_$(CLASS)) $(LINTTAGS_i386_$(CLASS)) - $(DBOOT_OBJS_DIR)/%.o: $(UTSBASE)/common/xen/os/%.c $(CC) $(DBOOT_CFLAGS) $(DBOOT_DEFS) $(DBOOT_CC_INCL) -c -o $@ $< @@ -217,7 +177,7 @@ $(DBOOT_OBJS_DIR)/%.o: $(COMMONBASE)/util/%.c $(DBOOT_OBJS_DIR)/%.o: $(UTSBASE)/i86xpv/os/%.c $(CC) $(DBOOT_CFLAGS) $(DBOOT_DEFS) $(DBOOT_CC_INCL) -c -o $@ $< -$(DBOOT_OBJS_DIR)/%.o: $(UTSBASE)/intel/ia32/ml/%.s +$(DBOOT_OBJS_DIR)/%.o: $(UTSBASE)/intel/ml/%.s $(AS) $(DBOOT_ASFLAGS) $(DBOOT_DEFS) $(DBOOT_AS_INCL) -o $@ $< $(DBOOT_OBJS_DIR)/%.o: $(COMMONBASE)/util/i386/%.s @@ -232,57 +192,3 @@ $(DBOOT_OBJS_DIR)/%.o: $(UTSBASE)/i86pc/dboot/%.s include $(UTSBASE)/i86pc/Makefile.rules DBOOT_DEFS += -D__xpv - -$(LINTS_DIR)/%.ln: $(UTSBASE)/common/cpr/%.c - @($(LHEAD) $(LINT.c) $< $(LTAIL)) - -$(LINTS_DIR)/%.ln: $(SRC)/common/font/%.c - @($(LHEAD) $(LINT.c) $< $(LTAIL)) - -$(LINTS_DIR)/%.ln: $(UTSBASE)/i86pc/io/ioat/%.c - @($(LHEAD) $(LINT.c) $< $(LTAIL)) - -$(LINTS_DIR)/%.ln: $(UTSBASE)/i86pc/io/pci/%.c - @($(LHEAD) $(LINT.c) $< $(LTAIL)) - -$(LINTS_DIR)/%.ln: $(UTSBASE)/i86pc/io/pciex/%.c - @($(LHEAD) $(LINT.c) $< $(LTAIL)) - -$(LINTS_DIR)/%.ln: $(UTSBASE)/intel/io/pciex/hotplug/%.c - @($(LHEAD) $(LINT.c) $< $(LTAIL)) - -$(LINTS_DIR)/%.ln: $(UTSBASE)/i86pc/io/gfx_private/%.c - @($(LHEAD) $(LINT.c) $< $(LTAIL)) - -$(LINTS_DIR)/%.ln: $(UTSBASE)/i86pc/io/xsvc/%.c - @($(LHEAD) $(LINT.c) $< $(LTAIL)) - -$(LINTS_DIR)/%.ln: $(UTSBASE)/common/io/pciex/%.c - @($(LHEAD) $(LINT.c) $< $(LTAIL)) - -$(LINTS_DIR)/%.ln: $(UTSBASE)/common/xen/io/%.c - @($(LHEAD) $(LINT.c) $< $(LTAIL)) - -$(LINTS_DIR)/%.ln: $(UTSBASE)/common/xen/os/%.c - @($(LHEAD) $(LINT.c) $< $(LTAIL)) - -$(DBOOT_LINTS_DIR)/%.ln: $(UTSBASE)/intel/ia32/ml/%.s - @($(LHEAD) $(DBOOT_LINT) $(DBOOT_LOCAL_LINTFLAGS) $< $(LTAIL)) - -$(DBOOT_LINTS_DIR)/%.ln: $(SRC)/common/font/%.c - @($(LHEAD) $(DBOOT_LINT) $(DBOOT_LOCAL_LINTFLAGS) $< $(LTAIL)) - -$(DBOOT_LINTS_DIR)/%.ln: $(DBOOT_LINTS_DIR)/%.c - @($(LHEAD) $(DBOOT_LINT) $(DBOOT_LOCAL_LINTFLAGS) $< $(LTAIL)) - -$(DBOOT_LINTS_DIR)/%.ln: $(UTSBASE)/common/xen/os/%.c - @($(LHEAD) $(DBOOT_LINT) $(DBOOT_LOCAL_LINTFLAGS) $< $(LTAIL)) - -$(DBOOT_LINTS_DIR)/%.ln: $(UTSBASE)/i86xpv/os/%.c - @($(LHEAD) $(DBOOT_LINT) $(DBOOT_LOCAL_LINTFLAGS) $< $(LTAIL)) - -$(DBOOT_LINTS_DIR)/%.ln: $(UTSBASE)/i86xpv/ml/%.s - @($(LHEAD) $(DBOOT_LINT) $(DBOOT_LOCAL_LINTFLAGS) $< $(LTAIL)) - -$(DBOOT_LINTS_DIR)/%.ln: $(UTSBASE)/i86xpv/boot/%.c - @($(LHEAD) $(DBOOT_LINT) $(DBOOT_LOCAL_LINTFLAGS) $< $(LTAIL)) diff --git a/usr/src/uts/i86xpv/amd_opteron/Makefile b/usr/src/uts/i86xpv/amd_opteron/Makefile index 49f2519a8b..9820c9607e 100644 --- a/usr/src/uts/i86xpv/amd_opteron/Makefile +++ b/usr/src/uts/i86xpv/amd_opteron/Makefile @@ -35,7 +35,6 @@ UTSBASE = ../.. MODULE = cpu_ms.AuthenticAMD.15 # OBJECTS = $(CPU_AO_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(CPU_AO_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_CPU_DIR)/$(MODULE) SRCDIR = ../../i86pc/cpu/amd_opteron @@ -51,15 +50,9 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv include $(UTSBASE)/i86pc/cpu/Makefile.files # -# Our lint library has a different name from that of the module we build. -# -LINT_MODULE = amd_opteron - -# # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(LINT_MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # @@ -69,7 +62,7 @@ $(OBJS_DIR)/ao_mca.o := CERRWARN += -_gcc=-Wno-unused-function CLEANFILES += $(AO_MCA_DISP_C) CPPFLAGS += -I$(SRCDIR) -I$(OBJS_DIR) ASFLAGS += -I$(SRCDIR) -I$(OBJS_DIR) -LDFLAGS += -dy -N misc/acpica +LDFLAGS += -N misc/acpica # # Default build targets. @@ -84,12 +77,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/authenticamd/Makefile b/usr/src/uts/i86xpv/authenticamd/Makefile index 8fdf290220..6d109e6a30 100644 --- a/usr/src/uts/i86xpv/authenticamd/Makefile +++ b/usr/src/uts/i86xpv/authenticamd/Makefile @@ -32,7 +32,6 @@ UTSBASE = ../.. MODULE = cpu_ms.AuthenticAMD # OBJECTS = $(CPU_AUTHAMD_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(CPU_AUTHAMD_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_CPU_DIR)/$(MODULE) SRCDIR = ../cpu/authenticamd @@ -44,15 +43,9 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv include $(UTSBASE)/i86pc/cpu/Makefile.files # -# Our lint library has a different name from that of the module we build. -# -LINT_MODULE = authenticamd - -# # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(LINT_MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # @@ -60,7 +53,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # CPPFLAGS += -I$(SRCDIR) -I$(OBJS_DIR) ASFLAGS += -I$(SRCDIR) -I$(OBJS_DIR) -LDFLAGS += -dy -N misc/acpica +LDFLAGS += -N misc/acpica # # Default build targets. @@ -75,12 +68,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/balloon/Makefile b/usr/src/uts/i86xpv/balloon/Makefile index 6a557a0b3d..807e40ef79 100644 --- a/usr/src/uts/i86xpv/balloon/Makefile +++ b/usr/src/uts/i86xpv/balloon/Makefile @@ -23,7 +23,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # This makefile drives the production of the balloon # driver kernel module. @@ -41,7 +41,6 @@ UTSBASE = ../.. # MODULE = balloon OBJECTS = $(BALLOON_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(BALLOON_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # @@ -53,7 +52,6 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # @@ -69,12 +67,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/consconfig_dacf/Makefile b/usr/src/uts/i86xpv/consconfig_dacf/Makefile index 5994e5a22b..2046c0f1ed 100644 --- a/usr/src/uts/i86xpv/consconfig_dacf/Makefile +++ b/usr/src/uts/i86xpv/consconfig_dacf/Makefile @@ -36,7 +36,6 @@ UTSBASE = ../.. # MODULE = consconfig_dacf OBJECTS = $(CONSCONFIG_DACF_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(CONSCONFIG_DACF_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DACF_DIR)/$(MODULE) # @@ -48,13 +47,12 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # # Overrides # -LDFLAGS += -dy -Nmisc/usbser +LDFLAGS += -Nmisc/usbser CERRWARN += -_gcc=-Wno-parentheses @@ -68,12 +66,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/cpu/scripts/Makefile b/usr/src/uts/i86xpv/cpu/scripts/Makefile index e5c08d85f6..def58a6f1c 100644 --- a/usr/src/uts/i86xpv/cpu/scripts/Makefile +++ b/usr/src/uts/i86xpv/cpu/scripts/Makefile @@ -38,7 +38,7 @@ def all install setup: ao_gendisp.pl $(PERLFILES) # We are sharing the ao_gendisp source with the i86pc AO_GENDISP_PL=../../../i86pc/cpu/scripts/ao_gendisp.pl ao_gendisp.pl: $(AO_GENDISP_PL) - $(SYMLINK) $(AO_GENDISP_PL) $@ + $(RM) $@; $(SYMLINK) $(AO_GENDISP_PL) $@ clean clobber: $(RM) ao_gendisp.pl $(PERLFILES) diff --git a/usr/src/uts/i86xpv/domcaps/Makefile b/usr/src/uts/i86xpv/domcaps/Makefile index b6fb32f055..3cc401d368 100644 --- a/usr/src/uts/i86xpv/domcaps/Makefile +++ b/usr/src/uts/i86xpv/domcaps/Makefile @@ -23,7 +23,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # This makefile drives the production of the domcaps # driver kernel module. @@ -41,7 +41,6 @@ UTSBASE = ../.. # MODULE = domcaps OBJECTS = $(DOMCAPS_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(DOMCAPS_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # @@ -53,7 +52,6 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # @@ -69,12 +67,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/evtchn/Makefile b/usr/src/uts/i86xpv/evtchn/Makefile index d13dba1e05..49436e189d 100644 --- a/usr/src/uts/i86xpv/evtchn/Makefile +++ b/usr/src/uts/i86xpv/evtchn/Makefile @@ -23,7 +23,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # This makefile drives the production of the evtchn # driver kernel module. @@ -41,7 +41,6 @@ UTSBASE = ../.. # MODULE = evtchn OBJECTS = $(EVTCHN_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(EVTCHN_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # @@ -53,15 +52,9 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # -# Since we don't always pick up $(ALWAYS_LINT_DEFS)... -# -LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV - -# # Default build targets. # .KEEP_STATE: @@ -74,12 +67,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/genassym/Makefile b/usr/src/uts/i86xpv/genassym/Makefile index a5b77cd9cf..31944c010a 100644 --- a/usr/src/uts/i86xpv/genassym/Makefile +++ b/usr/src/uts/i86xpv/genassym/Makefile @@ -74,8 +74,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -clean.lint: - install: def # diff --git a/usr/src/uts/i86xpv/generic_cpu/Makefile b/usr/src/uts/i86xpv/generic_cpu/Makefile index cb5182ddad..d9da701160 100644 --- a/usr/src/uts/i86xpv/generic_cpu/Makefile +++ b/usr/src/uts/i86xpv/generic_cpu/Makefile @@ -35,7 +35,6 @@ MODULE = cpu.generic # OBJECTS = $(CPU_GCPU_OBJS:%=$(OBJS_DIR)/%) OBJECTS += $(CPU_GCPU_XPV_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(CPU_GCPU_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_CPU_DIR)/$(MODULE) # @@ -49,15 +48,9 @@ CERRWARN += $(CNOWARN_UNINIT) CERRWARN += -_gcc=-Wno-unused-variable # -# Our lint library has a different name from that of the module we build. -# -LINT_MODULE = generic_cpu - -# # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(LINT_MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # @@ -73,12 +66,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/genuineintel/Makefile b/usr/src/uts/i86xpv/genuineintel/Makefile index 76cc726c0c..c41f65df50 100644 --- a/usr/src/uts/i86xpv/genuineintel/Makefile +++ b/usr/src/uts/i86xpv/genuineintel/Makefile @@ -32,7 +32,6 @@ UTSBASE = ../.. MODULE = cpu_ms.GenuineIntel # OBJECTS = $(CPU_GENINTEL_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(CPU_GENINTEL_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_CPU_DIR)/$(MODULE) SRCDIR = ../../i86pc/cpu/genuineintel @@ -44,15 +43,9 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv include $(UTSBASE)/i86pc/cpu/Makefile.files # -# Our lint library has a different name from that of the module we build. -# -LINT_MODULE = genuineintel - -# # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(LINT_MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # @@ -60,7 +53,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # CPPFLAGS += -I$(SRCDIR) -I$(OBJS_DIR) ASFLAGS += -I$(SRCDIR) -I$(OBJS_DIR) -LDFLAGS += -dy -N misc/acpica +LDFLAGS += -N misc/acpica # # Default build targets. @@ -75,12 +68,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/gfx_private/Makefile b/usr/src/uts/i86xpv/gfx_private/Makefile index b2627ac283..cf51fd8d81 100644 --- a/usr/src/uts/i86xpv/gfx_private/Makefile +++ b/usr/src/uts/i86xpv/gfx_private/Makefile @@ -42,13 +42,12 @@ UTSBASE = ../.. # MODULE = gfx_private OBJECTS = $(GFX_PRIVATE_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(GFX_PRIVATE_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_MISC_DIR)/$(MODULE) # # dependency # -LDFLAGS += -dy -Nmisc/pci_autoconfig +LDFLAGS += -Nmisc/pci_autoconfig # # Include common rules. @@ -59,12 +58,8 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) -LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV -LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN -LINTTAGS += -erroff=E_STATIC_UNUSED CERRWARN += $(CNOWARN_UNINIT) CERRWARN += -_gcc=-Wno-parentheses @@ -82,12 +77,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/io/privcmd_hcall.c b/usr/src/uts/i86xpv/io/privcmd_hcall.c index 85ab0ed707..d8b122d311 100644 --- a/usr/src/uts/i86xpv/io/privcmd_hcall.c +++ b/usr/src/uts/i86xpv/io/privcmd_hcall.c @@ -291,11 +291,7 @@ privcmd_HYPERVISOR_domctl(xen_domctl_t *opp) } case XEN_DOMCTL_gethvmcontext: { -#if !defined(__GNUC__) && defined(__i386__) - if (op.u.hvmcontext.buffer.u.p != NULL) -#else if (op.u.hvmcontext.buffer.p != NULL) -#endif error = import_handle(&sub_ie, &op.u.hvmcontext.buffer, op.u.hvmcontext.size, IE_EXPORT); break; diff --git a/usr/src/uts/i86xpv/io/psm/mp_platform_xpv.c b/usr/src/uts/i86xpv/io/psm/mp_platform_xpv.c index 1c20832721..5167decaf6 100644 --- a/usr/src/uts/i86xpv/io/psm/mp_platform_xpv.c +++ b/usr/src/uts/i86xpv/io/psm/mp_platform_xpv.c @@ -187,7 +187,7 @@ static uchar_t *apic_oldvec_to_newvec; static uchar_t *apic_newvec_to_oldvec; /* ACPI Interrupt Source Override Structure ptr */ -ACPI_MADT_INTERRUPT_OVERRIDE *acpi_isop; +extern ACPI_MADT_INTERRUPT_OVERRIDE *acpi_isop; extern int acpi_iso_cnt; /* diff --git a/usr/src/uts/i86xpv/ioat/Makefile b/usr/src/uts/i86xpv/ioat/Makefile index 880c968740..205772f928 100644 --- a/usr/src/uts/i86xpv/ioat/Makefile +++ b/usr/src/uts/i86xpv/ioat/Makefile @@ -40,7 +40,6 @@ UTSBASE = ../.. # MODULE = ioat OBJECTS = $(IOAT_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(IOAT_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/i86pc/io/ioat @@ -53,10 +52,8 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(BINARY) $(SRC_CONFILE) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) -LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN CERRWARN += -_gcc=-Wno-unused-label CERRWARN += $(CNOWARN_UNINIT) @@ -64,7 +61,7 @@ CERRWARN += $(CNOWARN_UNINIT) # # Dependency # -LDFLAGS += -dy -Nmisc/dcopy +LDFLAGS += -Nmisc/dcopy # # Override defaults to build a unique, local modstubs.o. @@ -85,12 +82,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/isa/Makefile b/usr/src/uts/i86xpv/isa/Makefile index 348a36ba23..fa8fd7c99d 100644 --- a/usr/src/uts/i86xpv/isa/Makefile +++ b/usr/src/uts/i86xpv/isa/Makefile @@ -40,7 +40,6 @@ UTSBASE = ../.. # MODULE = isa OBJECTS = $(ISANEXUS_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(ISANEXUS_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) INC_PATH += -I$(UTSBASE)/i86pc/sys/acpi @@ -53,7 +52,6 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(OBJS_DIR)/isa.o := CERRWARN += -_gcc=-Wno-unused-function @@ -62,51 +60,51 @@ $(OBJS_DIR)/isa.o := CERRWARN += -_gcc=-Wno-unused-function $(OBJS_DIR)/i8237A.o := SMOFF += indenting # -# lint pass one enforcement +# For now, disable these warnings; maintainers should endeavor +# to investigate and remove these for maximum coverage. +# Please do not carry these forward to new Makefiles. # -CFLAGS += $(CCVERBOSE) +CFLAGS += $(CCVERBOSE) +CERRWARN += -_gcc=-Wno-unused-variable # # Dependency -LDFLAGS += -dy -Nmisc/acpica -Nmisc/busra -Nmisc/pci_autoconfig +LDFLAGS += -Nmisc/acpica -Nmisc/busra -Nmisc/pci_autoconfig # # Define our version of dma_engine and i8237A interfaces # -$(OBJECTS) $(LINTS) := CPPFLAGS += -Di_dmae_init=$(MODULE)_i_dmae_init -$(OBJECTS) $(LINTS) := CPPFLAGS += -Di_dmae_acquire=$(MODULE)_i_dmae_acquire -$(OBJECTS) $(LINTS) := CPPFLAGS += -Di_dmae_free=$(MODULE)_i_dmae_free -$(OBJECTS) $(LINTS) := CPPFLAGS += -Di_dmae_get_best_mode=$(MODULE)_i_dmae_get_best_mode -$(OBJECTS) $(LINTS) := CPPFLAGS += -D_dmae_nxcookie=$(MODULE)__dmae_nxcookie -$(OBJECTS) $(LINTS) := CPPFLAGS += -Di_dmae_prog=$(MODULE)_i_dmae_prog -$(OBJECTS) $(LINTS) := CPPFLAGS += -Di_dmae_swsetup=$(MODULE)_i_dmae_swsetup -$(OBJECTS) $(LINTS) := CPPFLAGS += -Di_dmae_swsetup=$(MODULE)_i_dmae_swsetup -$(OBJECTS) $(LINTS) := CPPFLAGS += -Di_dmae_swstart=$(MODULE)_i_dmae_swstart -$(OBJECTS) $(LINTS) := CPPFLAGS += -Di_dmae_stop=$(MODULE)_i_dmae_stop -$(OBJECTS) $(LINTS) := CPPFLAGS += -Di_dmae_enable=$(MODULE)_i_dmae_enable -$(OBJECTS) $(LINTS) := CPPFLAGS += -Di_dmae_disable=$(MODULE)_i_dmae_disable -$(OBJECTS) $(LINTS) := CPPFLAGS += -Di_dmae_get_chan_stat=$(MODULE)_i_dmae_get_chan_stat -$(OBJECTS) $(LINTS) := CPPFLAGS += -Dd37A_init=$(MODULE)_d37A_init -$(OBJECTS) $(LINTS) := CPPFLAGS += -Dd37A_dma_valid=$(MODULE)_d37A_dma_valid -$(OBJECTS) $(LINTS) := CPPFLAGS += -Dd37A_dma_release=$(MODULE)_d37A_dma_release -$(OBJECTS) $(LINTS) := CPPFLAGS += -Dd37A_dma_disable=$(MODULE)_d37A_dma_disable -$(OBJECTS) $(LINTS) := CPPFLAGS += -Dd37A_dma_enable=$(MODULE)_d37A_dma_enable -$(OBJECTS) $(LINTS) := CPPFLAGS += -Dd37A_get_best_mode=$(MODULE)_d37A_get_best_mode -$(OBJECTS) $(LINTS) := CPPFLAGS += -Dd37A_intr=$(MODULE)_d37A_intr -$(OBJECTS) $(LINTS) := CPPFLAGS += -DdEISA_setchain=$(MODULE)_dEISA_setchain -$(OBJECTS) $(LINTS) := CPPFLAGS += -Dd37A_prog_chan=$(MODULE)_d37A_prog_chan -$(OBJECTS) $(LINTS) := CPPFLAGS += -Dd37A_dma_swsetup=$(MODULE)_d37A_dma_swsetup -$(OBJECTS) $(LINTS) := CPPFLAGS += -Dd37A_dma_swstart=$(MODULE)_d37A_dma_swstart -$(OBJECTS) $(LINTS) := CPPFLAGS += -Dd37A_dma_stop=$(MODULE)_d37A_dma_stop -$(OBJECTS) $(LINTS) := CPPFLAGS += -Dd37A_get_chan_stat=$(MODULE)_d37A_get_chan_stat -$(OBJECTS) $(LINTS) := CPPFLAGS += -Dd37A_set_mode=$(MODULE)_d37A_set_mode -$(OBJECTS) $(LINTS) := CPPFLAGS += -Dd37A_write_addr=$(MODULE)_d37A_write_addr -$(OBJECTS) $(LINTS) := CPPFLAGS += -Dd37A_read_addr=$(MODULE)_d37A_read_addr -$(OBJECTS) $(LINTS) := CPPFLAGS += -Dd37A_write_count=$(MODULE)_d37A_write_count -$(OBJECTS) $(LINTS) := CPPFLAGS += -Dd37A_read_count=$(MODULE)_d37A_read_count - -LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN -CERRWARN += -_gcc=-Wno-unused-variable +$(OBJECTS) := CPPFLAGS += -Di_dmae_init=$(MODULE)_i_dmae_init +$(OBJECTS) := CPPFLAGS += -Di_dmae_acquire=$(MODULE)_i_dmae_acquire +$(OBJECTS) := CPPFLAGS += -Di_dmae_free=$(MODULE)_i_dmae_free +$(OBJECTS) := CPPFLAGS += -Di_dmae_get_best_mode=$(MODULE)_i_dmae_get_best_mode +$(OBJECTS) := CPPFLAGS += -D_dmae_nxcookie=$(MODULE)__dmae_nxcookie +$(OBJECTS) := CPPFLAGS += -Di_dmae_prog=$(MODULE)_i_dmae_prog +$(OBJECTS) := CPPFLAGS += -Di_dmae_swsetup=$(MODULE)_i_dmae_swsetup +$(OBJECTS) := CPPFLAGS += -Di_dmae_swsetup=$(MODULE)_i_dmae_swsetup +$(OBJECTS) := CPPFLAGS += -Di_dmae_swstart=$(MODULE)_i_dmae_swstart +$(OBJECTS) := CPPFLAGS += -Di_dmae_stop=$(MODULE)_i_dmae_stop +$(OBJECTS) := CPPFLAGS += -Di_dmae_enable=$(MODULE)_i_dmae_enable +$(OBJECTS) := CPPFLAGS += -Di_dmae_disable=$(MODULE)_i_dmae_disable +$(OBJECTS) := CPPFLAGS += -Di_dmae_get_chan_stat=$(MODULE)_i_dmae_get_chan_stat +$(OBJECTS) := CPPFLAGS += -Dd37A_init=$(MODULE)_d37A_init +$(OBJECTS) := CPPFLAGS += -Dd37A_dma_valid=$(MODULE)_d37A_dma_valid +$(OBJECTS) := CPPFLAGS += -Dd37A_dma_release=$(MODULE)_d37A_dma_release +$(OBJECTS) := CPPFLAGS += -Dd37A_dma_disable=$(MODULE)_d37A_dma_disable +$(OBJECTS) := CPPFLAGS += -Dd37A_dma_enable=$(MODULE)_d37A_dma_enable +$(OBJECTS) := CPPFLAGS += -Dd37A_get_best_mode=$(MODULE)_d37A_get_best_mode +$(OBJECTS) := CPPFLAGS += -Dd37A_intr=$(MODULE)_d37A_intr +$(OBJECTS) := CPPFLAGS += -DdEISA_setchain=$(MODULE)_dEISA_setchain +$(OBJECTS) := CPPFLAGS += -Dd37A_prog_chan=$(MODULE)_d37A_prog_chan +$(OBJECTS) := CPPFLAGS += -Dd37A_dma_swsetup=$(MODULE)_d37A_dma_swsetup +$(OBJECTS) := CPPFLAGS += -Dd37A_dma_swstart=$(MODULE)_d37A_dma_swstart +$(OBJECTS) := CPPFLAGS += -Dd37A_dma_stop=$(MODULE)_d37A_dma_stop +$(OBJECTS) := CPPFLAGS += -Dd37A_get_chan_stat=$(MODULE)_d37A_get_chan_stat +$(OBJECTS) := CPPFLAGS += -Dd37A_set_mode=$(MODULE)_d37A_set_mode +$(OBJECTS) := CPPFLAGS += -Dd37A_write_addr=$(MODULE)_d37A_write_addr +$(OBJECTS) := CPPFLAGS += -Dd37A_read_addr=$(MODULE)_d37A_read_addr +$(OBJECTS) := CPPFLAGS += -Dd37A_write_count=$(MODULE)_d37A_write_count +$(OBJECTS) := CPPFLAGS += -Dd37A_read_count=$(MODULE)_d37A_read_count # # Default build targets. @@ -121,12 +119,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/ml/amd64.il b/usr/src/uts/i86xpv/ml/amd64.il deleted file mode 100644 index 111473332a..0000000000 --- a/usr/src/uts/i86xpv/ml/amd64.il +++ /dev/null @@ -1,88 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/ -/ Inline functions for the x64 kernel running on the hypervisor -/ - - .inline __hypercall0, 0 - movq %rdi, %rax - syscall - .end - - .inline __hypercall1, 0 - movq %rdi, %rax - movq %rsi, %rdi / arg 1 - syscall - .end - - .inline __hypercall2, 0 - movq %rdi, %rax - movq %rsi, %rdi / arg 1 - movq %rdx, %rsi / arg 2 - syscall - .end - - .inline __hypercall3, 0 - movq %rdi, %rax - movq %rsi, %rdi / arg 1 - movq %rdx, %rsi / arg 2 - movq %rcx, %rdx / arg 3 - syscall - .end - -/* XXPV studio bug r10 is changed to eax by compiler */ - .inline __hypercall4_broken, 0 - movq %rdi, %rax - movq %rsi, %rdi / arg 1 - movq %rdx, %rsi / arg 2 - movq %rcx, %rdx / arg 3 - movq %r8, %r10 / r10 = 4th arg - syscall - .end - - .inline __hypercall5_broken, 0 - movq %rdi, %rax - movq %rsi, %rdi / arg 1 - movq %rdx, %rsi / arg 2 - movq %rcx, %rdx / arg 3 - movq %r8, %r10 / r10 = 4th arg - movq %r9, %r8 / arg 5 - syscall - .end - -/* - * Read the -real- TSC. - * This is difficult to virtualize on the hypervisor given there is - * no way to prevent preemption; thus this inline function - * should only be used in the middle of the paravirtualized - * implementation of tsc_read. - */ - .inline __rdtsc_insn, 0 - rdtsc - shlq $32, %rdx - orq %rdx, %rax - .end diff --git a/usr/src/uts/i86xpv/ml/hyperevent.s b/usr/src/uts/i86xpv/ml/hyperevent.s index 1456727d3b..3e25b32190 100644 --- a/usr/src/uts/i86xpv/ml/hyperevent.s +++ b/usr/src/uts/i86xpv/ml/hyperevent.s @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/asm_linkage.h> #include <sys/hypervisor.h> #include <sys/privregs.h> @@ -36,21 +34,7 @@ #include <sys/x86_archext.h> #include <sys/asm_misc.h> -#if !defined(__lint) #include "assym.h" -#endif - -#if defined(__lint) - -void -xen_failsafe_callback(void) -{} - -void -xen_callback(void) -{} - -#else /* __lint */ /* * The stack frame for events is exactly that of an x86 hardware @@ -64,10 +48,10 @@ xen_callback(void) * * On amd64 the stack frame for events is exactly that of an hardware * interrupt with the addition of rcx and r11. - * + * * The stack frame for a failsafe callback is augmented with saved * values for segment registers: - * + * * amd64 * %rcx, %r11, %ds, %es, %fs, %gs, %rip, %cs, %rflags, * [, %oldrsp, %oldss ] @@ -81,8 +65,6 @@ xen_callback(void) * with a #gp fault. */ -#if defined(__amd64) - ENTRY(xen_failsafe_callback) /* @@ -144,54 +126,6 @@ xen_callback(void) jmp _sys_rtt SET_SIZE(xen_failsafe_callback) -#elif defined(__i386) - - ENTRY(xen_failsafe_callback) - - /* - * drop ds, es, fs and gs - */ - addl $_CONST(_MUL(4, CLONGSIZE)), %esp /* see comment for 64-bit */ - - pushl $0 /* dummy error (see comment for 64-bit) */ - pushl $T_GPFLT - - INTR_PUSH - INTGATE_INIT_KERNEL_FLAGS /* (set kernel flag values) */ - - /* - * The fact were here is because HYPERVISOR_IRET to userland - * failed due to a bad %cs value. Rewrite %cs, %ss and %eip - * on the stack so trap will know to handle this with - * kern_gpfault and kill the currently running process. - */ - movl $KCS_SEL, REGOFF_CS(%esp) - movl $KDS_SEL, REGOFF_SS(%esp) - leal nopop_sys_rtt_syscall, %edi - movl %edi, REGOFF_EIP(%esp) - - TRACE_PTR(%edi, %ebx, %ebx, %ecx, $TT_EVENT) /* Uses labels 8 and 9 */ - TRACE_REGS(%edi, %esp, %ebx, %ecx) /* Uses label 9 */ - TRACE_STAMP(%edi) /* Clobbers %eax, %edx, uses 9 */ - - movl %esp, %ebp - - TRACE_STACK(%edi) - - ENABLE_INTR_FLAGS - - pushl %gs:CPU_ID - pushl $0 - pushl %ebp - call trap /* trap(rp, addr, cpuid) handles all traps */ - addl $12, %esp - jmp _sys_rtt - SET_SIZE(xen_failsafe_callback) - -#endif /* __i386 */ - -#if defined(__amd64) - ENTRY(xen_callback) XPV_TRAP_POP @@ -217,33 +151,3 @@ xen_callback(void) /*NOTREACHED*/ SET_SIZE(xen_callback) - -#elif defined(__i386) - - ENTRY(xen_callback) - pushl $0 /* dummy error */ - pushl $T_AST - - INTR_PUSH - INTGATE_INIT_KERNEL_FLAGS /* (set kernel flag values) */ - - TRACE_PTR(%edi, %ebx, %ebx, %ecx, $TT_EVENT) /* Uses labels 8 and 9 */ - TRACE_REGS(%edi, %esp, %ebx, %ecx) /* Uses label 9 */ - TRACE_STAMP(%edi) /* Clobbers %eax, %edx, uses 9 */ - - movl %esp, %ebp - - TRACE_STACK(%edi) - - pushl %edi /* pass trap trace record pointer */ - pushl %ebp /* pass struct regs pointer */ - call xen_callback_handler - addl $8, %esp - - jmp _sys_rtt_ints_disabled - /*NOTREACHED*/ - - SET_SIZE(xen_callback) - -#endif /* __i386 */ -#endif /* __lint */ diff --git a/usr/src/uts/i86xpv/ml/ia32.il b/usr/src/uts/i86xpv/ml/ia32.il deleted file mode 100644 index d4c5013b43..0000000000 --- a/usr/src/uts/i86xpv/ml/ia32.il +++ /dev/null @@ -1,101 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/ -/ Inline functions for the x86 kernel running on the hypervisor -/ - - .inline __hypercall0, 4 - movl (%esp), %eax - int $0x82 - .end - - .inline __hypercall1, 8 - pushl %ebx - movl 4(%esp), %eax - movl 8(%esp), %ebx - int $0x82 - popl %ebx - .end - - .inline __hypercall2, 12 - pushl %ebx - movl 4(%esp), %eax - movl 8(%esp), %ebx - movl 12(%esp), %ecx - int $0x82 - popl %ebx - .end - - .inline __hypercall3, 16 - pushl %ebx - movl 4(%esp), %eax - movl 8(%esp), %ebx - movl 12(%esp), %ecx - movl 16(%esp), %edx - int $0x82 - popl %ebx - .end - - .inline __hypercall4, 20 - pushl %ebx - pushl %esi - movl 8(%esp), %eax - movl 12(%esp), %ebx - movl 16(%esp), %ecx - movl 20(%esp), %edx - movl 24(%esp), %esi - int $0x82 - popl %esi - popl %ebx - .end - - .inline __hypercall5, 24 - pushl %ebx - pushl %esi - pushl %edi - movl 12(%esp), %eax - movl 16(%esp), %ebx - movl 20(%esp), %ecx - movl 24(%esp), %edx - movl 28(%esp), %esi - movl 32(%esp), %edi - int $0x82 - popl %edi - popl %esi - popl %ebx - .end - -/* - * Read the -real- TSC. - * This is difficult to virtualize on the hypervisor given there is - * no way to prevent preemption; thus this inline function - * should only be used in the middle of the paravirtualized - * implementation of tsc_read. - */ - .inline __rdtsc_insn, 0 - rdtsc - .end diff --git a/usr/src/uts/i86xpv/ml/panic_asm.s b/usr/src/uts/i86xpv/ml/panic_asm.s index cfcd6f581a..3e5ccecf67 100644 --- a/usr/src/uts/i86xpv/ml/panic_asm.s +++ b/usr/src/uts/i86xpv/ml/panic_asm.s @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/asm_linkage.h> #include <sys/hypervisor.h> #include <sys/privregs.h> @@ -37,32 +35,8 @@ #include <sys/asm_misc.h> #include <sys/panic.h> -#if !defined(__lint) #include "assym.h" -#endif - -#if defined(__lint) - -void -xpv_panic_callback(void) -{} - -/* ARGSUSED */ -void -xpv_panic_setcr3(ulong_t cr3) -{} - -void -xpv_panic_reload_cr3(void) -{} - -void -xpv_resetgs(void) -{} -#else /* __lint */ - -#if defined(__amd64) ENTRY_NP(xpv_panic_getcr3) movq %cr3, %rax ret @@ -168,106 +142,6 @@ xpv_resetgs(void) iretq SET_SIZE(xpv_timer_trap) -#elif defined(__i386) - - ENTRY_NP(xpv_panic_setcr3) - movl 4(%esp), %eax - movl %eax, %cr3 - ret - SET_SIZE(xpv_panic_setcr3) - - ENTRY(xpv_panic_reload_cr3) - movl %cr3, %eax - movl %eax, %cr3 - ret - SET_SIZE(xpv_panic_reload_cr3) - - /* - * Stack on entry: - * +------------+ - * | EFLAGS | - * | CS | - * | EIP | - * | Error | - * | Trap | <---- %esp - * +------------+ - */ - ENTRY_NP(xpv_panic_prep) - pushl %ebp - movl %esp, %ebp - - subl $REGSIZE, %esp - movl %eax, REGOFF_EAX(%esp) - movl %ebx, REGOFF_EBX(%esp) - movl %esp, %eax - addl $REGSIZE, %eax - movl (%eax), %ebx - movl %ebx, REGOFF_EBP(%esp) - movl 4(%eax), %ebx - movl %ebx, REGOFF_TRAPNO(%esp) - movl 8(%eax), %ebx - movl %ebx, REGOFF_ERR(%esp) - movl 12(%eax), %ebx - movl %ebx, REGOFF_EIP(%esp) - movl 16(%eax), %ebx - movl %ebx, REGOFF_CS(%esp) - movl 20(%eax), %ebx - movl %ebx, REGOFF_EFL(%esp) - addl $28, %eax - movl %eax, REGOFF_ESP(%esp) - xorl %eax, %eax - movw %gs, %ax - mov %eax, REGOFF_GS(%esp) - movw %fs, %ax - mov %eax, REGOFF_FS(%esp) - movw %es, %ax - mov %eax, REGOFF_ES(%esp) - movw %ds, %ax - mov %eax, REGOFF_DS(%esp) - movw %ss, %ax - mov %eax, REGOFF_SS(%esp) - movl %ecx, REGOFF_ECX(%esp) - movl %edx, REGOFF_EDX(%esp) - movl %edi, REGOFF_EDI(%esp) - movl %esi, REGOFF_ESI(%esp) - pushl %esp - call xpv_die - SET_SIZE(xpv_panic_prep) - - /* - * Switch to the Solaris panic stack and jump into the Xen panic - * handling code. - */ - ENTRY_NP(xpv_panic_hdlr) - movl 4(%esp), %eax - lea panic_stack, %esp - add $PANICSTKSIZE, %esp - pushl %eax - call xpv_do_panic - SET_SIZE(xpv_panic_hdlr) - - ENTRY_NP(xpv_surprise_intr) - push %ebp - movl %esp, %ebp - pusha - call xpv_interrupt - popa - pop %ebp - iret - SET_SIZE(xpv_surprise_intr) - - ENTRY_NP(xpv_timer_trap) - push %ebp - movl %esp, %ebp - pusha - call xpv_timer_tick - popa - pop %ebp - iret - SET_SIZE(xpv_timer_trap) - -#endif /* __i386 */ - ENTRY_NP(xpv_panic_sti) sti ret @@ -289,7 +163,7 @@ xpv_resetgs(void) push $0xbad0 push $0x0bad jmp xpv_panic_prep - SET_SIZE(xpv_invaltrap) + SET_SIZE(xpv_invaltrap) ENTRY_NP(xpv_div0trap) push $0 @@ -391,5 +265,3 @@ xpv_resetgs(void) push $T_SIMDFPE jmp xpv_panic_prep SET_SIZE(xpv_xmtrap) - -#endif /* __lint */ diff --git a/usr/src/uts/i86xpv/ml/xenguest.s b/usr/src/uts/i86xpv/ml/xenguest.s index 2d68e640a9..79cfac1599 100644 --- a/usr/src/uts/i86xpv/ml/xenguest.s +++ b/usr/src/uts/i86xpv/ml/xenguest.s @@ -24,18 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - -#if defined(__lint) - -/* - * Stop lint complaining about an empty compilation unit! - * Sigh. There should be a better way to handle this. - */ -int __lint_xen_guest; - -#else /* __lint */ - #include <xen/public/elfnote.h> /* @@ -60,8 +48,4 @@ int __lint_xen_guest; NOTE("Xen", XEN_ELFNOTE_GUEST_OS, .string, "Solaris") NOTE("Xen", XEN_ELFNOTE_VIRT_BASE, .4byte, 0x40000000) NOTE("Xen", XEN_ELFNOTE_PADDR_OFFSET, .4byte, 0x40000000) -#if defined(__i386) - NOTE("Xen", XEN_ELFNOTE_PAE_MODE, .string, "yes,bimodal") -#endif -#endif /* __lint */ diff --git a/usr/src/uts/i86xpv/npe/Makefile b/usr/src/uts/i86xpv/npe/Makefile index 5bcbb397dd..1161c5e391 100644 --- a/usr/src/uts/i86xpv/npe/Makefile +++ b/usr/src/uts/i86xpv/npe/Makefile @@ -40,7 +40,6 @@ UTSBASE = ../.. # MODULE = npe OBJECTS = $(PCI_E_NEXUS_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(PCI_E_NEXUS_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # @@ -52,7 +51,6 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # @@ -62,17 +60,14 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # # pcie supplies PCI Express fabric error support # -LDFLAGS += -dy -Nmisc/acpica -Nmisc/pcie +LDFLAGS += -Nmisc/acpica -Nmisc/pcie # # Name of the module is needed by the source, to distinguish from other # PCI/PCI-express nexi # CFLAGS += -D_MODULE_NAME="\"$(MODULE)\"" -LINTFLAGS += -D_MODULE_NAME="\"$(MODULE)\"" -LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV -LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON CERRWARN += $(CNOWARN_UNINIT) CERRWARN += -_gcc=-Wno-parentheses @@ -91,12 +86,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/os/mach_kdi.c b/usr/src/uts/i86xpv/os/mach_kdi.c index b12d30722d..09e3796fce 100644 --- a/usr/src/uts/i86xpv/os/mach_kdi.c +++ b/usr/src/uts/i86xpv/os/mach_kdi.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Kernel/Debugger Interface (KDI) routines. Called during debugger under * various system states (boot, while running, while the debugger has control). @@ -160,7 +158,6 @@ kdi_slave_wait(void) * Note that kmdb entry relies on the fake cpu_t having zero cpu_idt/cpu_id. */ -#if defined(__amd64) void * boot_kdi_tmpinit(void) @@ -207,56 +204,3 @@ boot_kdi_tmpfini(void *old) load_segment_registers(B64CODE_SEL, 0, KMDBGS_SEL, B32DATA_SEL); #endif } - -#elif defined(__i386) - -/* - * Sigh. We're called before we've initialized the kernels GDT, living - * off the hypervisor's default GDT. For kmdb's sake, we switch now to - * a GDT that looks like dboot's GDT; very shortly we'll initialize and - * switch to the kernel's GDT. - */ - -void * -boot_kdi_tmpinit(void) -{ - cpu_t *cpu = kobj_zalloc(sizeof (*cpu), KM_TMP); - user_desc_t *bgdt; - uint64_t gdtpa; - ulong_t ma[1]; - - cpu->cpu_self = cpu; - - /* - * (Note that we had better switch to a -new- GDT before - * we discard the KM_TMP mappings, or disaster will ensue.) - */ - bgdt = kobj_zalloc(PAGESIZE, KM_TMP); - - ASSERT(((uintptr_t)bgdt & PAGEOFFSET) == 0); - gdtpa = pfn_to_pa(va_to_pfn(bgdt)); - - init_boot_gdt(bgdt); - - set_usegd(&bgdt[GDT_BGSTMP], - cpu, sizeof (*cpu), SDT_MEMRWA, SEL_KPL, SDP_BYTES, SDP_OP32); - - ma[0] = (ulong_t)(pa_to_ma(gdtpa) >> PAGESHIFT); - kbm_read_only((uintptr_t)bgdt, gdtpa); - if (HYPERVISOR_set_gdt(ma, PAGESIZE / sizeof (user_desc_t))) - panic("boot_kdi_tmpinit:HYPERVISOR_set_gdt() failed"); - - load_segment_registers(B32CODE_SEL, B32DATA_SEL, B32DATA_SEL, 0, - KMDBGS_SEL, B32DATA_SEL); - return (0); -} - -/*ARGSUSED*/ -void -boot_kdi_tmpfini(void *old) -{ - load_segment_registers(B32CODE_SEL, B32DATA_SEL, B32DATA_SEL, 0, - 0, B32DATA_SEL); -} - -#endif /* __i386 */ diff --git a/usr/src/uts/i86xpv/os/mp_xen.c b/usr/src/uts/i86xpv/os/mp_xen.c index d430ad8735..b54c1c5610 100644 --- a/usr/src/uts/i86xpv/os/mp_xen.c +++ b/usr/src/uts/i86xpv/os/mp_xen.c @@ -232,11 +232,7 @@ mp_set_cpu_context(vcpu_guest_context_t *vgc, cpu_t *cp) * sse_initial into it anyway. */ -#if defined(__amd64) vgc->user_regs.cs = KCS_SEL | SEL_KPL; /* force to ring 3 */ -#else - vgc->user_regs.cs = KCS_SEL; -#endif vgc->user_regs.ds = KDS_SEL; vgc->user_regs.es = KDS_SEL; vgc->user_regs.ss = KDS_SEL; @@ -250,17 +246,9 @@ mp_set_cpu_context(vcpu_guest_context_t *vgc, cpu_t *cp) else iopl = 0; -#if defined(__amd64) vgc->user_regs.fs = 0; vgc->user_regs.gs = 0; vgc->user_regs.rflags = F_OFF | iopl; -#elif defined(__i386) - vgc->user_regs.fs = KFS_SEL; - vgc->user_regs.gs = KGS_SEL; - vgc->user_regs.eflags = F_OFF | iopl; - vgc->event_callback_cs = vgc->user_regs.cs; - vgc->failsafe_callback_cs = vgc->user_regs.cs; -#endif /* * Initialize the trap_info_t from the IDT @@ -295,14 +283,8 @@ mp_set_cpu_context(vcpu_guest_context_t *vgc, cpu_t *cp) vgc->ctrlreg[0] = CR0_ENABLE_FPU_FLAGS(getcr0()); -#if defined(__i386) - if (mmu.pae_hat) - vgc->ctrlreg[3] = - xen_pfn_to_cr3(pfn_to_mfn(kas.a_hat->hat_htable->ht_pfn)); - else -#endif - vgc->ctrlreg[3] = - pa_to_ma(mmu_ptob(kas.a_hat->hat_htable->ht_pfn)); + vgc->ctrlreg[3] = + pa_to_ma(mmu_ptob(kas.a_hat->hat_htable->ht_pfn)); vgc->ctrlreg[4] = getcr4(); @@ -310,7 +292,6 @@ mp_set_cpu_context(vcpu_guest_context_t *vgc, cpu_t *cp) vgc->failsafe_callback_eip = (uintptr_t)xen_failsafe_callback; vgc->flags |= VGCF_failsafe_disables_events; -#if defined(__amd64) /* * XXPV should this be moved to init_cpu_syscall? */ @@ -319,7 +300,6 @@ mp_set_cpu_context(vcpu_guest_context_t *vgc, cpu_t *cp) ASSERT(vgc->user_regs.gs == 0); vgc->gs_base_kernel = (uintptr_t)cp; -#endif return (xen_vcpu_initialize(cp->cpu_id, vgc)); } @@ -369,15 +349,9 @@ mach_cpucontext_alloc(struct cpu *cp) bzero(&vgc, sizeof (vgc)); -#ifdef __amd64 vgc.user_regs.rip = tp->t_pc; vgc.user_regs.rsp = tp->t_sp; vgc.user_regs.rbp = tp->t_sp - 2 * sizeof (greg_t); -#else - vgc.user_regs.eip = tp->t_pc; - vgc.user_regs.esp = tp->t_sp; - vgc.user_regs.ebp = tp->t_sp - 2 * sizeof (greg_t); -#endif /* * XXPV Fix resume, if Russ didn't already fix it. * @@ -449,7 +423,6 @@ mach_cpucontext_reset(cpu_t *cp) static void pcb_to_user_regs(label_t *pcb, vcpu_guest_context_t *vgc) { -#ifdef __amd64 vgc->user_regs.rip = pcb->val[REG_LABEL_PC]; vgc->user_regs.rsp = pcb->val[REG_LABEL_SP]; vgc->user_regs.rbp = pcb->val[REG_LABEL_BP]; @@ -458,14 +431,6 @@ pcb_to_user_regs(label_t *pcb, vcpu_guest_context_t *vgc) vgc->user_regs.r13 = pcb->val[REG_LABEL_R13]; vgc->user_regs.r14 = pcb->val[REG_LABEL_R14]; vgc->user_regs.r15 = pcb->val[REG_LABEL_R15]; -#else /* __amd64 */ - vgc->user_regs.eip = pcb->val[REG_LABEL_PC]; - vgc->user_regs.esp = pcb->val[REG_LABEL_SP]; - vgc->user_regs.ebp = pcb->val[REG_LABEL_BP]; - vgc->user_regs.ebx = pcb->val[REG_LABEL_EBX]; - vgc->user_regs.esi = pcb->val[REG_LABEL_ESI]; - vgc->user_regs.edi = pcb->val[REG_LABEL_EDI]; -#endif /* __amd64 */ } /* @@ -490,13 +455,8 @@ mach_cpucontext_restore(cpu_t *cp) * stack pointer to account for the pop of xIP that returning from * longjmp() normally would do, and set the return value in xAX to 1. */ -#ifdef __amd64 vgc.user_regs.rax = 1; vgc.user_regs.rsp += sizeof (ulong_t); -#else - vgc.user_regs.eax = 1; - vgc.user_regs.esp += sizeof (ulong_t); -#endif vgc.kernel_sp = cp->cpu_thread->t_sp; diff --git a/usr/src/uts/i86xpv/os/xen_machdep.c b/usr/src/uts/i86xpv/os/xen_machdep.c index 949ac0293d..7106be2b2b 100644 --- a/usr/src/uts/i86xpv/os/xen_machdep.c +++ b/usr/src/uts/i86xpv/os/xen_machdep.c @@ -234,7 +234,6 @@ xen_hypervisor_supports_solaris(xen_hypervisor_check_t check) static void xen_pte_workaround(void) { -#if defined(__amd64) extern int pt_kern; if (XENVER_CURRENT(xv_major) != 3) @@ -248,7 +247,6 @@ xen_pte_workaround(void) return; pt_kern = PT_USER; -#endif } void @@ -257,12 +255,7 @@ xen_set_callback(void (*func)(void), uint_t type, uint_t flags) struct callback_register cb; bzero(&cb, sizeof (cb)); -#if defined(__amd64) cb.address = (ulong_t)func; -#elif defined(__i386) - cb.address.cs = KCS_SEL; - cb.address.eip = (ulong_t)func; -#endif cb.type = type; cb.flags = flags; @@ -297,10 +290,8 @@ xen_init_callbacks(void) * system call handler * XXPV move to init_cpu_syscall? */ -#if defined(__amd64) xen_set_callback(sys_syscall, CALLBACKTYPE_syscall, CALLBACKF_mask_events); -#endif /* __amd64 */ } @@ -1043,7 +1034,6 @@ xen_set_trap_table(trap_info_t *table) return (err); } -#if defined(__amd64) void xen_set_segment_base(int reg, ulong_t value) { @@ -1058,7 +1048,6 @@ xen_set_segment_base(int reg, ulong_t value) reg, value, -(int)err); } } -#endif /* __amd64 */ /* * Translate a hypervisor errcode to a Solaris error code. @@ -1097,7 +1086,7 @@ xen_xlate_errcode(int error) * Caller responsible for preventing kernel preemption. */ void -xen_enable_user_iopl(void) +xen_enable_user_iopl(void *arg __unused) { physdev_set_iopl_t set_iopl; set_iopl.iopl = 3; /* user ring 3 */ @@ -1108,7 +1097,7 @@ xen_enable_user_iopl(void) * Drop PS_IOPL on current vcpu to kernel level */ void -xen_disable_user_iopl(void) +xen_disable_user_iopl(void *arg __unused) { physdev_set_iopl_t set_iopl; set_iopl.iopl = 1; /* kernel pseudo ring 1 */ @@ -1119,19 +1108,15 @@ int xen_gdt_setprot(cpu_t *cp, uint_t prot) { int err; -#if defined(__amd64) int pt_bits = PT_VALID; if (prot & PROT_WRITE) pt_bits |= PT_WRITABLE; -#endif if ((err = as_setprot(&kas, (caddr_t)cp->cpu_gdt, MMU_PAGESIZE, prot)) != 0) goto done; -#if defined(__amd64) err = xen_kpm_page(mmu_btop(cp->cpu_m.mcpu_gdtpa), pt_bits); -#endif done: if (err) { @@ -1148,17 +1133,14 @@ xen_ldt_setprot(user_desc_t *ldt, size_t lsize, uint_t prot) { int err; caddr_t lva = (caddr_t)ldt; -#if defined(__amd64) int pt_bits = PT_VALID; pgcnt_t npgs; if (prot & PROT_WRITE) pt_bits |= PT_WRITABLE; -#endif /* __amd64 */ if ((err = as_setprot(&kas, (caddr_t)ldt, lsize, prot)) != 0) goto done; -#if defined(__amd64) ASSERT(IS_P2ALIGNED(lsize, PAGESIZE)); npgs = mmu_btop(lsize); @@ -1168,7 +1150,6 @@ xen_ldt_setprot(user_desc_t *ldt, size_t lsize, uint_t prot) break; lva += PAGESIZE; } -#endif /* __amd64 */ done: if (err) { diff --git a/usr/src/uts/i86xpv/os/xpv_panic.c b/usr/src/uts/i86xpv/os/xpv_panic.c index 3778f526ef..27d1180d9a 100644 --- a/usr/src/uts/i86xpv/os/xpv_panic.c +++ b/usr/src/uts/i86xpv/os/xpv_panic.c @@ -52,11 +52,7 @@ #include <vm/hat_i86.h> /* XXX: need to add a PAE version too, if we ever support both PAE and non */ -#if defined(__i386) -#define XPV_FILENAME "/boot/xen-syms" -#else #define XPV_FILENAME "/boot/amd64/xen-syms" -#endif #define XPV_MODNAME "xpv" int xpv_panicking = 0; @@ -464,13 +460,11 @@ xpv_traceback(void *fpreg) return (showstack(fpreg, 1)); } -#if defined(__amd64) static void xpv_panic_hypercall(ulong_t call) { panic("Illegally issued hypercall %d during panic!\n", (int)call); } -#endif void xpv_die(struct regs *rp) @@ -557,11 +551,9 @@ switch_to_xpv_panic_idt() idtr.dtr_limit = sizeof (xpv_panic_idt) - 1; wr_idtr(&idtr); -#if defined(__amd64) /* Catch any hypercalls. */ wrmsr(MSR_AMD_LSTAR, (uintptr_t)xpv_panic_hypercall); wrmsr(MSR_AMD_CSTAR, (uintptr_t)xpv_panic_hypercall); -#endif } static void @@ -666,9 +658,7 @@ xpv_do_panic(void *arg) struct panic_info *pip = (struct panic_info *)arg; int l; struct cregs creg; -#if defined(__amd64) extern uintptr_t postbootkernelbase; -#endif if (xpv_panicking++ > 0) panic("multiple calls to xpv_do_panic()"); @@ -685,7 +675,6 @@ xpv_do_panic(void *arg) */ (void) panic_trigger(&panic_quiesce); -#if defined(__amd64) /* * bzero() and bcopy() get unhappy when asked to operate on * addresses outside of the kernel. At this point Xen is really a @@ -693,7 +682,6 @@ xpv_do_panic(void *arg) * the kernel starts. */ postbootkernelbase = xen_virt_start; -#endif #if defined(HYPERVISOR_VIRT_END) xpv_end = HYPERVISOR_VIRT_END; @@ -729,7 +717,6 @@ xpv_do_panic(void *arg) xpv_panic_info = pip; -#if defined(__amd64) kpm1_low = (uintptr_t)xpv_panic_info->pi_ram_start; if (xpv_panic_info->pi_xen_start == NULL) { kpm1_high = (uintptr_t)xpv_panic_info->pi_ram_end; @@ -738,16 +725,13 @@ xpv_do_panic(void *arg) kpm2_low = (uintptr_t)xpv_panic_info->pi_xen_end; kpm2_high = (uintptr_t)xpv_panic_info->pi_ram_end; } -#endif /* * Make sure we are running on the Solaris %gs. The Xen panic code * should already have set up the GDT properly. */ xpv_panic_resetgs(); -#if defined(__amd64) wrmsr(MSR_AMD_GSBASE, (uint64_t)&cpus[0]); -#endif xpv_panic_time_init(); @@ -771,10 +755,6 @@ xpv_do_panic(void *arg) xpv_panic_cr3 = creg.cr_cr3; for (l = mmu.max_level; l >= 0; l--) xpv_panic_nptes[l] = mmu.ptes_per_table; -#ifdef __i386 - if (mmu.pae_hat) - xpv_panic_nptes[mmu.max_level] = 4; -#endif /* Add the fake Xen module to the module list */ if (xpv_module != NULL) { @@ -823,11 +803,7 @@ init_xen_module() Shdr *shp, *ctf_shp; char *names = NULL; size_t n, namesize, text_align, data_align; -#if defined(__amd64) const char machine = EM_AMD64; -#else - const char machine = EM_386; -#endif /* Allocate and init the module structure */ mp = kmem_zalloc(sizeof (*mp), KM_SLEEP); diff --git a/usr/src/uts/i86xpv/pci-ide/Makefile b/usr/src/uts/i86xpv/pci-ide/Makefile index 496f59c4a6..3c89c3bed3 100644 --- a/usr/src/uts/i86xpv/pci-ide/Makefile +++ b/usr/src/uts/i86xpv/pci-ide/Makefile @@ -43,7 +43,6 @@ UTSBASE = ../.. # MODULE = pci-ide OBJECTS = $(PCIIDE_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(PCIIDE_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/pci-ide @@ -56,7 +55,6 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(BINARY) $(CONFMOD) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) # @@ -83,12 +81,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/pci/Makefile b/usr/src/uts/i86xpv/pci/Makefile index ee10c510b8..b1065aab83 100644 --- a/usr/src/uts/i86xpv/pci/Makefile +++ b/usr/src/uts/i86xpv/pci/Makefile @@ -42,7 +42,6 @@ UTSBASE = ../.. # MODULE = pci OBJECTS = $(PCINEXUS_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(PCINEXUS_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # @@ -54,23 +53,19 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # # depends on misc/pci_autoconfig misc/pcihp # -LDFLAGS += -dy -Nmisc/pcihp +LDFLAGS += -Nmisc/pcihp # # Name of the module is needed by the source, to distinguish from other # PCI/PCI-express nexi # CFLAGS += -D_MODULE_NAME="\"$(MODULE)\"" -LINTFLAGS += -D_MODULE_NAME="\"$(MODULE)\"" -LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV -LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON CERRWARN += $(CNOWARN_UNINIT) CERRWARN += -_gcc=-Wno-parentheses @@ -89,12 +84,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/pit_beep/Makefile b/usr/src/uts/i86xpv/pit_beep/Makefile index 0810eea833..29e191fd1b 100644 --- a/usr/src/uts/i86xpv/pit_beep/Makefile +++ b/usr/src/uts/i86xpv/pit_beep/Makefile @@ -23,9 +23,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -# uts/intel/pit_beep/Makefile + # # This makefile drives the production of the pit_beep driver. # @@ -40,7 +38,6 @@ UTSBASE = ../.. # MODULE = pit_beep OBJECTS = $(PIT_BEEP_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(PIT_BEEP_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/intel/io @@ -49,16 +46,12 @@ CONF_SRCDIR = $(UTSBASE)/intel/io # include $(UTSBASE)/i86xpv/Makefile.i86xpv -# -# lint pass one enforcement -# CFLAGS += $(CCVERBOSE) # # Define targets # ALL_TARGET = $(BINARY) $(CONFMOD) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) .KEEP_STATE: @@ -71,12 +64,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/privcmd/Makefile b/usr/src/uts/i86xpv/privcmd/Makefile index 5c01fdfc79..552d314896 100644 --- a/usr/src/uts/i86xpv/privcmd/Makefile +++ b/usr/src/uts/i86xpv/privcmd/Makefile @@ -41,7 +41,6 @@ UTSBASE = ../.. # MODULE = privcmd OBJECTS = $(PRIVCMD_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(PRIVCMD_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # @@ -53,10 +52,8 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) -LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW CERRWARN += $(CNOWARN_UNINIT) @@ -73,12 +70,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/rootnex/Makefile b/usr/src/uts/i86xpv/rootnex/Makefile index 9b966d99ad..e9a071b5c7 100644 --- a/usr/src/uts/i86xpv/rootnex/Makefile +++ b/usr/src/uts/i86xpv/rootnex/Makefile @@ -42,7 +42,6 @@ UTSBASE = ../.. # MODULE = rootnex OBJECTS = $(ROOTNEX_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(ROOTNEX_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # @@ -54,17 +53,11 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # # Overrides. # -LDFLAGS += -dy - -LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV -LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN - CERRWARN += $(CNOWARN_UNINIT) CERRWARN += -_gcc=-Wno-unused-label CERRWARN += -_gcc=-Wno-parentheses @@ -83,12 +76,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/sys/machprivregs.h b/usr/src/uts/i86xpv/sys/machprivregs.h index 64780f0c4e..eb8ec76b8d 100644 --- a/usr/src/uts/i86xpv/sys/machprivregs.h +++ b/usr/src/uts/i86xpv/sys/machprivregs.h @@ -213,7 +213,7 @@ extern "C" { pushq %r8; \ pushq %r9; \ pushq %r10; \ - TRAP_INSTR; /* clear upcall mask, force upcall */ \ + TRAP_INSTR; /* clear upcall mask, force upcall */ \ popq %r10; \ popq %r9; \ popq %r8; \ @@ -386,6 +386,18 @@ extern "C" { #define SYSRETL ud2 /* 32-bit syscall/sysret not supported */ #define SWAPGS /* empty - handled in hypervisor */ +/* + * As of GNU binutils 2.37, the assembler has split the 'sysexit' instruction + * into 'sysexitl' and 'sysexitq'. Using a plain 'sysexit' is interpreted as + * 'sysexitl' but comes with a warning about the assumption being made. Since + * all warnings are treated as errors in the kernel build, this results in a + * build failure. Unfortunately the desired 'sysexitl' cannot be used since + * older versions of the GNU assembler do not understand it. + * The following macro emits the correct byte sequence for 'sysexitl' on this + * platform. + */ +#define SYSEXITL .byte 0x0f, 0x35 + #elif defined(__i386) /* diff --git a/usr/src/uts/i86xpv/unix/Makefile b/usr/src/uts/i86xpv/unix/Makefile index 28a20705b9..dd6cf2e5ce 100644 --- a/usr/src/uts/i86xpv/unix/Makefile +++ b/usr/src/uts/i86xpv/unix/Makefile @@ -46,13 +46,6 @@ OBJECTS = $(SPECIAL_OBJS:%=$(OBJS_DIR)/%) \ $(KRTLD_OBJS:%=$(OBJS_DIR)/%) \ $(MACH_NOT_YET_KMODS:%=$(OBJS_DIR)/%) -LINTS = $(SPECIAL_OBJS:%.o=$(LINTS_DIR)/%.ln) \ - $(CORE_OBJS:%.o=$(LINTS_DIR)/%.ln) \ - $(KRTLD_OBJS:%.o=$(LINTS_DIR)/%.ln) \ - $(MACH_NOT_YET_KMODS:%.o=$(LINTS_DIR)/%.ln) \ - $(LINTS_DIR)/vers.ln \ - $(LINTS_DIR)/modstubs.ln - ROOTMODULE = $(ROOT_PSM_KERN_DIR)/$(UNIX) UNIX_BIN = $(OBJS_DIR)/$(UNIX) @@ -71,8 +64,6 @@ DBOOT_OBJECTS = $(DBOOT_OBJS:%=$(DBOOT_OBJS_DIR)/%) DBOOT_BIN = $(DBOOT_OBJS_DIR)/$(DBOOT) DBOOT_O = $(OBJS_DIR)/$(DBOOT).o DBOOT_S = $(DBOOT_O:%.o=%.s) -DBOOT_LINTS = $(DBOOT_OBJS:%.o=$(DBOOT_OBJS_DIR)/%.ln) -DBOOT_LINT = $(LINT_$(MACH)_$(CLASS)) # # Include common rules. @@ -83,7 +74,6 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(UNIX_BIN) -LINT_TARGET = $(LINT_LIB) $(DBOOT_LINT_LIB) INSTALL_TARGET = $(UNIX_BIN) $(ROOTMODULE) # @@ -114,31 +104,20 @@ CLEANFILES += \ $(OBJS_DIR)/fb_swtch_src \ $(OBJS_DIR)/fb_swtch.s -CLEANFILES += \ - $(ZLIB_OBJS:%.o=$(OBJS_DIR)/%.o) \ - $(ZLIB_OBJS:%.o=$(OBJS_DIR)/%.ln) +CLEANFILES += $(ZLIB_OBJS:%.o=$(OBJS_DIR)/%.o) CLOBBERFILES = $(CLEANFILES) $(UNIX_BIN) -CLEANLINTFILES += $(LINT_LIB) $(DBOOT_LINT_LIB) $(DBOOT_LINTS) # instr_size needs a special header $(OBJS_DIR)/instr_size.o := EXTRA_OPTIONS = -I$(SRC)/common/dis/i386 -$(OBJS_DIR)/instr_size.ln := EXTRA_OPTIONS = -I$(SRC)/common/dis/i386 CFLAGS += -DDIS_MEM # -# For now, disable these lint checks; maintainers should endeavor -# to investigate and remove these for maximum lint coverage. +# For now, disable these warnings; maintainers should endeavor +# to investigate and remove these for maximum coverage. # Please do not carry these forward to new Makefiles. # -LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN -LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON -LINTTAGS += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED -LINTTAGS += -erroff=E_STATIC_UNUSED -LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW -LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV - CERRWARN += -_gcc=-Wno-parentheses CERRWARN += $(CNOWARN_UNINIT) CERRWARN += -_gcc=-Wno-char-subscripts @@ -153,11 +132,6 @@ CERRWARN += -_gcc=-Wno-empty-body # needs work SMATCH=off -# Ensure that lint sees 'struct cpu' containing a fully declared -# embedded 'struct machcpu' -# -LINTFLAGS += -D_MACHDEP -I../../i86pc - # # Default build targets. # @@ -171,10 +145,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) MAPFILE_32 = $(UNIX_MAPFILE) @@ -214,30 +184,6 @@ $(DSF_DIR)/$(OBJS_DIR)/assym.h $(DSF_DIR)/$(OBJS_DIR)/kdi_assym.h: FRC @cd $(DSF_DIR); $(MAKE) all.targ # -# The global lint target builds the kernel lint library (llib-lunix.ln) -# which is equivalent to a lint of /unix.o. Then all kernel modules for -# this architecture are linted against the kernel lint library. -# -# Note: lint errors in the kernel lint library will be repeated for -# each module. It is important that the kernel lint library -# be clean to keep the textual output to a reasonable level. -# - -$(LINT_LIB): $(LINT_LIB_DIR) $(LINTS) - @pwd - @-$(ECHO) "\n$(UNIX): (library construction):" - @$(LINT) -o$(UNIX) $(LINTFLAGS) $(LINTS) - @$(MV) $(@F) $@ - -$(DBOOT_LINT_LIB): $(LINT_LIB_DIR) $(DBOOT_LINTS) - @pwd - @-$(ECHO) "\n$(DBOOT): (library construction):" - @$(LINT) -o$(DBOOT) $(DBOOT_LINTFLAGS) $(DBOOT_LINTS) - @$(MV) $(@F) $@ - -lintlib: $(LINT_DEPS) - -# # Include common targets. # include $(UTSBASE)/i86xpv/Makefile.targ diff --git a/usr/src/uts/i86xpv/vm/Makefile b/usr/src/uts/i86xpv/vm/Makefile index b0ca150cea..b93b7d7f4b 100644 --- a/usr/src/uts/i86xpv/vm/Makefile +++ b/usr/src/uts/i86xpv/vm/Makefile @@ -76,6 +76,4 @@ CLEANFILES= CLOBBERFILES= -CLEANLINTFILES= - include ../../Makefile.targ diff --git a/usr/src/uts/i86xpv/xdb/Makefile b/usr/src/uts/i86xpv/xdb/Makefile index f8f78d01df..dbb2f8ef22 100644 --- a/usr/src/uts/i86xpv/xdb/Makefile +++ b/usr/src/uts/i86xpv/xdb/Makefile @@ -38,7 +38,6 @@ UTSBASE = ../.. # MODULE = xdb OBJECTS = $(XDB_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(XDB_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # @@ -50,10 +49,8 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) -LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN CERRWARN += -_gcc=-Wno-switch @@ -76,12 +73,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/xdf/Makefile b/usr/src/uts/i86xpv/xdf/Makefile index 01a5aea021..62bf009ca8 100644 --- a/usr/src/uts/i86xpv/xdf/Makefile +++ b/usr/src/uts/i86xpv/xdf/Makefile @@ -39,7 +39,6 @@ UTSBASE = ../.. # MODULE = xdf OBJECTS = $(XDF_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(XDF_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # @@ -51,15 +50,11 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # Overrides -LDFLAGS += -dy -Nmisc/cmlb +LDFLAGS += -Nmisc/cmlb -LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON -LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV -LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-switch @@ -77,12 +72,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/xdt/Makefile b/usr/src/uts/i86xpv/xdt/Makefile index 7a5cf0844e..64f134aeea 100644 --- a/usr/src/uts/i86xpv/xdt/Makefile +++ b/usr/src/uts/i86xpv/xdt/Makefile @@ -28,17 +28,15 @@ UTSBASE = ../.. MODULE = xdt OBJECTS = $(XDT_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(XDT_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/xen/dtrace include $(UTSBASE)/i86xpv/Makefile.i86xpv ALL_TARGET = $(BINARY) $(SRC_CONFFILE) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) -LDFLAGS += -dy -Ndrv/dtrace +LDFLAGS += -Ndrv/dtrace CERRWARN += $(CNOWARN_UNINIT) @@ -52,12 +50,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) include $(UTSBASE)/i86xpv/Makefile.targ diff --git a/usr/src/uts/i86xpv/xenbus/Makefile b/usr/src/uts/i86xpv/xenbus/Makefile index a20aa84a9d..6def754ff1 100644 --- a/usr/src/uts/i86xpv/xenbus/Makefile +++ b/usr/src/uts/i86xpv/xenbus/Makefile @@ -43,7 +43,6 @@ UTSBASE = ../.. # MODULE = xenbus OBJECTS = $(XENBUS_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(XENBUS_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # @@ -55,10 +54,8 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) -LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-unused-variable @@ -76,12 +73,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/xencons/Makefile b/usr/src/uts/i86xpv/xencons/Makefile index 9acb97f2f2..22938b5669 100644 --- a/usr/src/uts/i86xpv/xencons/Makefile +++ b/usr/src/uts/i86xpv/xencons/Makefile @@ -43,7 +43,6 @@ UTSBASE = ../.. # MODULE = xencons OBJECTS = $(XENCONS_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(XENCONS_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/xen/io @@ -56,12 +55,8 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) -LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN -LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW -LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV CERRWARN += -_gcc=-Wno-unused-label CERRWARN += -_gcc=-Wno-unused-variable @@ -79,12 +74,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/xnb/Makefile b/usr/src/uts/i86xpv/xnb/Makefile index f8ee1c9fd4..2e12e1711f 100644 --- a/usr/src/uts/i86xpv/xnb/Makefile +++ b/usr/src/uts/i86xpv/xnb/Makefile @@ -35,7 +35,6 @@ UTSBASE = ../.. # MODULE = xnb OBJECTS = $(XNB_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(XNB_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_MISC_DIR)/$(MODULE) # @@ -47,7 +46,6 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # @@ -59,17 +57,13 @@ ALL_BUILDS = $(ALL_BUILDS64) # # Module depends on mac. # -LDFLAGS += -dy -N misc/mac +LDFLAGS += -N misc/mac # # use Solaris specific code in xen public header files # CFLAGS += -D_SOLARIS -LINTFLAGS += -D_SOLARIS -LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW -LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV -LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN CERRWARN += $(CNOWARN_UNINIT) @@ -89,12 +83,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/xnbe/Makefile b/usr/src/uts/i86xpv/xnbe/Makefile index b9701c2323..804ba2ea9f 100644 --- a/usr/src/uts/i86xpv/xnbe/Makefile +++ b/usr/src/uts/i86xpv/xnbe/Makefile @@ -40,7 +40,6 @@ UTSBASE = ../.. # MODULE = xnbe OBJECTS = $(XNBE_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(XNBE_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # @@ -52,7 +51,6 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # @@ -64,13 +62,12 @@ ALL_BUILDS = $(ALL_BUILDS64) # # Driver depends on MAC and IP. # -#LDFLAGS += -dy -N misc/mac -N drv/ip +#LDFLAGS += -N misc/mac -N drv/ip # # use Solaris specific code in xen public header files # CFLAGS += -D_SOLARIS -LINTFLAGS += -D_SOLARIS # # Default build targets. @@ -85,12 +82,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/xnbo/Makefile b/usr/src/uts/i86xpv/xnbo/Makefile index c127edfc82..f34c56815b 100644 --- a/usr/src/uts/i86xpv/xnbo/Makefile +++ b/usr/src/uts/i86xpv/xnbo/Makefile @@ -40,7 +40,6 @@ UTSBASE = ../.. # MODULE = xnbo OBJECTS = $(XNBO_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(XNBO_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # @@ -52,7 +51,6 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # @@ -64,13 +62,12 @@ ALL_BUILDS = $(ALL_BUILDS64) # # Driver depends on xnb and mac. # -LDFLAGS += -dy -N misc/xnb -N misc/mac +LDFLAGS += -N misc/xnb -N misc/mac # # use Solaris specific code in xen public header files # CFLAGS += -D_SOLARIS -LINTFLAGS += -D_SOLARIS # # Default build targets. @@ -85,12 +82,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/xnbu/Makefile b/usr/src/uts/i86xpv/xnbu/Makefile index 9ffa2b7a8d..079b63145e 100644 --- a/usr/src/uts/i86xpv/xnbu/Makefile +++ b/usr/src/uts/i86xpv/xnbu/Makefile @@ -40,7 +40,6 @@ UTSBASE = ../.. # MODULE = xnbu OBJECTS = $(XNBU_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(XNBU_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # @@ -52,7 +51,6 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # @@ -64,13 +62,12 @@ ALL_BUILDS = $(ALL_BUILDS64) # # Driver depends on xnb and mac. # -LDFLAGS += -dy -N misc/xnb -N misc/mac +LDFLAGS += -N misc/xnb -N misc/mac # # use Solaris specific code in xen public header files # CFLAGS += -D_SOLARIS -LINTFLAGS += -D_SOLARIS # # Default build targets. @@ -85,12 +82,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/xnf/Makefile b/usr/src/uts/i86xpv/xnf/Makefile index e897ea37e2..4714e51632 100644 --- a/usr/src/uts/i86xpv/xnf/Makefile +++ b/usr/src/uts/i86xpv/xnf/Makefile @@ -37,7 +37,6 @@ UTSBASE = ../.. # MODULE = xnf OBJECTS = $(XNF_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(XNF_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # @@ -49,23 +48,18 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # # Driver depends on MAC & IP # -LDFLAGS += -dy -N misc/mac -N drv/ip +LDFLAGS += -N misc/mac -N drv/ip # # use Solaris specific code in xen public header files # CFLAGS += -D_SOLARIS -LINTFLAGS += -D_SOLARIS -LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV -LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW -LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN # needs work SMATCH=off @@ -83,12 +77,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/xpv_autoconfig/Makefile b/usr/src/uts/i86xpv/xpv_autoconfig/Makefile index 4f43201ec7..77570dbdff 100644 --- a/usr/src/uts/i86xpv/xpv_autoconfig/Makefile +++ b/usr/src/uts/i86xpv/xpv_autoconfig/Makefile @@ -23,7 +23,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # This makefile drives the production of the xpv autoconfiguration # kernel module. @@ -41,7 +41,6 @@ UTSBASE = ../.. # MODULE = xpv_autoconfig OBJECTS = $(XPV_AUTOCONFIG_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(XPV_AUTOCONFIG_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_MISC_DIR)/$(MODULE) # @@ -53,7 +52,6 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # @@ -69,12 +67,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/xpv_psm/Makefile b/usr/src/uts/i86xpv/xpv_psm/Makefile index 1c40f8790b..bf7b12361c 100644 --- a/usr/src/uts/i86xpv/xpv_psm/Makefile +++ b/usr/src/uts/i86xpv/xpv_psm/Makefile @@ -43,7 +43,6 @@ UTSBASE = ../.. # MODULE = xpv_psm OBJECTS = $(XPV_PSM_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(XPV_PSM_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_MACH_DIR)/$(MODULE) # @@ -55,7 +54,6 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # @@ -68,12 +66,8 @@ DEBUG_DEFS += $(DEBUG_FLGS) # # Depends on ACPI CA interpreter # -LDFLAGS += -dy -N misc/acpica +LDFLAGS += -N misc/acpica -LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV -LINTTAGS += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED -LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN -LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON CERRWARN += -_gcc=-Wno-type-limits CERRWARN += -_gcc=-Wno-parentheses @@ -96,12 +90,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/xpv_uppc/Makefile b/usr/src/uts/i86xpv/xpv_uppc/Makefile index be887878b9..5cff367b18 100644 --- a/usr/src/uts/i86xpv/xpv_uppc/Makefile +++ b/usr/src/uts/i86xpv/xpv_uppc/Makefile @@ -41,7 +41,6 @@ UTSBASE = ../.. # MODULE = xpv_uppc OBJECTS = $(XPV_UPPC_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(XPV_UPPC_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_MACH_DIR)/$(MODULE) # @@ -53,7 +52,6 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # @@ -71,12 +69,8 @@ $(OBJS_DIR)/psm_common.o := SMOFF += deref_check # # Depends on ACPI CA interpreter # -LDFLAGS += -dy -N misc/acpica +LDFLAGS += -N misc/acpica -LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV -LINTTAGS += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED -LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN -LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON # Default build targets. # @@ -90,12 +84,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/xpvd/Makefile b/usr/src/uts/i86xpv/xpvd/Makefile index 3acabb2c10..caa215cecc 100644 --- a/usr/src/uts/i86xpv/xpvd/Makefile +++ b/usr/src/uts/i86xpv/xpvd/Makefile @@ -40,7 +40,6 @@ UTSBASE = ../.. # MODULE = xpvd OBJECTS = $(XPVD_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(XPVD_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # @@ -52,11 +51,8 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) -LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV -LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN CERRWARN += $(CNOWARN_UNINIT) @@ -73,12 +69,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/xpvtap/Makefile b/usr/src/uts/i86xpv/xpvtap/Makefile index d231d9c3db..bab1f2b379 100644 --- a/usr/src/uts/i86xpv/xpvtap/Makefile +++ b/usr/src/uts/i86xpv/xpvtap/Makefile @@ -41,7 +41,6 @@ UTSBASE = ../.. # MODULE = xpvtap OBJECTS = $(XPVTAP_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(XPVTAP_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # @@ -53,7 +52,6 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # @@ -62,18 +60,11 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) DEF_BUILDS = $(DEF_BUILDS64) ALL_BUILDS = $(ALL_BUILDS64) -LDFLAGS += - # # use Solaris specific code in xen public header files # CFLAGS += -D_SOLARIS -LINTFLAGS += -D_SOLARIS -LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW -LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV -LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN -LINTTAGS += -erroff=E_CONSTANT_CONDITION CERRWARN += -_gcc=-Wno-unused-label @@ -90,12 +81,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/xpvtod/Makefile b/usr/src/uts/i86xpv/xpvtod/Makefile index ba00064a39..d594a8a4f5 100644 --- a/usr/src/uts/i86xpv/xpvtod/Makefile +++ b/usr/src/uts/i86xpv/xpvtod/Makefile @@ -23,7 +23,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" + # # This makefile drives the production of xpvtod kernel module. # @@ -40,7 +40,6 @@ UTSBASE = ../.. # MODULE = xpvtod OBJECTS = $(XPVTOD_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(XPVTOD_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_TOD_DIR)/$(MODULE) # @@ -52,10 +51,8 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) -LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV # # Default build targets. @@ -70,12 +67,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/i86xpv/xsvc/Makefile b/usr/src/uts/i86xpv/xsvc/Makefile index ae3deaeb48..0a5e76657f 100644 --- a/usr/src/uts/i86xpv/xsvc/Makefile +++ b/usr/src/uts/i86xpv/xsvc/Makefile @@ -39,7 +39,6 @@ UTSBASE = ../.. # MODULE = xsvc OBJECTS = $(XSVC_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(XSVC_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/i86pc/io/xsvc @@ -52,15 +51,9 @@ include $(UTSBASE)/i86xpv/Makefile.i86xpv # Define targets # ALL_TARGET = $(BINARY) $(SRC_CONFILE) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) # -# Dependency -# -LDFLAGS += -dy - -# # Override defaults to build a unique, local modstubs.o. # MODSTUBS_DIR = $(OBJS_DIR) @@ -81,12 +74,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # |