diff options
| author | Michael Stahl <mst@openoffice.org> | 2009-10-30 19:10:16 +0100 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2009-10-30 19:10:16 +0100 |
| commit | 27d87c9b00edcee2d64df592daf008bff20a41e7 (patch) | |
| tree | 99f2a62a8700ea80e18eba51ae95c1b27e998c27 /sal/util | |
| parent | Create DEV300_m63 milestone tag from trunk@277194 (diff) | |
| download | core-27d87c9b00edcee2d64df592daf008bff20a41e7.tar.gz core-27d87c9b00edcee2d64df592daf008bff20a41e7.zip | |
#i105898#: make LD_PRELOAD of libsalalloc_malloc.so work again
Diffstat (limited to 'sal/util')
| -rw-r--r-- | sal/util/makefile.mk | 6 | ||||
| -rw-r--r-- | sal/util/salalloc.list | 7 |
2 files changed, 13 insertions, 0 deletions
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; +}; |