diff options
Diffstat (limited to 'usr/src/uts/Makefile.uts')
| -rw-r--r-- | usr/src/uts/Makefile.uts | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/usr/src/uts/Makefile.uts b/usr/src/uts/Makefile.uts index 4cdfbdc486..c49058055a 100644 --- a/usr/src/uts/Makefile.uts +++ b/usr/src/uts/Makefile.uts @@ -242,6 +242,15 @@ include $(SRC)/Makefile.smatch SMOFF += sizeof # +# Add specific compiler options that are required based on the +# architecture in question. +# +CFLAGS_uts_i386 += -_gcc7=-mindirect-branch=thunk-extern +CFLAGS_uts_i386 += -_gcc7=-mindirect-branch-register +CFLAGS_uts_i386 += -_gcc8=-mindirect-branch=thunk-extern +CFLAGS_uts_i386 += -_gcc8=-mindirect-branch-register + +# # Ensure that the standard function prologue remains at the very start # of a function, so DTrace fbt will instrument the right place. # @@ -462,6 +471,7 @@ 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_CC_DIR_32 = $(ROOT_MOD_DIR)/cc +ROOT_OVERLAY_DIR_32 = $(ROOT_MOD_DIR)/overlay ROOT_KICONV_DIR_32 = $(ROOT_MOD_DIR)/kiconv ROOT_KERN_DIR_64 = $(ROOT_MOD_DIR)/$(SUBDIR64) @@ -490,6 +500,7 @@ 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_CC_DIR_64 = $(ROOT_MOD_DIR)/cc/$(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)) @@ -518,6 +529,7 @@ ROOT_DACF_DIR = $(ROOT_DACF_DIR_$(CLASS)) ROOT_CRYPTO_DIR = $(ROOT_CRYPTO_DIR_$(CLASS)) ROOT_MAC_DIR = $(ROOT_MAC_DIR_$(CLASS)) ROOT_CC_DIR = $(ROOT_CC_DIR_$(CLASS)) +ROOT_OVERLAY_DIR = $(ROOT_OVERLAY_DIR_$(CLASS)) ROOT_KICONV_DIR = $(ROOT_KICONV_DIR_$(CLASS)) ROOT_FIRMWARE_DIR = $(ROOT_MOD_DIR)/firmware @@ -537,6 +549,7 @@ 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_CC_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) @@ -630,7 +643,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) $(CC_KMODS) \ + $(BRAND_KMODS) $(KICONV_KMODS) $(OVERLAY_KMODS) $(CC_KMODS) \ $(SOCKET_KMODS) KMODS = $(GENUNIX_KMODS) $(PARALLEL_KMODS) |