changeset 8918:2b0ebd23e2c4

Merge
author alitvinov
date Fri, 24 Aug 2018 19:25:33 +0100
parents 3a4af1679351 c8010d92392f
children 085a67d76e62
files .hgtags
diffstat 2 files changed, 5 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sat Aug 18 12:58:53 2018 +0100
+++ b/.hgtags	Fri Aug 24 19:25:33 2018 +0100
@@ -1195,6 +1195,7 @@
 541c205d7fd15ab840f48aaeeaea3f63209d1687 jdk8u191-b04
 14c62eae2f8f56f571abfc8435055bb6094c8440 jdk8u191-b05
 6cfec782c42c25f772bfd51a8b47e6926aa8f69f jdk8u191-b06
+96be5f6ab83349c971edd9aeb35cafce267d3bf8 jdk8u191-b07
 c19c5b73704e3d188bedfe52a473b408ca39009f jdk8u182-b00
 0341fa6dbb363ee4dc5dbf5bfc4f820523400a72 jdk8u192-b00
 5792d995ed26eec0417d96a2423446bbcd6951a9 jdk8u192-b01
@@ -1203,3 +1204,4 @@
 a8d61d7f13b0de755da1335c15b72c53c59e92b5 jdk8u192-b04
 65409bcab2ad83d7043d508448a04fe18cf1c262 jdk8u192-b05
 7070edbacb29f03b9a77dbe09425da2c888625f1 jdk8u192-b06
+cd19ee45aa6b6c81dbf981fd71abed7b7888d499 jdk8u192-b07
--- a/make/linux/makefiles/gcc.make	Sat Aug 18 12:58:53 2018 +0100
+++ b/make/linux/makefiles/gcc.make	Fri Aug 24 19:25:33 2018 +0100
@@ -331,50 +331,20 @@
 ifeq ($(DEBUG_BINARIES), true)
   CFLAGS += -g
 else
-  # Use the stabs format for debugging information (this is the default
-  # on gcc-2.91). It's good enough, has all the information about line
-  # numbers and local variables, and libjvm.so is only about 16M.
-  # Change this back to "-g" if you want the most expressive format.
-  # (warning: that could easily inflate libjvm.so to 150M!)
-  # Note: The Itanium gcc compiler crashes when using -gstabs.
-  DEBUG_CFLAGS/ia64  = -g
-  DEBUG_CFLAGS/amd64 = -g
-  DEBUG_CFLAGS/ppc64 = -g
   DEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH))
   ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),)
-      ifeq ($(USE_CLANG), true)
-        # Clang doesn't understand -gstabs
-        DEBUG_CFLAGS/$(BUILDARCH) = -g
-      else
-        DEBUG_CFLAGS/$(BUILDARCH) = -gstabs
-      endif
+    DEBUG_CFLAGS += -g
   endif
   
   ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-    FASTDEBUG_CFLAGS/ia64  = -g
-    FASTDEBUG_CFLAGS/amd64 = -g
-    FASTDEBUG_CFLAGS/ppc64 = -g
     FASTDEBUG_CFLAGS += $(FASTDEBUG_CFLAGS/$(BUILDARCH))
     ifeq ($(FASTDEBUG_CFLAGS/$(BUILDARCH)),)
-      ifeq ($(USE_CLANG), true)
-        # Clang doesn't understand -gstabs
-        FASTDEBUG_CFLAGS/$(BUILDARCH) = -g
-      else
-        FASTDEBUG_CFLAGS/$(BUILDARCH) = -gstabs
-      endif
+      FASTDEBUG_CFLAGS/$(BUILDARCH) = -g
     endif
   
-    OPT_CFLAGS/ia64  = -g
-    OPT_CFLAGS/amd64 = -g
-    OPT_CFLAGS/ppc64 = -g
     OPT_CFLAGS += $(OPT_CFLAGS/$(BUILDARCH))
     ifeq ($(OPT_CFLAGS/$(BUILDARCH)),)
-      ifeq ($(USE_CLANG), true)
-        # Clang doesn't understand -gstabs
-        OPT_CFLAGS/$(BUILDARCH) = -g
-      else
-        OPT_CFLAGS/$(BUILDARCH) = -gstabs
-      endif
+      OPT_CFLAGS/$(BUILDARCH) = -g
     endif
   endif
 endif