I've committed the straightforward whitespace ones already, I don't really know
C++ so these I'm less sure about. It's still not enough to get it to build
(problems with jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp next)
but I'm running out of steam with this one so I'll just send out what I have
for now :)
Index: patch-hotspot_src_os_bsd_vm_os_bsd_cpp
===================================================================
RCS file: patch-hotspot_src_os_bsd_vm_os_bsd_cpp
diff -N patch-hotspot_src_os_bsd_vm_os_bsd_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patch-hotspot_src_os_bsd_vm_os_bsd_cpp 7 Apr 2018 12:09:43 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: hotspot/src/os/bsd/vm/os_bsd.cpp
+--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig
++++ hotspot/src/os/bsd/vm/os_bsd.cpp
+@@ -1631,7 +1631,7 @@ void * os::dll_load(const char *filename, char *ebuf,
+ // Identify compatability class for VM's architecture and library's
architecture
+ // Obtain string descriptions for architectures
+
+- arch_t lib_arch={elf_head.e_machine,0,elf_head.e_ident[EI_CLASS],
elf_head.e_ident[EI_DATA], NULL};
++ arch_t
lib_arch={elf_head.e_machine,0,static_cast<char>(elf_head.e_ident[EI_CLASS]),
static_cast<char>(elf_head.e_ident[EI_DATA]), NULL};
+ int running_arch_index=-1;
+
+ for (unsigned int i=0 ; i < ARRAY_SIZE(arch_array) ; i++ ) {
Index: patch-hotspot_src_share_vm_code_compiledIC_cpp
===================================================================
RCS file: patch-hotspot_src_share_vm_code_compiledIC_cpp
diff -N patch-hotspot_src_share_vm_code_compiledIC_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patch-hotspot_src_share_vm_code_compiledIC_cpp 7 Apr 2018 12:09:43
-0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: hotspot/src/share/vm/code/compiledIC.cpp
+--- hotspot/src/share/vm/code/compiledIC.cpp.orig
++++ hotspot/src/share/vm/code/compiledIC.cpp
+@@ -222,7 +222,7 @@ bool CompiledIC::set_to_megamorphic(CallInfo* call_inf
+ assert(bytecode == Bytecodes::_invokeinterface, "");
+ int itable_index = call_info->itable_index();
+ entry = VtableStubs::find_itable_stub(itable_index);
+- if (entry == false) {
++ if (entry == (unsigned char *)false) {
+ return false;
+ }
+ #ifdef ASSERT
Index: patch-hotspot_src_share_vm_gc_implementation_g1_heapRegionSet_hpp
===================================================================
RCS file: patch-hotspot_src_share_vm_gc_implementation_g1_heapRegionSet_hpp
diff -N patch-hotspot_src_share_vm_gc_implementation_g1_heapRegionSet_hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patch-hotspot_src_share_vm_gc_implementation_g1_heapRegionSet_hpp 7 Apr
2018 12:09:43 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Index: hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.hpp
+--- hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.hpp.orig
++++ hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.hpp
+@@ -35,7 +35,11 @@ typedef FormatBuffer<HRS_ERR_MSG_BUFSZ> hrs_err_msg;
+ // HEAP_REGION_SET_FORCE_VERIFY to be 1, or in builds in which
+ // asserts are compiled in.
+ #ifndef HEAP_REGION_SET_FORCE_VERIFY
+-#define HEAP_REGION_SET_FORCE_VERIFY defined(ASSERT)
++# ifdef ASSERT
++# define HEAP_REGION_SET_FORCE_VERIFY 1
++# else
++# define HEAP_REGION_SET_FORCE_VERIFY 0
++# endif
+ #endif // HEAP_REGION_SET_FORCE_VERIFY
+
+ class hrs_ext_msg;
Index: patch-hotspot_src_share_vm_opto_type_cpp
===================================================================
RCS file: patch-hotspot_src_share_vm_opto_type_cpp
diff -N patch-hotspot_src_share_vm_opto_type_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patch-hotspot_src_share_vm_opto_type_cpp 7 Apr 2018 12:09:43 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Index: hotspot/src/share/vm/opto/type.cpp
+--- hotspot/src/share/vm/opto/type.cpp.orig
++++ hotspot/src/share/vm/opto/type.cpp
+@@ -52,7 +52,7 @@ Dict* Type::_shared_type_dict = NULL;
+
+ // Array which maps compiler types to Basic Types
+ Type::TypeInfo Type::_type_info[Type::lastype] = {
+- { Bad, T_ILLEGAL, "bad", false,
Node::NotAMachineReg, relocInfo::none }, // Bad
++ { Bad, T_ILLEGAL, "bad", false,
static_cast<int>(Node::NotAMachineReg), relocInfo::none }, // Bad
+ { Control, T_ILLEGAL, "control", false, 0,
relocInfo::none }, // Control
+ { Bottom, T_VOID, "top", false, 0,
relocInfo::none }, // Top
+ { Bad, T_INT, "int:", false, Op_RegI,
relocInfo::none }, // Int
+@@ -60,8 +60,8 @@ Type::TypeInfo Type::_type_info[Type::lastype] = {
+ { Half, T_VOID, "half", false, 0,
relocInfo::none }, // Half
+ { Bad, T_NARROWOOP, "narrowoop:", false, Op_RegN,
relocInfo::none }, // NarrowOop
+ { Bad, T_NARROWKLASS,"narrowklass:", false, Op_RegN,
relocInfo::none }, // NarrowKlass
+- { Bad, T_ILLEGAL, "tuple:", false,
Node::NotAMachineReg, relocInfo::none }, // Tuple
+- { Bad, T_ARRAY, "array:", false,
Node::NotAMachineReg, relocInfo::none }, // Array
++ { Bad, T_ILLEGAL, "tuple:", false,
static_cast<int>(Node::NotAMachineReg), relocInfo::none }, // Tuple
++ { Bad, T_ARRAY, "array:", false,
static_cast<int>(Node::NotAMachineReg), relocInfo::none }, // Array
+
+ #ifdef SPARC
+ { Bad, T_ILLEGAL, "vectors:", false, 0,
relocInfo::none }, // VectorS
Index: patch-hotspot_src_share_vm_utilities_vmError_cpp
===================================================================
RCS file: patch-hotspot_src_share_vm_utilities_vmError_cpp
diff -N patch-hotspot_src_share_vm_utilities_vmError_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patch-hotspot_src_share_vm_utilities_vmError_cpp 7 Apr 2018 12:09:43
-0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: hotspot/src/share/vm/utilities/vmError.cpp
+--- hotspot/src/share/vm/utilities/vmError.cpp.orig
++++ hotspot/src/share/vm/utilities/vmError.cpp
+@@ -352,7 +352,7 @@ void VMError::report(outputStream* st) {
+
+ STEP(15, "(printing type of error)")
+
+- switch(_id) {
++ switch(static_cast<unsigned int>_id) {
+ case OOM_MALLOC_ERROR:
+ case OOM_MMAP_ERROR:
+ if (_size) {
