Add debug symbols to gbuild modules when any of --enable-debug,

--enable-symbols, or --enable-crashdump are passed to ./configure (just
like it already is for dmake modules), as opposed to the previous behaviour
of only doing it on --enable-debug.

Also implemented --enable-symbols=small for gbuild modules on platforms
where AOO is built with GCC and Clang compilers (MSVC on Windows doesn't
seem to support that).

Patch by: me


git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1780246 13f79535-47bb-0310-9956-ffa450edef68

main/solenv/gbuild/LinkTarget.mk

@@ -30,6 +30,20 @@
 
 # CFLAGS from environment override debug/optimization flags
 ifeq ($(gb_DEBUGLEVEL),2)
+gb_DEBUGGING := TRUE
+endif
+
+ifeq ($(ENABLE_SYMBOLS),SMALL)
+gb_DEBUGGING := TRUE
+else ifeq ($(ENABLE_SYMBOLS),TRUE)
+gb_DEBUGGING := TRUE
+endif
+
+ifeq ($(ENABLE_CRASHDUMP),TRUE)
+gb_DEBUGGING := TRUE
+endif
+
+ifeq ($(gb_DEBUGGING),TRUE)
 CFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS)
 CXXFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS)
 OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS)

main/solenv/gbuild/platform/freebsd.mk

@@ -234,9 +234,15 @@ ifeq ($(gb_DEBUGLEVEL),0)
 gb_LinkTarget_LDFLAGS += -Wl,-O1
 endif
 
-ifeq ($(gb_DEBUGLEVEL),2)
 ifeq ($(COM),CLANG)
+ifeq ($(ENABLE_SYMBOLS),SMALL)
+gb_DEBUG_CFLAGS := -ggdb1 -fno-inline
+else
 gb_DEBUG_CFLAGS := -ggdb3 -fno-inline
+endif
+else
+ifeq ($(ENABLE_SYMBOLS),SMALL)
+gb_DEBUG_CFLAGS := -ggdb1 -finline-limit=0 -fno-inline -fno-default-inline
 else
 gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
 endif

main/solenv/gbuild/platform/linux.mk

@@ -141,7 +141,11 @@ ifeq ($(gb_DEBUGLEVEL),0)
 gb_LinkTarget_LDFLAGS += -Wl,-O1
 endif
 
+ifeq ($(ENABLE_SYMBOLS),SMALL)
+gb_DEBUG_CFLAGS := -ggdb1 -finline-limit=0 -fno-inline -fno-default-inline
+else
 gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
+endif
 
 ifeq ($(gb_DEBUGLEVEL),2)
 gb_COMPILEROPTFLAGS := -O0

main/solenv/gbuild/platform/macosx.mk

@@ -137,7 +137,11 @@ gb_LinkTarget_LDFLAGS := \
 	$(subst -L../lib , ,$(SOLARLIB)) \
 #man ld says: obsolete	-Wl,-multiply_defined,suppress \
 
-gb_DEBUG_CFLAGS := -g
+ifeq ($(ENABLE_SYMBOLS),SMALL)
+gb_DEBUG_CFLAGS := -g1
+else
+gb_DEBUG_CFLAGS := -g3
+endif
 
 ifeq ($(gb_DEBUGLEVEL),2)
 gb_COMPILEROPTFLAGS := -O0

main/solenv/gbuild/platform/os2.mk

@@ -287,7 +287,11 @@ endef
 
 gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
 gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
-gb_DEBUG_CFLAGS := -g
+ifeq ($(ENABLE_SYMBOLS),SMALL)
+gb_DEBUG_CFLAGS := -g1
+else
+gb_DEBUG_CFLAGS := -g3
+endif
 
 gb_LinkTarget_INCLUDE :=\
 	$(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) \

main/solenv/gbuild/platform/winmingw.mk

@@ -163,7 +163,11 @@ ifeq ($(MINGW_GCCLIB_EH),YES)
 gb_LinkTarget_LDFLAGS += -shared-libgcc
 endif
 
+ifeq ($(ENABLE_SYMBOLS),SMALL)
+gb_DEBUG_CFLAGS := -ggdb1 -finline-limit=0 -fno-inline -fno-default-inline
+else
 gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
+endif
 
 ifeq ($(gb_DEBUGLEVEL),2)
 gb_COMPILEROPTFLAGS := -O0