[Libreoffice-commits] .: 3 commits - basic/Library_sb.mk basic/source solenv/gbuild

[Tor Lillqvist]

 basic/Library_sb.mk                |    2 +-
 basic/source/runtime/wnt-mingw.s   |    8 ++++----
 solenv/gbuild/platform/winmingw.mk |   22 ++++++++++++++++++++++
 3 files changed, 27 insertions(+), 5 deletions(-)

New commits:
commit 8f67e86edd04fb6786aa8a33e4895477dd9af2b3
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Aug 16 18:42:37 2011 +0300

    Add AsmObject stuff

diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 1d28767..cdc8444 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -361,6 +361,26 @@ $(call gb_NoexPrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$
 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) \
+		-c $(3) \
+		-o $(1) \
+		-I$(dir $(3)) \
+		$(INCLUDE)) && \
+	echo "$(1) : $(3)" > $(4)
+endef
+
+
 # LinkTarget class
 
 gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
@@ -389,6 +409,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
 		$(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \
 		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
+		$(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \
 		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
 		$(if $(LINKED_STATIC_LIBS),-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group) \
 		$(patsubst lib%.a,-l%,$(patsubst lib%.dll.a,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_implibname,$(lib))))) \
@@ -407,6 +428,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
 		$(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \
 		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
+		$(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \
 		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
 		$(if $(LINKED_STATIC_LIBS),-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group) \
 		$(patsubst lib%.a,-l%,$(patsubst lib%.dll.a,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_implibname,$(lib))))) \
commit 0236af5e658fe418965bf1ce78877b9b6372de7d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Aug 16 18:42:12 2011 +0300

    dllmgr-x86 expects stdcall-decorated names

diff --git a/basic/source/runtime/wnt-mingw.s b/basic/source/runtime/wnt-mingw.s
index 8c332c1..fcd9f1e 100755
--- a/basic/source/runtime/wnt-mingw.s
+++ b/basic/source/runtime/wnt-mingw.s
@@ -27,11 +27,11 @@
 
 .intel_syntax
 
-.globl _DllMgr_call32
-.globl _DllMgr_callFp
+.globl _DllMgr_call32 at 12
+.globl _DllMgr_callFp at 12
 
-_DllMgr_call32:
-_DllMgr_callFp:
+_DllMgr_call32 at 12:
+_DllMgr_callFp at 12:
     push ebp
     mov ebp, esp
     push esi
commit afce608d6e9272410abd182a3d8d994cd3a115ca
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Aug 16 18:40:26 2011 +0300

    wnt-mingw.s is an assembler source file

diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index ce6a72a..8b2e152 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -173,7 +173,7 @@ $(eval $(call gb_Library_add_asmobjects,sb,\
 ))
 endif
 ifeq ($(GUI)$(COM)$(CPU),WNTGCCI)
-$(eval $(call gb_Library_add_exception_objects,sb,\
+$(eval $(call gb_Library_add_asmobjects,sb,\
 	basic/source/runtime/wnt-mingw \
 ))
 endif