From 27d87c9b00edcee2d64df592daf008bff20a41e7 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mst@openoffice.org>
Date: Fri, 30 Oct 2009 19:10:16 +0100
Subject: #i105898#: make LD_PRELOAD of libsalalloc_malloc.so work again

---
 sal/util/makefile.mk   | 6 ++++++
 sal/util/salalloc.list | 7 +++++++
 2 files changed, 13 insertions(+)
 create mode 100644 sal/util/salalloc.list

(limited to 'sal/util')

diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk
index bc8026aa860f..82a01f868cf3 100644
--- a/sal/util/makefile.mk
+++ b/sal/util/makefile.mk
@@ -163,6 +163,12 @@ SHL1STDLIBS+=-lcrypt
 .ENDIF
 .ENDIF
 
+# #i105898# required for LD_PRELOAD libsalalloc_malloc.so
+#           if sal is linked with -Bsymbolic-functions
+.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
+SHL1LINKFLAGS+=-Wl,--dynamic-list=salalloc.list
+.ENDIF # .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
+
 SHL1LIBS+=$(SLB)$/$(TARGET).lib
 
 .IF "$(linkinc)" != ""
diff --git a/sal/util/salalloc.list b/sal/util/salalloc.list
new file mode 100644
index 000000000000..303d225dda7f
--- /dev/null
+++ b/sal/util/salalloc.list
@@ -0,0 +1,7 @@
+{
+        rtl_allocateMemory;
+        rtl_reallocateMemory;
+        rtl_freeMemory;
+        rtl_allocateZeroMemory;
+        rtl_freeZeroMemory;
+};
-- 
cgit v1.2.3