Mercurial > hg > icedtea8-forest

changeset 2264:aad676cf0720 icedtea-3.9.0pre01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8207057, PR3613: No debug info for assembler files
author andrew
date Wed, 25 Jul 2018 14:53:37 +0100
parents 4a934e7fda77
children e524a4d0f6bd
files common/autoconf/generated-configure.sh common/autoconf/jdk-options.m4 common/autoconf/spec.gmk.in common/autoconf/toolchain.m4 make/common/NativeCompilation.gmk
diffstat 5 files changed, 29 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh	Mon May 28 09:26:07 2018 +0100
+++ b/common/autoconf/generated-configure.sh	Wed Jul 25 14:53:37 2018 +0100
@@ -682,6 +682,7 @@
 X_CFLAGS
 XMKMF
 FIXPATH
+ASFLAGS_DEBUG_SYMBOLS
 CXXFLAGS_DEBUG_SYMBOLS
 CFLAGS_DEBUG_SYMBOLS
 ZIP_DEBUGINFO_FILES
@@ -4000,7 +4001,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1521483882
+DATE_WHEN_GENERATED=1532438156
 
 ###############################################################################
 #
@@ -28964,6 +28965,7 @@
           CXX_O_FLAG_NONE="$C_O_FLAG_NONE"
           CFLAGS_DEBUG_SYMBOLS="-g"
           CXXFLAGS_DEBUG_SYMBOLS="-g"
+          ASFLAGS_DEBUG_SYMBOLS="-g"
           if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then
             CFLAGS_DEBUG_SYMBOLS="-g1"
             CXXFLAGS_DEBUG_SYMBOLS="-g1"
@@ -30080,6 +30082,7 @@
 
 
 
+
 ###############################################################################
 #
 # Check dependencies for external and internal libraries.
--- a/common/autoconf/jdk-options.m4	Mon May 28 09:26:07 2018 +0100
+++ b/common/autoconf/jdk-options.m4	Wed Jul 25 14:53:37 2018 +0100
@@ -61,7 +61,7 @@
 #    cpp     : C++ interpreter
 AC_MSG_CHECKING([which interpreter of the JVM to build])
 AC_ARG_WITH([jvm-interpreter], [AS_HELP_STRING([--with-jvm-interpreter],
-	[JVM interpreter to build (template, cpp) @<:@template@:>@])])
+        [JVM interpreter to build (template, cpp) @<:@template@:>@])])
 
 if test "x$with_jvm_interpreter" = x; then
      with_jvm_interpreter="template"
@@ -95,7 +95,7 @@
 #    core: interpreter only, no compiler (only works on some platforms)
   AC_MSG_CHECKING([which variants of the JVM to build])
   AC_ARG_WITH([jvm-variants], [AS_HELP_STRING([--with-jvm-variants],
-	[JVM variants (separated by commas) to build (server, client, minimal1, kernel, zero, zeroshark, core) @<:@server@:>@])])
+        [JVM variants (separated by commas) to build (server, client, minimal1, kernel, zero, zeroshark, core) @<:@server@:>@])])
 
   if test "x$with_jvm_variants" = x; then
     if test "x$OPENJDK_TARGET_CPU" = xaarch32; then
@@ -267,7 +267,7 @@
       DEBUG_CLASSFILES="false"
       ;;
   esac
-  
+
   #####
   # Generate the legacy makefile targets for hotspot.
   # The hotspot api for selecting the build artifacts, really, needs to be improved.
@@ -398,7 +398,7 @@
   AC_SUBST(SUPPORT_HEADFUL)
   AC_SUBST(BUILD_HEADLESS)
   AC_SUBST(BUILD_HEADFUL)
-  
+
   # Control wether Hotspot runs Queens test after build.
   AC_ARG_ENABLE([hotspot-test-in-build], [AS_HELP_STRING([--enable-hotspot-test-in-build],
       [run the Queens test after Hotspot build @<:@disabled@:>@])],,
@@ -638,6 +638,7 @@
   AC_SUBST(ZIP_DEBUGINFO_FILES)
   AC_SUBST(CFLAGS_DEBUG_SYMBOLS)
   AC_SUBST(CXXFLAGS_DEBUG_SYMBOLS)
+  AC_SUBST(ASFLAGS_DEBUG_SYMBOLS)
 ])
 
 # Support for customization of the build process. Some build files
