diff options
author | sb <sb@openoffice.org> | 2010-01-21 12:06:31 +0100 |
---|---|---|
committer | sb <sb@openoffice.org> | 2010-01-21 12:06:31 +0100 |
commit | 368990f054d6caf666374d23e230a2b5dc2e87b7 (patch) | |
tree | d5979e4872a45c1c43eda6df98116875dd30f88c /sal/util | |
parent | sb118: adpated some stoc unit test to new CppUnit framework (diff) | |
parent | CWS-TOOLING: integrate CWS menuincustomtoolbar (diff) | |
download | core-368990f054d6caf666374d23e230a2b5dc2e87b7.tar.gz core-368990f054d6caf666374d23e230a2b5dc2e87b7.zip |
sb118: merged in DEV300_m70
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 795764b75b29..9cd1b0f9671a 100644 --- a/sal/util/makefile.mk +++ b/sal/util/makefile.mk @@ -160,6 +160,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; +}; |