diff options
Diffstat (limited to 'usr/src/uts/Makefile.uts')
| -rw-r--r-- | usr/src/uts/Makefile.uts | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/usr/src/uts/Makefile.uts b/usr/src/uts/Makefile.uts index f9eeb946fa..76cd9aef72 100644 --- a/usr/src/uts/Makefile.uts +++ b/usr/src/uts/Makefile.uts @@ -24,6 +24,7 @@ # Copyright (c) 2011 Bayard G. Bell. All rights reserved. # Copyright (c) 2011 by Delphix. All rights reserved. # Copyright (c) 2013 Andrew Stormont. All rights reserved. +# Copyright 2015 Joyent, Inc. # Copyright 2016 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org> # @@ -214,6 +215,7 @@ AS_CPPFLAGS = $(ALWAYS_DEFS) $(ALL_DEFS) $(CONFIG_DEFS) $(AS_DEFS) \ # Override the default, the kernel is squeaky clean CERRWARN = -errtags=yes -errwarn=%all +$(__GNUC4)CERRWARN += -_gcc=-Wno-address CERRWARN += -_gcc=-Wno-missing-braces CERRWARN += -_gcc=-Wno-sign-compare @@ -413,6 +415,7 @@ ROOT_FONT_DIR_32 = $(ROOT_MOD_DIR)/fonts ROOT_DACF_DIR_32 = $(ROOT_MOD_DIR)/dacf ROOT_CRYPTO_DIR_32 = $(ROOT_MOD_DIR)/crypto ROOT_MAC_DIR_32 = $(ROOT_MOD_DIR)/mac +ROOT_OVERLAY_DIR_32 = $(ROOT_MOD_DIR)/overlay ROOT_KICONV_DIR_32 = $(ROOT_MOD_DIR)/kiconv ROOT_KERN_DIR_64 = $(ROOT_MOD_DIR)/$(SUBDIR64) @@ -440,6 +443,7 @@ ROOT_FONT_DIR_64 = $(ROOT_MOD_DIR)/fonts/$(SUBDIR64) ROOT_DACF_DIR_64 = $(ROOT_MOD_DIR)/dacf/$(SUBDIR64) ROOT_CRYPTO_DIR_64 = $(ROOT_MOD_DIR)/crypto/$(SUBDIR64) ROOT_MAC_DIR_64 = $(ROOT_MOD_DIR)/mac/$(SUBDIR64) +ROOT_OVERLAY_DIR_64 = $(ROOT_MOD_DIR)/overlay/$(SUBDIR64) ROOT_KICONV_DIR_64 = $(ROOT_MOD_DIR)/kiconv/$(SUBDIR64) ROOT_KERN_DIR = $(ROOT_KERN_DIR_$(CLASS)) @@ -467,6 +471,7 @@ ROOT_FONT_DIR = $(ROOT_FONT_DIR_$(CLASS)) ROOT_DACF_DIR = $(ROOT_DACF_DIR_$(CLASS)) ROOT_CRYPTO_DIR = $(ROOT_CRYPTO_DIR_$(CLASS)) ROOT_MAC_DIR = $(ROOT_MAC_DIR_$(CLASS)) +ROOT_OVERLAY_DIR = $(ROOT_OVERLAY_DIR_$(CLASS)) ROOT_KICONV_DIR = $(ROOT_KICONV_DIR_$(CLASS)) ROOT_FIRMWARE_DIR = $(ROOT_MOD_DIR)/firmware @@ -485,6 +490,7 @@ ROOT_MOD_DIRS_32 += $(ROOT_EMLXS_FW_DIR_32) ROOT_MOD_DIRS_32 += $(ROOT_CPU_DIR_32) $(ROOT_FONT_DIR_32) ROOT_MOD_DIRS_32 += $(ROOT_TOD_DIR_32) $(ROOT_DACF_DIR_32) ROOT_MOD_DIRS_32 += $(ROOT_CRYPTO_DIR_32) $(ROOT_MAC_DIR_32) +ROOT_MOD_DIRS_32 += $(ROOT_OVERLAY_DIR_32) ROOT_MOD_DIRS_32 += $(ROOT_KICONV_DIR_32) ROOT_MOD_DIRS_32 += $(ROOT_FIRMWARE_DIR) @@ -578,7 +584,7 @@ PARALLEL_KMODS = $(DRV_KMODS) $(EXEC_KMODS) $(FS_KMODS) $(SCHED_KMODS) \ $(MMU_KMODS) $(DACF_KMODS) $(EXPORT_KMODS) $(IPP_KMODS) \ $(CRYPTO_KMODS) $(PCBE_KMODS) \ $(DRV_KMODS_$(CLASS)) $(MISC_KMODS_$(CLASS)) $(MAC_KMODS) \ - $(BRAND_KMODS) $(KICONV_KMODS) \ + $(BRAND_KMODS) $(KICONV_KMODS) $(OVERLAY_KMODS) \ $(SOCKET_KMODS) KMODS = $(GENUNIX_KMODS) $(PARALLEL_KMODS) @@ -632,3 +638,11 @@ PRIVS_DEF = $(SRC)/uts/common/os/priv_defs # USBDEVS_AWK = $(SRC)/uts/common/io/usb/usbdevs2h.awk USBDEVS_DATA = $(SRC)/uts/common/io/usb/usbdevs + + +# +# If we're using the newer CTF tools, then we need to make sure that we +# are building with the private -X option to ctfconvert which allows us +# to fixup the struct cpu to account for machcpu. +# +$(ENABLE_NEW_CTF)$(__GNUC)CTFCVTFLAGS += -X |