--- a/common/autoconf/spec.gmk.in	Mon May 28 09:26:07 2018 +0100
+++ b/common/autoconf/spec.gmk.in	Wed Jul 25 14:53:37 2018 +0100
@@ -420,6 +420,7 @@
 ENABLE_DEBUG_SYMBOLS:=@ENABLE_DEBUG_SYMBOLS@
 CFLAGS_DEBUG_SYMBOLS:=@CFLAGS_DEBUG_SYMBOLS@
 CXXFLAGS_DEBUG_SYMBOLS:=@CXXFLAGS_DEBUG_SYMBOLS@
+ASFLAGS_DEBUG_SYMBOLS:=@ASFLAGS_DEBUG_SYMBOLS@
 ZIP_DEBUGINFO_FILES:=@ZIP_DEBUGINFO_FILES@
 
 #
--- a/common/autoconf/toolchain.m4	Mon May 28 09:26:07 2018 +0100
+++ b/common/autoconf/toolchain.m4	Wed Jul 25 14:53:37 2018 +0100
@@ -825,6 +825,7 @@
           CXX_O_FLAG_NONE="$C_O_FLAG_NONE"
           CFLAGS_DEBUG_SYMBOLS="-g"
           CXXFLAGS_DEBUG_SYMBOLS="-g"
+          ASFLAGS_DEBUG_SYMBOLS="-g"
           if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then
             CFLAGS_DEBUG_SYMBOLS="-g1"
             CXXFLAGS_DEBUG_SYMBOLS="-g1"
--- a/make/common/NativeCompilation.gmk	Mon May 28 09:26:07 2018 +0100
+++ b/make/common/NativeCompilation.gmk	Wed Jul 25 14:53:37 2018 +0100
@@ -327,6 +327,21 @@
     $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release)
   endif
 
+  $1_EXTRA_ASFLAGS:=$$($1_ASFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_ASFLAGS_$(OPENJDK_TARGET_OS)) \
+      $$($1_ASFLAGS_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU))
+  ifneq ($(DEBUG_LEVEL),release)
+    # Pickup extra debug dependent variables for ASFLAGS
+    $1_EXTRA_ASFLAGS+=$$($1_ASFLAGS_debug)
+    $1_EXTRA_ASFLAGS+=$$($1_ASFLAGS_$(OPENJDK_TARGET_OS_API)_debug)
+    $1_EXTRA_ASFLAGS+=$$($1_ASFLAGS_$(OPENJDK_TARGET_OS)_debug)
+    $1_EXTRA_ASFLAGS+=$$($1_ASFLAGS_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU)_debug)
+  else
+    $1_EXTRA_ASFLAGS+=$$($1_ASFLAGS_release)
+    $1_EXTRA_ASFLAGS+=$$($1_ASFLAGS_$(OPENJDK_TARGET_OS_API)_release)
+    $1_EXTRA_ASFLAGS+=$$($1_ASFLAGS_$(OPENJDK_TARGET_OS)_release)
+    $1_EXTRA_ASFLAGS+=$$($1_ASFLAGS_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU)_release)
+  endif
+
   ifeq ($$($1_CXXFLAGS),)
     $1_CXXFLAGS:=$$($1_CFLAGS)
   endif
@@ -340,12 +355,14 @@
         # Always add debug symbols
         $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
         $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
+        $1_EXTRA_ASFLAGS+=$(ASFLAGS_DEBUG_SYMBOLS)
       else
         # Programs don't get the debug symbols added in the old build. It's not clear if
         # this is intentional.
         ifeq ($$($1_PROGRAM),)
           $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
           $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
+          $1_EXTRA_ASFLAGS+=$(ASFLAGS_DEBUG_SYMBOLS)
         endif
       endif
     endif
@@ -389,7 +406,7 @@
   $$(foreach p,$$($1_SRCS), \
       $$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \
           $$($1_CFLAGS) $$($1_EXTRA_CFLAGS),$$($1_CC), \
-          $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS),$(CXX),$$($1_ASFLAGS))))
+          $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS),$(CXX),$$($1_EXTRA_ASFLAGS))))
 
   # On windows we need to create a resource file
   ifeq ($(OPENJDK_TARGET_OS), windows)