From e6fe152f076ffe2a80f17dfb255ef3d83e737d49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Timm?= <rt@openoffice.org>
Date: Wed, 8 Mar 2006 07:50:54 +0000
Subject: [PATCH] INTEGRATION: CWS sixtyfour03 (1.3.32); FILE MERGED 2006/03/06
 11:18:56 kendy 1.3.32.2: #i62810# x86-64 bridge improvements: conform to
 x86-64 ABI 2006/03/06 11:13:50 kendy 1.3.32.1: #i62810# x86-64 bridge
 improvements: code snippet must be in a separate assembler function to have
 debug info (necessary for exceptions)

---
 .../cpp_uno/gcc3_linux_x86-64/makefile.mk       | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
index acfdd1989d77..0c534d5d50ee 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: rt $ $Date: 2005-09-07 22:26:46 $
+#   last change: $Author: rt $ $Date: 2006-03-08 08:50:54 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -62,9 +62,11 @@ NOOPTFILES= \
 CFLAGSNOOPT=-O0
 
 SLOFILES= \
+    $(SLO)$/abi.obj			\
     $(SLO)$/except.obj		\
     $(SLO)$/cpp2uno.obj		\
-    $(SLO)$/uno2cpp.obj
+    $(SLO)$/uno2cpp.obj		\
+    $(SLO)$/call.obj
 
 SHL1TARGET= $(TARGET)
 
@@ -72,10 +74,8 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 SHL1IMPLIB=i$(TARGET)
 SHL1VERSIONMAP=..$/..$/bridge_exports.map
 
-SHL1OBJS= \
-    $(SLO)$/except.obj		\
-    $(SLO)$/cpp2uno.obj		\
-    $(SLO)$/uno2cpp.obj
+SHL1OBJS = $(SLOFILES)
+SHL1LIBS = $(SLB)$/cpp_uno_shared.lib
 
 SHL1STDLIBS= \
     $(CPPULIB)			\
@@ -87,3 +87,6 @@ SHL1STDLIBS= \
 
 .INCLUDE :  target.mk
 
+$(SLO)$/%.obj: %.s
+    $(CC) -c -o $(SLO)$/$(@:b).o $<
+    touch $@