changeset 2363:c9822b5fabf2 tip

Review comments
author erikj
date Wed, 06 Apr 2016 10:37:56 +0200
parents fe28a2bea3dc
children
files common/autoconf/flags.m4 common/autoconf/generated-configure.sh common/autoconf/hotspot.m4
diffstat 3 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/flags.m4	Tue Apr 05 18:01:22 2016 +0200
+++ b/common/autoconf/flags.m4	Wed Apr 06 10:37:56 2016 +0200
@@ -272,7 +272,7 @@
         SHARED_LIBRARY_FLAGS ='-undefined dynamic_lookup'
       else
         SHARED_LIBRARY_FLAGS="-dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0 $PICFLAG"
-        JVM_CFLAGS="$JVM_CFLAGS -fPIC"
+        JVM_CFLAGS="$JVM_CFLAGS $PICFLAG"
       fi
       SET_EXECUTABLE_ORIGIN='-Wl,-rpath,@loader_path/.'
       SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
--- a/common/autoconf/generated-configure.sh	Tue Apr 05 18:01:22 2016 +0200
+++ b/common/autoconf/generated-configure.sh	Wed Apr 06 10:37:56 2016 +0200
@@ -4254,7 +4254,7 @@
 
 
 ###############################################################################
-# Check if the specified JVM features are explicitely enabled. To be used in
+# Check if the specified JVM features are explicitly enabled. To be used in
 # shell if constructs, like this:
 # if HOTSPOT_CHECK_JVM_FEATURE(jvmti); then
 #
@@ -5055,7 +5055,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1459871696
+DATE_WHEN_GENERATED=1459931863
 
 ###############################################################################
 #
@@ -16247,7 +16247,7 @@
   fi
   JVM_VARIANTS_OPT="$with_jvm_variants"
 
-  # Have the user listed more than one variant?
+  # Has the user listed more than one variant?
   # Additional [] needed to keep m4 from mangling shell constructs.
   if  [[ "$JVM_VARIANTS_OPT" =~ "," ]] ; then
     BUILDING_MULTIPLE_JVM_VARIANTS=true
@@ -48268,7 +48268,7 @@
         SHARED_LIBRARY_FLAGS ='-undefined dynamic_lookup'
       else
         SHARED_LIBRARY_FLAGS="-dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0 $PICFLAG"
-        JVM_CFLAGS="$JVM_CFLAGS -fPIC"
+        JVM_CFLAGS="$JVM_CFLAGS $PICFLAG"
       fi
       SET_EXECUTABLE_ORIGIN='-Wl,-rpath,@loader_path/.'
       SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
@@ -52516,7 +52516,7 @@
   if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \
       test "x$OPENJDK_TARGET_CPU" = "xsparcv9" || \
       test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then
-    JVM_FEATURES_jvmci="$JVM_FEATURES_server jvmci"
+    JVM_FEATURES_jvmci="jvmci"
   else
     JVM_FEATURES_jvmci=""
   fi
--- a/common/autoconf/hotspot.m4	Tue Apr 05 18:01:22 2016 +0200
+++ b/common/autoconf/hotspot.m4	Wed Apr 06 10:37:56 2016 +0200
@@ -43,7 +43,7 @@
 [ [ [[ " $JVM_VARIANTS " =~ " $1 " ]] ] ])
 
 ###############################################################################
-# Check if the specified JVM features are explicitely enabled. To be used in
+# Check if the specified JVM features are explicitly enabled. To be used in
 # shell if constructs, like this:
 # if HOTSPOT_CHECK_JVM_FEATURE(jvmti); then
 #
@@ -74,7 +74,7 @@
   fi
   JVM_VARIANTS_OPT="$with_jvm_variants"
 
-  # Have the user listed more than one variant?
+  # Has the user listed more than one variant?
   # Additional [] needed to keep m4 from mangling shell constructs.
   if [ [[ "$JVM_VARIANTS_OPT" =~ "," ]] ]; then
     BUILDING_MULTIPLE_JVM_VARIANTS=true
@@ -241,7 +241,7 @@
   if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \
       test "x$OPENJDK_TARGET_CPU" = "xsparcv9" || \
       test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then
-    JVM_FEATURES_jvmci="$JVM_FEATURES_server jvmci"
+    JVM_FEATURES_jvmci="jvmci"
   else
     JVM_FEATURES_jvmci=""
   fi