diff options
| author | Kurt Zenker <kz@openoffice.org> | 2010-01-15 15:13:13 +0100 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2010-01-15 15:13:13 +0100 |
| commit | 3bb3a6510bff4bf200416ae49d72665897630911 (patch) | |
| tree | db82d7d1b043569d151a161741d384688aca5393 | |
| parent | b302557d02c2b60a9f9aaa4efc94716c844b83b9 (diff) | |
| parent | 27d87c9b00edcee2d64df592daf008bff20a41e7 (diff) | |
CWS-TOOLING: integrate CWS fwk120
| -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 a43f09e2e0e0..3247be8774de 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; +}; |