solenv/bin/concat-deps.c                |    5 ++
 solenv/gbuild/Library.mk                |    1 
 solenv/gbuild/LinkTarget.mk             |   63 ++++++++++++++++++++++++++++++--
 solenv/gbuild/TargetLocations.mk        |    3 +
 solenv/gbuild/platform/android.mk       |    1 
 solenv/gbuild/platform/com_MSC_class.mk |    1 
 solenv/gbuild/platform/iOS.mk           |    2 +
 solenv/gbuild/platform/macosx.mk        |    2 +
 solenv/gbuild/platform/solaris.mk       |    2 +
 solenv/gbuild/platform/unxgcc.mk        |    3 +
 10 files changed, 81 insertions(+), 2 deletions(-)

New commits:
commit dfec385f3c80848abd5ead6f1ae682fcefc06b16
Author:     Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Tue May 7 18:59:42 2024 +0200
Commit:     Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Tue May 7 21:18:35 2024 +0200

    Add gb_Library_add_generated_asmobjects
    
    ...to be used by a follow up commit in EMSCRIPTEN's 
bridges/Library_cpp_uno.mk
    
    Change-Id: Iaebc18d40241d9b7918061100b25cca8a8bc4e0e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167291
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>

diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 996f874bf606..844b8bbd383f 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -1091,6 +1091,11 @@ static int process(struct hash* dep_hash, char* fn)
                     created_line = generate_phony_line(src_relative, "o");
                     rc = generate_phony_file(fn, created_line);
                 }
