gbuild: move gb_AsmObject__command to com_GCC_class

4 files changed, 18 insertions, 65 deletions

diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index ff1759d9c5b2..d9c085aef9e9 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -135,27 +135,6 @@ define gb_Helper_make_url
 file://$(strip $(1))
 endef
 
-# AsmObject class
-
-gb_AsmObject_get_source = $(1)/$(2).s
-
-# $(call gb_AsmObject__command,object,relative-source,source,dep-file)
-define gb_AsmObject__command
-$(call gb_Output_announce,$(2),$(true),ASM,3)
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) $(dir $(4)) && \
-	$(gb_CC) \
-		$(DEFS) \
-		$(T_CFLAGS) \
-		$(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \
-		-c $(3) \
-		-o $(1) \
-		-I$(dir $(3)) \
-		$(INCLUDE)) && \
-	echo "$(1) : $(3)" > $(4)
-endef
-
-
 # LinkTarget class
 
 gb_LinkTarget_CFLAGS := $(gb_CFLAGS)
diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk
index 989205a5f31b..9b302d31940a 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -20,6 +20,24 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
+# AsmObject class
+
+gb_AsmObject_get_source = $(1)/$(2).s
+
+# $(call gb_AsmObject__command,object,relative-source,source,dep-file)
+define gb_AsmObject__command
+$(call gb_Output_announce,$(2),$(true),ASM,3)
+$(call gb_Helper_abbreviate_dirs,\
+	$(gb_CC) \
+		$(DEFS) \
+		$(T_CFLAGS) \
+		$(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \
+		-c $(3) \
+		-o $(1) \
+		-I$(dir $(3)) \
+		$(INCLUDE)) && \
+	echo "$(1) : $(3)" > $(4)
+endef
 
 # CObject class
 
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 360fc6a02f1f..770c7d741f61 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -190,28 +190,6 @@ gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
 
 gb_COMPILERNOOPTFLAGS := -O0
 
-# AsmObject class
-
-gb_AsmObject_get_source = $(1)/$(2).s
-
-# $(call gb_AsmObject__command,object,relative-source,source,dep-file)
-define gb_AsmObject__command
-$(call gb_Output_announce,$(2),$(true),ASM,3)
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) $(dir $(4)) && \
-	$(gb_CC) \
-		$(DEFS) \
-		$(T_CFLAGS) \
-		$(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \
-		-c $(3) \
-		-o $(1) \
-		-MMD -MT $(1) \
-		-MP -MF $(4) \
-		-I$(dir $(3)) \
-		$(INCLUDE)) && \
-	echo "$(1) : $(3)" > $(4)
-endef
-
 # LinkTarget class
 
 define gb_LinkTarget__get_rpath_for_layer
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 5fb5f57adede..ada3ede49269 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -193,28 +193,6 @@ gb_DEBUG_CXXFLAGS := -fno-default-inline
 
 gb_COMPILERNOOPTFLAGS := -O0
 
-# AsmObject class
-
-gb_AsmObject_get_source = $(1)/$(2).s
-
-# $(call gb_AsmObject__command,object,relative-source,source,dep-file)
-define gb_AsmObject__command
-$(call gb_Output_announce,$(2),$(true),ASM,3)
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) $(dir $(4)) && \
-	echo "FIXME: Building assembler with gcc not yet implemented." && exit 1
-	#$(gb_CC) \
-	#	$(DEFS) \
-	#	$(T_CFLAGS) \
-	#	-c $(3) \
-	#	-o $(1) \
-	#	-MMD -MT $(1) \
-	#	-MP -MF $(4) \
-	#	-I$(dir $(3)) \
-	#	$(INCLUDE))
-endef
-
-
 # LinkTarget class
 
 define gb_LinkTarget__get_rpath_for_layer