From 70a6b9ffbd676a1384433a86205d2cd4f2d4f4b1 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 22 Nov 2011 09:34:46 +0100
Subject: New sal/log.h obsoletes osl/diagnose.h and tools/debug.hxx.

* New SAL_INFO..., SAL_WARN... macros.
* New SAL_STREAM supersedes OSL_FORMAT.
* oustringostreaminserter.hxx moved from unotest to rtl (and always UTF-8 now).
* TODO to enable GCC __attribute__((format)) in sal/log.h (requires call-site
  cleanup).
* Further functionality in tools/debug.hxx (DBG_MEMTEST, DBG_CTOR, etc.) not yet
  addressed.
* Some replacements tools String -> rtl::OUString.
---
 solenv/bin/addsym.awk   | 7 ++++++-
 solenv/gbuild/gbuild.mk | 8 +++++++-
 solenv/inc/settings.mk  | 3 +++
 3 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'solenv')

diff --git a/solenv/bin/addsym.awk b/solenv/bin/addsym.awk
index de0b57934f7f..4c18bdc53847 100644
--- a/solenv/bin/addsym.awk
+++ b/solenv/bin/addsym.awk
@@ -36,9 +36,14 @@ END {
         print "# Weak RTTI symbols for C++ exceptions:"
         print "UDK_3_0_0 {"
         print "global:"
-        print "_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
+        print "_ZTI*; _ZTS*;"
         print "};"
     }
+    print "# Unique libstdc++ symbols:"
+    print "GLIBCXX_3.4 {"
+    print "global:"
+    print "_ZGVNSt7num_put*; _ZNSt7num_put*;"
+    print "};"
 }
 state == 2 {
     print "_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 4634333cd49f..361632ea1f6c 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -212,11 +212,17 @@ gb_GLOBALDEFS += \
 	-DOPTIMIZE \
 	-DNDEBUG \
 
-else ifneq ($(gb_DEBUGLEVEL),1) # 2 or more
+else
+gb_GLOBALDEFS += \
+    -DSAL_LOG_INFO \
+    -DSAL_LOG_WARN \
+
+ifneq ($(gb_DEBUGLEVEL),1) # 2 or more
 gb_GLOBALDEFS += \
 	-DDEBUG \
 
 endif
+endif
 
 ifneq ($(strip $(ENABLE_GTK)),)
 gb_GLOBALDEFS += -DENABLE_GTK
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 5c6f6cc488aa..5eb6dbf63e45 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1138,6 +1138,9 @@ RSCDEFS+= -DNDEBUG
 .IF "$(DBG_LEVEL)"!=""
 CDEFS+=-DOSL_DEBUG_LEVEL=$(DBG_LEVEL)
 RSCDEFS+=-DOSL_DEBUG_LEVEL=$(DBG_LEVEL)
+.IF "$(DBG_LEVEL)"!="0"
+CDEFS+=-DSAL_LOG_INFO -DSAL_LOG_WARN
+.ENDIF
 .ENDIF
 
 .IF "$(optimize)"!=""
-- 
cgit