Merge

Fri, 24 Aug 2018 19:25:33 +0100

author
alitvinov
date
Fri, 24 Aug 2018 19:25:33 +0100
changeset 9526
2b0ebd23e2c4
parent 9525
3a4af1679351
parent 9430
c8010d92392f
child 9527
085a67d76e62

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Sat Aug 18 12:58:53 2018 +0100
     1.2 +++ b/.hgtags	Fri Aug 24 19:25:33 2018 +0100
     1.3 @@ -1195,6 +1195,7 @@
     1.4  541c205d7fd15ab840f48aaeeaea3f63209d1687 jdk8u191-b04
     1.5  14c62eae2f8f56f571abfc8435055bb6094c8440 jdk8u191-b05
     1.6  6cfec782c42c25f772bfd51a8b47e6926aa8f69f jdk8u191-b06
     1.7 +96be5f6ab83349c971edd9aeb35cafce267d3bf8 jdk8u191-b07
     1.8  c19c5b73704e3d188bedfe52a473b408ca39009f jdk8u182-b00
     1.9  0341fa6dbb363ee4dc5dbf5bfc4f820523400a72 jdk8u192-b00
    1.10  5792d995ed26eec0417d96a2423446bbcd6951a9 jdk8u192-b01
    1.11 @@ -1203,3 +1204,4 @@
    1.12  a8d61d7f13b0de755da1335c15b72c53c59e92b5 jdk8u192-b04
    1.13  65409bcab2ad83d7043d508448a04fe18cf1c262 jdk8u192-b05
    1.14  7070edbacb29f03b9a77dbe09425da2c888625f1 jdk8u192-b06
    1.15 +cd19ee45aa6b6c81dbf981fd71abed7b7888d499 jdk8u192-b07
     2.1 --- a/make/linux/makefiles/gcc.make	Sat Aug 18 12:58:53 2018 +0100
     2.2 +++ b/make/linux/makefiles/gcc.make	Fri Aug 24 19:25:33 2018 +0100
     2.3 @@ -331,50 +331,20 @@
     2.4  ifeq ($(DEBUG_BINARIES), true)
     2.5    CFLAGS += -g
     2.6  else
     2.7 -  # Use the stabs format for debugging information (this is the default
     2.8 -  # on gcc-2.91). It's good enough, has all the information about line
     2.9 -  # numbers and local variables, and libjvm.so is only about 16M.
    2.10 -  # Change this back to "-g" if you want the most expressive format.
    2.11 -  # (warning: that could easily inflate libjvm.so to 150M!)
    2.12 -  # Note: The Itanium gcc compiler crashes when using -gstabs.
    2.13 -  DEBUG_CFLAGS/ia64  = -g
    2.14 -  DEBUG_CFLAGS/amd64 = -g
    2.15 -  DEBUG_CFLAGS/ppc64 = -g
    2.16    DEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH))
    2.17    ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),)
    2.18 -      ifeq ($(USE_CLANG), true)
    2.19 -        # Clang doesn't understand -gstabs
    2.20 -        DEBUG_CFLAGS/$(BUILDARCH) = -g
    2.21 -      else
    2.22 -        DEBUG_CFLAGS/$(BUILDARCH) = -gstabs
    2.23 -      endif
    2.24 +    DEBUG_CFLAGS += -g
    2.25    endif
    2.26    
    2.27    ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
    2.28 -    FASTDEBUG_CFLAGS/ia64  = -g
    2.29 -    FASTDEBUG_CFLAGS/amd64 = -g
    2.30 -    FASTDEBUG_CFLAGS/ppc64 = -g
    2.31      FASTDEBUG_CFLAGS += $(FASTDEBUG_CFLAGS/$(BUILDARCH))
    2.32      ifeq ($(FASTDEBUG_CFLAGS/$(BUILDARCH)),)
    2.33 -      ifeq ($(USE_CLANG), true)
    2.34 -        # Clang doesn't understand -gstabs
    2.35 -        FASTDEBUG_CFLAGS/$(BUILDARCH) = -g
    2.36 -      else
    2.37 -        FASTDEBUG_CFLAGS/$(BUILDARCH) = -gstabs
    2.38 -      endif
    2.39 +      FASTDEBUG_CFLAGS/$(BUILDARCH) = -g
    2.40      endif
    2.41    
    2.42 -    OPT_CFLAGS/ia64  = -g
    2.43 -    OPT_CFLAGS/amd64 = -g
    2.44 -    OPT_CFLAGS/ppc64 = -g
    2.45      OPT_CFLAGS += $(OPT_CFLAGS/$(BUILDARCH))
    2.46      ifeq ($(OPT_CFLAGS/$(BUILDARCH)),)
    2.47 -      ifeq ($(USE_CLANG), true)
    2.48 -        # Clang doesn't understand -gstabs
    2.49 -        OPT_CFLAGS/$(BUILDARCH) = -g
    2.50 -      else
    2.51 -        OPT_CFLAGS/$(BUILDARCH) = -gstabs
    2.52 -      endif
    2.53 +      OPT_CFLAGS/$(BUILDARCH) = -g
    2.54      endif
    2.55    endif
    2.56  endif

mercurial