Changeset 47045 in vbox

Timestamp:

Jul 8, 2013 4:30:54 PM (12 years ago)

Author:

vboxsync

Message:

Config.kmk: GCCConfig.kmk -> DynamicConfig.kmk, adding a yasm warning detection to it.

File:

• trunk/Config.kmk (modified) (4 diffs)

trunk/Config.kmk

@@ -1290 +1290 @@
  VBOX_LDR_FMT_2_YASM_DBGINFO.macho =
  VBOX_LDR_FMT_2_YASM_DBGINFO.pe    = -g cv8
- VBOX_ASFLAGS   = $(VBOX_ASFLAGS_FMT)   -D__YASM__ -Worphan-labels $(VBOX_LDR_FMT_2_YASM_DBGINFO.$(VBOX_LDR_FMT))
- VBOX_ASFLAGS32 = $(VBOX_ASFLAGS_FMT32) -D__YASM__ -Worphan-labels $(VBOX_LDR_FMT_2_YASM_DBGINFO.$(VBOX_LDR_FMT32))
- VBOX_ASFLAGS64 = $(VBOX_ASFLAGS_FMT64) -D__YASM__ -Worphan-labels $(VBOX_LDR_FMT_2_YASM_DBGINFO.$(VBOX_LDR_FMT64))
+ VBOX_ASFLAGS   = $(VBOX_ASFLAGS_FMT)   -D__YASM__ -Worphan-labels $(VBOX_YASM_Wno-segreg-in-64bit) $(VBOX_LDR_FMT_2_YASM_DBGINFO.$(VBOX_LDR_FMT))
+ VBOX_ASFLAGS32 = $(VBOX_ASFLAGS_FMT32) -D__YASM__ -Worphan-labels $(VBOX_YASM_Wno-segreg-in-64bit) $(VBOX_LDR_FMT_2_YASM_DBGINFO.$(VBOX_LDR_FMT32))
+ VBOX_ASFLAGS64 = $(VBOX_ASFLAGS_FMT64) -D__YASM__ -Worphan-labels $(VBOX_YASM_Wno-segreg-in-64bit) $(VBOX_LDR_FMT_2_YASM_DBGINFO.$(VBOX_LDR_FMT64))
 else
  VBOX_ASTOOL    = NASM
@@ -2178 +2178 @@
 
 
-ifndef VBOX_NOINC_GCC_CONFIG_KMK
-#
-# GCC stuff properties.
+ifndef VBOX_NOINC_DYNAMIC_CONFIG_KMK
+#
+# GCC and YASM dynamic properties.
 # Most of this is resolved on first kmk invocation and cached in PATH_OUT.
 #
@@ -2232 +2232 @@
 endif
 
+# YASM macros
+ifndef DONT_USE_YASM
+ include $(KBUILD_PATH)/tools/YASM.kmk
+ VBOX_YASM_CHECK = $(shell $(TOOL_YASM_AS) -e -o vbox-yasm-check.o $1 - < /dev/null 2>&1)
+ VBOX_YASM_CHECK = $(if-expr "$(shell $(TOOL_YASM_AS) -e -o vbox-yasm-check.o $1 - < /dev/null 2>&1)" == "",$(1),)
+else
+ VBOX_YASM_CHECK = $(error what??)
+endif
+
 # No $(QUIET) here as it's interesting to see what goes into the file.
-$(PATH_OUT)/GCCConfig.kmk: \
+$(PATH_OUT)/DynamicConfig.kmk: \
                 $(PATH_ROOT)/Config.kmk \
                 $(LOCALCFG) \
@@ -2329 +2338 @@
         $(QUIET)$(APPEND) '$@' 'VBOX_LD_no_compact_linkedit    ?= $(call VBOX_GCC_CHECK_LD,-no_compact_linkedit,)'
 endif
+# YASM
+        $(QUIET)$(APPEND) '$@' 'VBOX_YASM_Wno-segreg-in-64bit  ?= $(call VBOX_YASM_CHECK,-Wno-segreg-in-64bit,)'
+
         $(QUIET)$(ECHO) '========= START OF $@ ========='
         $(QUIET)$(CAT) $@
         $(QUIET)$(ECHO) '=========== END OF $@ ========='
 
-include $(PATH_OUT)/GCCConfig.kmk
-endif # !VBOX_NOINC_GCC_CONFIG_KMK
+include $(PATH_OUT)/DynamicConfig.kmk
+endif # !VBOX_NOINC_DYNAMIC_CONFIG_KMK
 
 #