File riscv.patch of Package java-11-openjdk

Overview Repositories Revisions Requests Users Attributes Meta

File riscv.patch of Package java-11-openjdk (Revision e08db85fcd69e050350c211934a8820b)

Currently displaying revision e08db85fcd69e050350c211934a8820b , Show latest

Index: jdk-3ab6ba9f94a9/make/autoconf/flags-cflags.m4
===================================================================
--- jdk-3ab6ba9f94a9.orig/make/autoconf/flags-cflags.m4
+++ jdk-3ab6ba9f94a9/make/autoconf/flags-cflags.m4
@@ -237,10 +237,10 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
       C_O_FLAG_NORM="-xO2 -Wc,-Qrm-s -Wc,-Qiselect-T0"
     fi
   elif test "x$TOOLCHAIN_TYPE" = xgcc; then
-    C_O_FLAG_HIGHEST_JVM="-O3"
-    C_O_FLAG_HIGHEST="-O3"
-    C_O_FLAG_HI="-O3"
-    C_O_FLAG_NORM="-O2"
+    C_O_FLAG_HIGHEST_JVM="-O"
+    C_O_FLAG_HIGHEST="-O"
+    C_O_FLAG_HI="-O"
+    C_O_FLAG_NORM="-O"
     C_O_FLAG_SIZE="-Os"
     C_O_FLAG_DEBUG="-O0"
     C_O_FLAG_DEBUG_JVM="-O0"
Index: jdk-3ab6ba9f94a9/make/autoconf/platform.m4
===================================================================
--- jdk-3ab6ba9f94a9.orig/make/autoconf/platform.m4
+++ jdk-3ab6ba9f94a9/make/autoconf/platform.m4
@@ -114,6 +114,12 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU
       VAR_CPU_BITS=64
       VAR_CPU_ENDIAN=little
       ;;
+    riscv64)
+      VAR_CPU=riscv64
+      VAR_CPU_ARCH=riscv
+      VAR_CPU_BITS=64
+      VAR_CPU_ENDIAN=little
+      ;;
     s390)
       VAR_CPU=s390
       VAR_CPU_ARCH=s390
@@ -473,6 +479,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HEL
     HOTSPOT_$1_CPU_DEFINE=S390
   elif test "x$OPENJDK_$1_CPU" = xs390x; then
     HOTSPOT_$1_CPU_DEFINE=S390
+  elif test "x$OPENJDK_$1_CPU" = xriscv64; then
+    HOTSPOT_$1_CPU_DEFINE=RISCV
   elif test "x$OPENJDK_$1_CPU" != x; then
     HOTSPOT_$1_CPU_DEFINE=$(echo $OPENJDK_$1_CPU | tr a-z A-Z)
   fi
Index: jdk-3ab6ba9f94a9/src/hotspot/cpu/zero/cppInterpreter_zero.cpp
===================================================================
--- jdk-3ab6ba9f94a9.orig/src/hotspot/cpu/zero/cppInterpreter_zero.cpp
+++ jdk-3ab6ba9f94a9/src/hotspot/cpu/zero/cppInterpreter_zero.cpp
@@ -100,7 +100,7 @@ intptr_t narrow(BasicType type, intptr_t
     case T_DOUBLE:
     case T_VOID:
       return result;
-    default  : ShouldNotReachHere();
+    default  : ShouldNotReachHere(); return result;
   }
 }
 
Index: jdk-3ab6ba9f94a9/src/hotspot/os/linux/os_linux.cpp
===================================================================
--- jdk-3ab6ba9f94a9.orig/src/hotspot/os/linux/os_linux.cpp
+++ jdk-3ab6ba9f94a9/src/hotspot/os/linux/os_linux.cpp
@@ -1765,6 +1765,7 @@ void * os::dll_load(const char *filename
     {EM_PARISC,      EM_PARISC,  ELFCLASS32, ELFDATA2MSB, (char*)"PARISC"},
     {EM_68K,         EM_68K,     ELFCLASS32, ELFDATA2MSB, (char*)"M68k"},
     {EM_AARCH64,     EM_AARCH64, ELFCLASS64, ELFDATA2LSB, (char*)"AARCH64"},
+    {EM_RISCV,       EM_RISCV,   ELFCLASS64, ELFDATA2LSB, (char*)"RISCV"},
   };
 
 #if  (defined IA32)
@@ -1799,6 +1800,8 @@ void * os::dll_load(const char *filename
   static  Elf32_Half running_arch_code=EM_68K;
 #elif  (defined SH)
   static  Elf32_Half running_arch_code=EM_SH;
+#elif  (defined RISCV)
+  static  Elf32_Half running_arch_code=EM_RISCV;
 #else
     #error Method os::dll_load requires that one of following is defined:\
         AARCH64, ALPHA, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, S390, SH, __sparc
Index: jdk-3ab6ba9f94a9/src/hotspot/share/utilities/macros.hpp
===================================================================
--- jdk-3ab6ba9f94a9.orig/src/hotspot/share/utilities/macros.hpp
+++ jdk-3ab6ba9f94a9/src/hotspot/share/utilities/macros.hpp
@@ -472,6 +472,14 @@
 #define NOT_AARCH64(code) code
 #endif
 
+#ifdef RISCV
+#define RISCV_ONLY(code) code
+#define NOT_RISCV(code)
+#else
+#define RISCV_ONLY(code)
+#define NOT_RISCV(code) code
+#endif
+
 #define define_pd_global(type, name, value) const type pd_##name = value;
 
 // Helper macros for constructing file names for includes.

Places

File riscv.patch of Package java-11-openjdk (Revision e08db85fcd69e050350c211934a8820b)

Places