Tue, 21 Aug 2018 16:14:33 +0100
Merge
1.1 --- a/make/linux/makefiles/gcc.make Fri Aug 17 17:57:20 2018 +0100 1.2 +++ b/make/linux/makefiles/gcc.make Tue Aug 21 16:14:33 2018 +0100 1.3 @@ -331,50 +331,20 @@ 1.4 ifeq ($(DEBUG_BINARIES), true) 1.5 CFLAGS += -g 1.6 else 1.7 - # Use the stabs format for debugging information (this is the default 1.8 - # on gcc-2.91). It's good enough, has all the information about line 1.9 - # numbers and local variables, and libjvm.so is only about 16M. 1.10 - # Change this back to "-g" if you want the most expressive format. 1.11 - # (warning: that could easily inflate libjvm.so to 150M!) 1.12 - # Note: The Itanium gcc compiler crashes when using -gstabs. 1.13 - DEBUG_CFLAGS/ia64 = -g 1.14 - DEBUG_CFLAGS/amd64 = -g 1.15 - DEBUG_CFLAGS/ppc64 = -g 1.16 DEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH)) 1.17 ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),) 1.18 - ifeq ($(USE_CLANG), true) 1.19 - # Clang doesn't understand -gstabs 1.20 - DEBUG_CFLAGS/$(BUILDARCH) = -g 1.21 - else 1.22 - DEBUG_CFLAGS/$(BUILDARCH) = -gstabs 1.23 - endif 1.24 + DEBUG_CFLAGS += -g 1.25 endif 1.26 1.27 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) 1.28 - FASTDEBUG_CFLAGS/ia64 = -g 1.29 - FASTDEBUG_CFLAGS/amd64 = -g 1.30 - FASTDEBUG_CFLAGS/ppc64 = -g 1.31 FASTDEBUG_CFLAGS += $(FASTDEBUG_CFLAGS/$(BUILDARCH)) 1.32 ifeq ($(FASTDEBUG_CFLAGS/$(BUILDARCH)),) 1.33 - ifeq ($(USE_CLANG), true) 1.34 - # Clang doesn't understand -gstabs 1.35 - FASTDEBUG_CFLAGS/$(BUILDARCH) = -g 1.36 - else 1.37 - FASTDEBUG_CFLAGS/$(BUILDARCH) = -gstabs 1.38 - endif 1.39 + FASTDEBUG_CFLAGS/$(BUILDARCH) = -g 1.40 endif 1.41 1.42 - OPT_CFLAGS/ia64 = -g 1.43 - OPT_CFLAGS/amd64 = -g 1.44 - OPT_CFLAGS/ppc64 = -g 1.45 OPT_CFLAGS += $(OPT_CFLAGS/$(BUILDARCH)) 1.46 ifeq ($(OPT_CFLAGS/$(BUILDARCH)),) 1.47 - ifeq ($(USE_CLANG), true) 1.48 - # Clang doesn't understand -gstabs 1.49 - OPT_CFLAGS/$(BUILDARCH) = -g 1.50 - else 1.51 - OPT_CFLAGS/$(BUILDARCH) = -gstabs 1.52 - endif 1.53 + OPT_CFLAGS/$(BUILDARCH) = -g 1.54 endif 1.55 endif 1.56 endif