+                else if(strncmp(src_relative, "GenAsmObject/", 14) == 0)
+                {
+                    created_line = generate_phony_line(src_relative, "o");
+                    rc = generate_phony_file(fn, created_line);
+                }
                 else if(strncmp(src_relative, "GenNasmObject/", 14) == 0)
                 {
                     created_line = generate_phony_line(src_relative, "o");
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index d82a261e002b..e58dc3974466 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -237,6 +237,7 @@ gb_Library_add_asmobject = $(call 
gb_Library__forward_to_Linktarget,$(0),$(1),$(
 gb_Library_add_asmobjects = $(call 
gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_Library_add_exception_objects = $(call 
gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_Library_add_x64_generated_exception_objects = $(call 
gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$(3))
+gb_Library_add_generated_asmobjects = $(call 
gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_Library_add_generated_cobjects = $(call 
gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_Library_add_generated_exception_objects = $(call 
gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_Library_add_generated_objcobjects = $(call 
gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$(3))
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 3004fbbf24de..a4e44d52d6e9 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -170,9 +170,9 @@ endef
 # Overview of dependencies and tasks of LinkTarget
 #
 # target                      task                         depends on
-# LinkTarget                  linking                      AsmObject CObject 
CxxObject GenCObject GenCxxObject ObjCObject ObjCxxObject GenObjCObject 
GenObjCxxObject GenNasmObject CxxClrObject
+# LinkTarget                  linking                      AsmObject CObject 
CxxObject GenCObject GenCxxObject ObjCObject ObjCxxObject GenObjCObject 
GenObjCxxObject GenAsmObject GenNasmObject CxxClrObject
 #                                                          LinkTarget/headers
-# LinkTarget/dep              joined dep file              AsmObject/dep 
CObject/dep CxxObject/dep GenCObject/dep GenCxxObject/dep ObjCObject/dep 
ObjCxxObject/dep GenObjCObject/dep GenObjCxxObject/dep GenNasmObject/dep 
CxxClrObject/dep GenCxxClrObject/dep
+# LinkTarget/dep              joined dep file              AsmObject/dep 
CObject/dep CxxObject/dep GenCObject/dep GenCxxObject/dep ObjCObject/dep 
ObjCxxObject/dep GenObjCObject/dep GenObjCxxObject/dep GenAsmObject/dep 
GenNasmObject/dep CxxClrObject/dep GenCxxClrObject/dep
 #                                                          | LinkTarget/headers
 # LinkTarget/headers          all headers available
 #                             including own generated
@@ -189,6 +189,8 @@ endef
 #                              generated source
 # GenObjCxxObject             objective c++ compile from   | LinkTarget/headers
 #                              generated source
+# GenAsmObject                asm compile from             | LinkTarget/headers
+#                              generated source
 # GenNasmObject               nasm compile from            | LinkTarget/headers
 #                              generated source
 # CxxClrObject                C++ CLR compile              | LinkTarget/headers
@@ -205,6 +207,7 @@ endef
 # ObjCxxObject/dep            dependencies
 # GenObjCObject/dep           dependencies
 # GenObjCxxObject/dep         dependencies
+# GenAsmObject/dep            dependencies
 # GenNasmObject/dep           dependencies
 # CxxClrObject/dep            dependencies
 # GenCxxClrObject/dep         dependencies
@@ -637,6 +640,25 @@ $(call gb_GenObjCxxObject_get_dep_target,%) :
 
 endif
 
+# GenAsmObject class
+
+gb_GenAsmObject_get_source = $(call gb_AsmObject_get_source,$(WORKDIR),$(1))
+
+$(call gb_GenAsmObject_get_target,%) :
+       $(call gb_AsmObject__command,$@,$*,$<,$(call 
gb_GenAsmObject_get_dep_target,$*))
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(dir $(call gb_GenAsmObject_get_dep_target,%)).dir :
+       $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(dir $(call gb_GenAsmObject_get_dep_target,%))%/.dir :
+       $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(call gb_GenAsmObject_get_dep_target,%) :
+       $(if $(wildcard $@),touch $@)
+
+endif
+
 # GenNasmObject class
 
 gb_GenNasmObject_get_source = $(WORKDIR)/$(1)
@@ -753,6 +775,9 @@ $(WORKDIR)/Clean/LinkTarget/% :
                $(foreach object,$(GENOBJCXXOBJECTS),$(call 
gb_GenObjCxxObject_get_target,$(object))) \
                $(foreach object,$(GENOBJCXXOBJECTS),$(call 
gb_GenObjCxxObject_get_dep_target,$(object))) \
                $(foreach object,$(GENOBJCXXOBJECTS),$(call 
gb_GenObjCxxObject_get_dwo_target,$(object))) \
+               $(foreach object,$(GENASMOBJECTS),$(call 
gb_GenAsmObject_get_target,$(object))) \
+               $(foreach object,$(GENASMOBJECTS),$(call 
gb_GenAsmObject_get_dep_target,$(object))) \
+               $(foreach object,$(GENASMOBJECTS),$(call 
gb_GenAsmObject_get_dwo_target,$(object))) \
                $(foreach object,$(GENNASMOBJECTS),$(call 
gb_GenNasmObject_get_target,$(object))) \
                $(foreach object,$(GENNASMOBJECTS),$(call 
gb_GenNasmObject_get_dep_target,$(object))) \
                $(foreach object,$(GENNASMOBJECTS),$(call 
gb_GenNasmObject_get_dwo_target,$(object))) \
@@ -794,6 +819,7 @@ $(call gb_Helper_abbreviate_dirs,\
                $(foreach object,$(GENCXXOBJECTS),$(call 
gb_GenCxxObject_get_dep_target,$(object))) \
                $(foreach object,$(GENOBJCOBJECTS),$(call 
gb_GenObjCObject_get_dep_target,$(object))) \
                $(foreach object,$(GENOBJCXXOBJECTS),$(call 
gb_GenObjCxxObject_get_dep_target,$(object))) \
+               $(foreach object,$(GENASMOBJECTS),$(call 
gb_GenAsmObject_get_dep_target,$(object))) \
                $(foreach object,$(GENNASMOBJECTS),$(call 
gb_GenNasmObject_get_dep_target,$(object))) \
                $(foreach object,$(GENCXXCLROBJECTS),$(call 
gb_GenCxxClrObject_get_dep_target,$(object))) \
                ) && \
@@ -816,6 +842,7 @@ $(file >$(1),\
        $(foreach object,$(GENCXXOBJECTS),$(call 
gb_GenCxxObject_get_target,$(object))) \
        $(foreach object,$(GENOBJCOBJECTS),$(call 
gb_GenObjCObject_get_target,$(object))) \
        $(foreach object,$(GENOBJCXXOBJECTS),$(call 
gb_GenObjCxxObject_get_target,$(object))) \
+       $(foreach object,$(GENASMOBJECTS),$(call 
gb_GenAsmObject_get_target,$(object))) \
        $(foreach object,$(GENNASMOBJECTS),$(call 
gb_GenNasmObject_get_target,$(object))) \
        $(foreach object,$(GENCXXCLROBJECTS),$(call 
gb_GenCxxClrObject_get_target,$(object))) \
        $(PCHOBJS) \
@@ -1004,6 +1031,8 @@ $(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS :=
 $(call gb_LinkTarget_get_clean_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : GENOBJCOBJECTS :=
 $(call gb_LinkTarget_get_clean_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : GENASMOBJECTS :=
+$(call gb_LinkTarget_get_clean_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : GENNASMOBJECTS :=
 $(call gb_LinkTarget_get_clean_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : GENOBJCXXOBJECTS :=
@@ -1076,6 +1105,7 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : GENCOBJECTS :=
 $(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS :=
 $(call gb_LinkTarget_get_dep_target,$(1)) : GENOBJCOBJECTS :=
 $(call gb_LinkTarget_get_dep_target,$(1)) : GENOBJCXXOBJECTS :=
+$(call gb_LinkTarget_get_dep_target,$(1)) : GENASMOBJECTS :=
 $(call gb_LinkTarget_get_dep_target,$(1)) : GENNASMOBJECTS :=
 $(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXCLROBJECTS :=
 $(call gb_LinkTarget_get_dep_target,$(1)) : YACCOBJECTS :=
@@ -1662,6 +1692,30 @@ endif
 
 endef
 
+# call 
gb_LinkTarget_add_generated_asm_object,linktarget,sourcefile,asmflags,linktargetmakefilename
+define gb_LinkTarget_add_generated_asm_object
+$(call gb_LinkTarget_get_target,$(1)) : GENASMOBJECTS += $(2)
+$(call gb_LinkTarget_get_clean_target,$(1)) : GENASMOBJECTS += $(2)
+
+$(call gb_LinkTarget_get_target,$(1)) : $(call gb_GenAsmObject_get_target,$(2))
+$(call gb_GenAsmObject_get_target,$(2)) : $(call 
gb_GenAsmObject_get_source,$(2))
+# Often gb_GenAsmObject_get_source does not have its own rule and is only a 
byproduct.
+# That's why we need this order-only dependency on gb_Helper_MISCDUMMY
+$(call gb_GenAsmObject_get_source,$(2)) : | $(gb_Helper_MISCDUMMY)
+$(call gb_GenAsmObject_get_target,$(2)) : | $(call 
gb_LinkTarget_get_headers_target,$(1))
+$(call gb_GenAsmObject_get_target,$(2)) : T_ASMFLAGS += $(call 
gb_LinkTarget__get_asmflags,$(4)) $(3)
+$(call gb_GenAsmObject_get_target,$(2)) : \
+       OBJECTOWNER := $(call gb_Object__owner,$(2),$(1))
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : GENASMOBJECTS += $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : $(call 
gb_GenAsmObject_get_dep_target,$(2))
+$(call gb_GenAsmObject_get_dep_target,$(2)) :| $(dir $(call 
gb_GenAsmObject_get_dep_target,$(2))).dir
+$(call gb_GenAsmObject_get_target,$(2)) :| $(dir $(call 
gb_GenAsmObject_get_dep_target,$(2))).dir
+endif
+
+endef
+
 # call 
gb_LinkTarget_add_generated_nasm_object,linktarget,sourcefile,nasmflags,linktargetmakefilename
 define gb_LinkTarget_add_generated_nasm_object
 $(call gb_LinkTarget_get_target,$(1)) : GENNASMOBJECTS += $(2)
@@ -1872,6 +1926,11 @@ define gb_LinkTarget_add_generated_objcxxobjects
 $(foreach obj,$(2),$(call 
gb_LinkTarget_add_generated_objcxx_object,$(1),$(obj),$(3),$(4)))
 endef
 
+# call 
gb_LinkTarget_add_generated_asmobjects,linktarget,sourcefiles,asmflags,linktargetmakefilename
+define gb_LinkTarget_add_generated_asmobjects
+$(foreach obj,$(2),$(call 
gb_LinkTarget_add_generated_asm_object,$(1),$(obj),$(3),$(4)))
+endef
+
 # call 
gb_LinkTarget_add_generated_nasmobjects,linktarget,sourcefiles,cflags,linktargetmakefilename
 define gb_LinkTarget_add_generated_nasmobjects
 $(foreach obj,$(2),$(call 
gb_LinkTarget_add_generated_nasm_object,$(1),$(obj),$(3),$(4)))
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index b8e2321c85ae..f0f088315851 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -64,6 +64,8 @@ gb_CxxObject_get_target = $(WORKDIR)/CxxObject/$(1).o
 gb_CxxObject_get_dwo_target = $(WORKDIR)/CxxObject/$(1).dwo
 gb_GenCxxObject_get_target = $(WORKDIR)/GenCxxObject/$(1).o
 gb_GenCxxObject_get_dwo_target = $(WORKDIR)/GenCxxObject/$(1).dwo
+gb_GenAsmObject_get_target = $(WORKDIR)/GenAsmObject/$(1).o
+gb_GenAsmObject_get_dwo_target = $(WORKDIR)/GenAsmObject/$(1).dwo
 gb_GenNasmObject_get_target = $(WORKDIR)/GenNasmObject/$(1).o
 gb_GenNasmObject_get_dwo_target = $(WORKDIR)/GenNasmObject/$(1).dwo
 gb_Executable_get_headers_target = $(WORKDIR)/Headers/Executable/$(1)
@@ -348,6 +350,7 @@ $(eval $(call gb_Helper_make_dep_targets,\
        GenCxxObject \
        GenObjCObject \
        GenObjCxxObject \
+       GenAsmObject \
        GenNasmObject \
        GenCxxClrObject \
        SdiTarget \
diff --git a/solenv/gbuild/platform/android.mk 
b/solenv/gbuild/platform/android.mk
index fde207eccf4d..baa88b766cfc 100644
--- a/solenv/gbuild/platform/android.mk
+++ b/solenv/gbuild/platform/android.mk
@@ -38,6 +38,7 @@ $(call gb_Helper_abbreviate_dirs,\
                $(foreach object,$(ASMOBJECTS),$(call 
gb_AsmObject_get_target,$(object))) \
                $(foreach object,$(GENCOBJECTS),$(call 
gb_GenCObject_get_target,$(object))) \
                $(foreach object,$(GENCXXOBJECTS),$(call 
gb_GenCxxObject_get_target,$(object))) \
+               $(foreach object,$(GENASMOBJECTS),$(call 
gb_GenAsmObject_get_target,$(object))) \
                $(foreach object,$(GENNASMOBJECTS),$(call 
gb_GenNasmObject_get_target,$(object))) \
                $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat 
$(extraobjectlist)`) \
                -Wl$(COMMA)--start-group $(foreach 
lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) 
-Wl$(COMMA)--end-group \
diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 5424da11d75c..94269f09de7a 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -258,6 +258,7 @@ $(call gb_Helper_abbreviate_dirs,\
                $(foreach object,$(CXXCLROBJECTS),$(call 
gb_CxxClrObject_get_target,$(object))) \
                $(foreach object,$(GENCXXCLROBJECTS),$(call 
gb_GenCxxClrObject_get_target,$(object))) \
                $(foreach object,$(ASMOBJECTS),$(call 
gb_AsmObject_get_target,$(object))) \
+               $(foreach object,$(GENASMOBJECTS),$(call 
gb_GenAsmObject_get_target,$(object))) \
                $(foreach object,$(GENNASMOBJECTS),$(call 
gb_GenNasmObject_get_target,$(object))) \
                $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),$(shell cat 
$(extraobjectlist))) \
                $(PCHOBJS) $(NATIVERES)) && \
diff --git a/solenv/gbuild/platform/iOS.mk b/solenv/gbuild/platform/iOS.mk
index 8a392c8505fe..9c5d20103d3c 100644
--- a/solenv/gbuild/platform/iOS.mk
+++ b/solenv/gbuild/platform/iOS.mk
@@ -97,6 +97,7 @@ define gb_LinkTarget__command_dynamiclink
                $(foreach object,$(OBJCXXOBJECTS),$(call 
gb_ObjCxxObject_get_target,$(object))) \
                $(foreach object,$(GENCOBJECTS),$(call 
gb_GenCObject_get_target,$(object))) \
                $(foreach object,$(GENCXXOBJECTS),$(call 
gb_GenCxxObject_get_target,$(object))) \
+               $(foreach object,$(GENASMOBJECTS),$(call 
gb_GenAsmObject_get_target,$(object))) \
                $(foreach object,$(GENNASMOBJECTS),$(call 
gb_GenNasmObject_get_target,$(object))) \
                $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat 
$(extraobjectlist)`) \
                $(foreach lib,$(LINKED_STATIC_LIBS),$(call 
gb_StaticLibrary_get_target,$(lib))) \
@@ -118,6 +119,7 @@ $(call gb_Helper_abbreviate_dirs,\
                $(foreach object,$(ASMOBJECTS),$(call 
gb_AsmObject_get_target,$(object))) \
                $(foreach object,$(GENCOBJECTS),$(call 
gb_GenCObject_get_target,$(object))) \
                $(foreach object,$(GENCXXOBJECTS),$(call 
gb_GenCxxObject_get_target,$(object))) \
+               $(foreach object,$(GENASMOBJECTS),$(call 
gb_GenAsmObject_get_target,$(object))) \
                $(foreach object,$(GENNASMOBJECTS),$(call 
gb_GenNasmObject_get_target,$(object))) \
                $(foreach 
extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
                $(if $(findstring s,$(MAKEFLAGS)),2> /dev/null))
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 83f9695c624c..90bd987f9e4e 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -107,6 +107,7 @@ $(call gb_Helper_abbreviate_dirs,\
                $(foreach object,$(OBJCXXOBJECTS),$(call 
gb_ObjCxxObject_get_target,$(object))) \
                $(foreach object,$(GENCOBJECTS),$(call 
gb_GenCObject_get_target,$(object))) \
                $(foreach object,$(GENCXXOBJECTS),$(call 
gb_GenCxxObject_get_target,$(object))) \
+               $(foreach object,$(GENASMOBJECTS),$(call 
gb_GenAsmObject_get_target,$(object))) \
                $(foreach object,$(GENNASMOBJECTS),$(call 
gb_GenNasmObject_get_target,$(object))) \
                $(foreach object,$(GENOBJCOBJECTS),$(call 
gb_GenObjCObject_get_target,$(object))) \
                $(foreach object,$(GENOBJCXXOBJECTS),$(call 
gb_GenObjCxxObject_get_target,$(object))) \
@@ -152,6 +153,7 @@ $(call gb_Helper_abbreviate_dirs,\
                $(foreach object,$(OBJCXXOBJECTS),$(call 
gb_ObjCxxObject_get_target,$(object))) \
                $(foreach object,$(GENCOBJECTS),$(call 
gb_GenCObject_get_target,$(object))) \
                $(foreach object,$(GENCXXOBJECTS),$(call 
gb_GenCxxObject_get_target,$(object))) \
+               $(foreach object,$(GENASMOBJECTS),$(call 
gb_GenAsmObject_get_target,$(object))) \
                $(foreach object,$(GENNASMOBJECTS),$(call 
gb_GenNasmObject_get_target,$(object))) \
                $(foreach object,$(GENOBJCOBJECTS),$(call 
gb_GenObjCObject_get_target,$(object))) \
                $(foreach object,$(GENOBJCXXOBJECTS),$(call 
gb_GenObjCxxObject_get_target,$(object))) \
diff --git a/solenv/gbuild/platform/solaris.mk 
b/solenv/gbuild/platform/solaris.mk
index c3e7af09f054..3d3d58e2b55f 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -114,6 +114,7 @@ $(call gb_Helper_abbreviate_dirs,\
                $(foreach object,$(ASMOBJECTS),$(call 
gb_AsmObject_get_target,$(object))) \
                $(foreach object,$(GENCOBJECTS),$(call 
gb_GenCObject_get_target,$(object))) \
                $(foreach object,$(GENCXXOBJECTS),$(call 
gb_GenCxxObject_get_target,$(object))) \
+               $(foreach object,$(GENASMOBJECTS),$(call 
gb_GenAsmObject_get_target,$(object))) \
                $(foreach object,$(GENNASMOBJECTS),$(call 
gb_GenNasmObject_get_target,$(object))) \
                $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat 
$(extraobjectlist)`) \
                -Wl$(COMMA)--start-group \
@@ -143,6 +144,7 @@ $(call gb_Helper_abbreviate_dirs,\
                $(foreach object,$(ASMOBJECTS),$(call 
gb_AsmObject_get_target,$(object))) \
                $(foreach object,$(GENCOBJECTS),$(call 
gb_GenCObject_get_target,$(object))) \
                $(foreach object,$(GENCXXOBJECTS),$(call 
gb_GenCxxObject_get_target,$(object))) \
+               $(foreach object,$(GENASMOBJECTS),$(call 
gb_GenAsmObject_get_target,$(object))) \
                $(foreach object,$(GENNASMOBJECTS),$(call 
gb_GenNasmObject_get_target,$(object))) \
                $(foreach 
extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
                $(if $(findstring s,$(MAKEFLAGS)),2> /dev/null))
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 3b4f761adc77..440f5c71f1d1 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -148,6 +148,7 @@ $(call gb_Helper_abbreviate_dirs,\
                $(foreach object,$(ASMOBJECTS),$(call 
gb_AsmObject_get_target,$(object))) \
                $(foreach object,$(GENCOBJECTS),$(call 
gb_GenCObject_get_target,$(object))) \
                $(foreach object,$(GENCXXOBJECTS),$(call 
gb_GenCxxObject_get_target,$(object))) \
+               $(foreach object,$(GENASMOBJECTS),$(call 
gb_GenAsmObject_get_target,$(object))) \
                $(foreach object,$(GENNASMOBJECTS),$(call 
gb_GenNasmObject_get_target,$(object))) \
                $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat 
$(extraobjectlist)`) \
                $(if $(filter TRUE,$(DISABLE_DYNLOADING)), \
@@ -201,6 +202,7 @@ $(call gb_Helper_abbreviate_dirs,\
                        $(foreach object,$(ASMOBJECTS),$(call 
gb_AsmObject_get_target,$(object))) \
                        $(foreach object,$(GENCOBJECTS),$(call 
gb_GenCObject_get_target,$(object))) \
                        $(foreach object,$(GENCXXOBJECTS),$(call 
gb_GenCxxObject_get_target,$(object))) \
+                       $(foreach object,$(GENASMOBJECTS),$(call 
gb_GenAsmObject_get_target,$(object))) \
                        $(foreach object,$(GENNASMOBJECTS),$(call 
gb_GenNasmObject_get_target,$(object))) \
                        $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),$(shell 
cat $(extraobjectlist)))) && ) \
        $(gb_AR) $(gb_LTOPLUGINFLAGS) -rsu $(1) \
@@ -211,6 +213,7 @@ $(call gb_Helper_abbreviate_dirs,\
                $(foreach object,$(ASMOBJECTS),$(call 
gb_AsmObject_get_target,$(object))) \
                $(foreach object,$(GENCOBJECTS),$(call 
gb_GenCObject_get_target,$(object))) \
                $(foreach object,$(GENCXXOBJECTS),$(call 
gb_GenCxxObject_get_target,$(object))) \
+               $(foreach object,$(GENASMOBJECTS),$(call 
gb_GenAsmObject_get_target,$(object))) \
                $(foreach object,$(GENNASMOBJECTS),$(call 
gb_GenNasmObject_get_target,$(object))) \
                $(foreach 
extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
                $(if $(findstring s,$(MAKEFLAGS)),2> /dev/null)))

Reply via email to