Merge from rhel7
This commit is contained in:
Jiri Vanek
parent
75dc799865
commit
b0622b7b61
191
8062808-pr3548.patch
Normal file
191
8062808-pr3548.patch
Normal file
@ -0,0 +1,191 @@
|
||||
# HG changeset patch
|
||||
# User stefank
|
||||
# Date 1525453613 -3600
|
||||
# Fri May 04 18:06:53 2018 +0100
|
||||
# Node ID 07a1135a327362f157955d470fad5df07cc35164
|
||||
# Parent de79964656fc652f2085dac4fe99bcc128b5a3b1
|
||||
8062808, PR3548: Turn on the -Wreturn-type warning
|
||||
Reviewed-by: mgerdin, tschatzl, coleenp, jrose, kbarrett
|
||||
|
||||
diff --git openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
|
||||
--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make
|
||||
+++ openjdk/hotspot/make/linux/makefiles/gcc.make
|
||||
@@ -210,7 +210,7 @@
|
||||
WARNINGS_ARE_ERRORS += -Wno-return-type -Wno-empty-body
|
||||
endif
|
||||
|
||||
-WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value
|
||||
+WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value -Wreturn-type
|
||||
|
||||
ifeq ($(USE_CLANG),)
|
||||
# Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
|
||||
diff --git openjdk.orig/hotspot/src/cpu/x86/vm/x86_32.ad openjdk/hotspot/src/cpu/x86/vm/x86_32.ad
|
||||
--- openjdk.orig/hotspot/src/cpu/x86/vm/x86_32.ad
|
||||
+++ openjdk/hotspot/src/cpu/x86/vm/x86_32.ad
|
||||
@@ -1250,6 +1250,7 @@
|
||||
|
||||
|
||||
Unimplemented();
|
||||
+ return 0; // Mute compiler
|
||||
}
|
||||
|
||||
#ifndef PRODUCT
|
||||
diff --git openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
|
||||
--- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
|
||||
+++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
|
||||
@@ -541,6 +541,7 @@
|
||||
err.report_and_die();
|
||||
|
||||
ShouldNotReachHere();
|
||||
+ return true; // Mute compiler
|
||||
}
|
||||
|
||||
void os::Linux::init_thread_fpu_state(void) {
|
||||
diff --git openjdk.orig/hotspot/src/share/vm/classfile/defaultMethods.cpp openjdk/hotspot/src/share/vm/classfile/defaultMethods.cpp
|
||||
--- openjdk.orig/hotspot/src/share/vm/classfile/defaultMethods.cpp
|
||||
+++ openjdk/hotspot/src/share/vm/classfile/defaultMethods.cpp
|
||||
@@ -506,7 +506,7 @@
|
||||
ss.write((const char*)name->bytes(), name->utf8_length());
|
||||
ss.write((const char*)signature->bytes(), signature->utf8_length());
|
||||
ss.print(" is abstract");
|
||||
- return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL);
|
||||
+ return SymbolTable::new_symbol(ss.base(), (int)ss.size(), THREAD);
|
||||
}
|
||||
|
||||
Symbol* MethodFamily::generate_conflicts_message(GrowableArray<Method*>* methods, TRAPS) const {
|
||||
@@ -521,7 +521,7 @@
|
||||
ss.print(".");
|
||||
ss.write((const char*)name->bytes(), name->utf8_length());
|
||||
}
|
||||
- return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL);
|
||||
+ return SymbolTable::new_symbol(ss.base(), (int)ss.size(), THREAD);
|
||||
}
|
||||
|
||||
|
||||
diff --git openjdk.orig/hotspot/src/share/vm/classfile/symbolTable.cpp openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp
|
||||
--- openjdk.orig/hotspot/src/share/vm/classfile/symbolTable.cpp
|
||||
+++ openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp
|
||||
@@ -249,7 +249,7 @@
|
||||
MutexLocker ml(SymbolTable_lock, THREAD);
|
||||
|
||||
// Otherwise, add to symbol to table
|
||||
- return the_table()->basic_add(index, (u1*)name, len, hashValue, true, CHECK_NULL);
|
||||
+ return the_table()->basic_add(index, (u1*)name, len, hashValue, true, THREAD);
|
||||
}
|
||||
|
||||
Symbol* SymbolTable::lookup(const Symbol* sym, int begin, int end, TRAPS) {
|
||||
@@ -288,7 +288,7 @@
|
||||
// Grab SymbolTable_lock first.
|
||||
MutexLocker ml(SymbolTable_lock, THREAD);
|
||||
|
||||
- return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, CHECK_NULL);
|
||||
+ return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, THREAD);
|
||||
}
|
||||
|
||||
Symbol* SymbolTable::lookup_only(const char* name, int len,
|
||||
diff --git openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
|
||||
--- openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp
|
||||
+++ openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
|
||||
@@ -229,15 +229,15 @@
|
||||
class_name->as_C_string(),
|
||||
class_loader.is_null() ? "null" : class_loader->klass()->name()->as_C_string()));
|
||||
if (FieldType::is_array(class_name)) {
|
||||
- return resolve_array_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL);
|
||||
+ return resolve_array_class_or_null(class_name, class_loader, protection_domain, THREAD);
|
||||
} else if (FieldType::is_obj(class_name)) {
|
||||
ResourceMark rm(THREAD);
|
||||
// Ignore wrapping L and ;.
|
||||
TempNewSymbol name = SymbolTable::new_symbol(class_name->as_C_string() + 1,
|
||||
class_name->utf8_length() - 2, CHECK_NULL);
|
||||
- return resolve_instance_class_or_null(name, class_loader, protection_domain, CHECK_NULL);
|
||||
+ return resolve_instance_class_or_null(name, class_loader, protection_domain, THREAD);
|
||||
} else {
|
||||
- return resolve_instance_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL);
|
||||
+ return resolve_instance_class_or_null(class_name, class_loader, protection_domain, THREAD);
|
||||
}
|
||||
}
|
||||
|
||||
diff --git openjdk.orig/hotspot/src/share/vm/memory/heapInspection.hpp openjdk/hotspot/src/share/vm/memory/heapInspection.hpp
|
||||
--- openjdk.orig/hotspot/src/share/vm/memory/heapInspection.hpp
|
||||
+++ openjdk/hotspot/src/share/vm/memory/heapInspection.hpp
|
||||
@@ -367,7 +367,7 @@
|
||||
_csv_format(csv_format), _print_help(print_help),
|
||||
_print_class_stats(print_class_stats), _columns(columns) {}
|
||||
void heap_inspection(outputStream* st) NOT_SERVICES_RETURN;
|
||||
- size_t populate_table(KlassInfoTable* cit, BoolObjectClosure* filter = NULL) NOT_SERVICES_RETURN;
|
||||
+ size_t populate_table(KlassInfoTable* cit, BoolObjectClosure* filter = NULL) NOT_SERVICES_RETURN_(0);
|
||||
static void find_instances_at_safepoint(Klass* k, GrowableArray<oop>* result) NOT_SERVICES_RETURN;
|
||||
private:
|
||||
void iterate_over_heap(KlassInfoTable* cit, BoolObjectClosure* filter = NULL);
|
||||
diff --git openjdk.orig/hotspot/src/share/vm/memory/metaspaceShared.hpp openjdk/hotspot/src/share/vm/memory/metaspaceShared.hpp
|
||||
--- openjdk.orig/hotspot/src/share/vm/memory/metaspaceShared.hpp
|
||||
+++ openjdk/hotspot/src/share/vm/memory/metaspaceShared.hpp
|
||||
@@ -93,7 +93,7 @@
|
||||
static void preload_and_dump(TRAPS) NOT_CDS_RETURN;
|
||||
static int preload_and_dump(const char * class_list_path,
|
||||
GrowableArray<Klass*>* class_promote_order,
|
||||
- TRAPS) NOT_CDS_RETURN;
|
||||
+ TRAPS) NOT_CDS_RETURN_(0);
|
||||
|
||||
static ReservedSpace* shared_rs() {
|
||||
CDS_ONLY(return _shared_rs);
|
||||
diff --git openjdk.orig/hotspot/src/share/vm/oops/constantPool.hpp openjdk/hotspot/src/share/vm/oops/constantPool.hpp
|
||||
--- openjdk.orig/hotspot/src/share/vm/oops/constantPool.hpp
|
||||
+++ openjdk/hotspot/src/share/vm/oops/constantPool.hpp
|
||||
@@ -352,7 +352,7 @@
|
||||
|
||||
Klass* klass_at(int which, TRAPS) {
|
||||
constantPoolHandle h_this(THREAD, this);
|
||||
- return klass_at_impl(h_this, which, CHECK_NULL);
|
||||
+ return klass_at_impl(h_this, which, THREAD);
|
||||
}
|
||||
|
||||
Symbol* klass_name_at(int which); // Returns the name, w/o resolving.
|
||||
diff --git openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp openjdk/hotspot/src/share/vm/prims/jvm.cpp
|
||||
--- openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp
|
||||
+++ openjdk/hotspot/src/share/vm/prims/jvm.cpp
|
||||
@@ -4244,7 +4244,7 @@
|
||||
JVM_DTraceProvider* providers))
|
||||
JVMWrapper("JVM_DTraceActivate");
|
||||
return DTraceJSDT::activate(
|
||||
- version, module_name, providers_count, providers, CHECK_0);
|
||||
+ version, module_name, providers_count, providers, THREAD);
|
||||
JVM_END
|
||||
|
||||
JVM_ENTRY(jboolean,JVM_DTraceIsProbeEnabled(JNIEnv* env, jmethodID method))
|
||||
diff --git openjdk.orig/hotspot/src/share/vm/runtime/reflection.cpp openjdk/hotspot/src/share/vm/runtime/reflection.cpp
|
||||
--- openjdk.orig/hotspot/src/share/vm/runtime/reflection.cpp
|
||||
+++ openjdk/hotspot/src/share/vm/runtime/reflection.cpp
|
||||
@@ -1093,7 +1093,7 @@
|
||||
} else {
|
||||
if (rtype == T_BOOLEAN || rtype == T_BYTE || rtype == T_CHAR || rtype == T_SHORT)
|
||||
narrow((jvalue*) result.get_value_addr(), rtype, CHECK_NULL);
|
||||
- return box((jvalue*) result.get_value_addr(), rtype, CHECK_NULL);
|
||||
+ return box((jvalue*) result.get_value_addr(), rtype, THREAD);
|
||||
}
|
||||
}
|
||||
|
||||
diff --git openjdk.orig/hotspot/src/share/vm/runtime/sharedRuntime.cpp openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp
|
||||
--- openjdk.orig/hotspot/src/share/vm/runtime/sharedRuntime.cpp
|
||||
+++ openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp
|
||||
@@ -1046,7 +1046,7 @@
|
||||
// last java frame on stack (which includes native call frames)
|
||||
vframeStream vfst(thread, true); // Do not skip and javaCalls
|
||||
|
||||
- return find_callee_info_helper(thread, vfst, bc, callinfo, CHECK_(Handle()));
|
||||
+ return find_callee_info_helper(thread, vfst, bc, callinfo, THREAD);
|
||||
}
|
||||
|
||||
|
||||
diff --git openjdk.orig/hotspot/src/share/vm/services/memTracker.hpp openjdk/hotspot/src/share/vm/services/memTracker.hpp
|
||||
--- openjdk.orig/hotspot/src/share/vm/services/memTracker.hpp
|
||||
+++ openjdk/hotspot/src/share/vm/services/memTracker.hpp
|
||||
@@ -64,7 +64,7 @@
|
||||
const NativeCallStack& stack, MEMFLAGS flag = mtNone) { }
|
||||
static inline void record_virtual_memory_commit(void* addr, size_t size, const NativeCallStack& stack) { }
|
||||
static inline Tracker get_virtual_memory_uncommit_tracker() { return Tracker(); }
|
||||
- static inline Tracker get_virtual_memory_release_tracker() { }
|
||||
+ static inline Tracker get_virtual_memory_release_tracker() { return Tracker(); }
|
||||
static inline void record_virtual_memory_type(void* addr, MEMFLAGS flag) { }
|
||||
static inline void record_thread_stack(void* addr, size_t size) { }
|
||||
static inline void release_thread_stack(void* addr, size_t size) { }
|
||||
28
8064786-pr3599.patch
Normal file
28
8064786-pr3599.patch
Normal file
@ -0,0 +1,28 @@
|
||||
# HG changeset patch
|
||||
# User goetz
|
||||
# Date 1415873641 -3600
|
||||
# Thu Nov 13 11:14:01 2014 +0100
|
||||
# Node ID 1878c4c1d04e1f3c6f67a19d36c35863d6b5f906
|
||||
# Parent 533473c67de6ff767710594639033c8e83523fe5
|
||||
8064786, PR3599: Fix debug build after 8062808: Turn on the -Wreturn-type warning
|
||||
Reviewed-by: stefank, tschatzl
|
||||
|
||||
diff --git openjdk.orig/hotspot/src/share/vm/prims/jni.cpp openjdk/hotspot/src/share/vm/prims/jni.cpp
|
||||
--- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp
|
||||
+++ openjdk/hotspot/src/share/vm/prims/jni.cpp
|
||||
@@ -708,6 +708,7 @@
|
||||
|
||||
THROW_OOP_(JNIHandles::resolve(obj), JNI_OK);
|
||||
ShouldNotReachHere();
|
||||
+ return 0; // Mute compiler.
|
||||
JNI_END
|
||||
|
||||
#ifndef USDT2
|
||||
@@ -734,6 +735,7 @@
|
||||
Handle protection_domain (THREAD, k->protection_domain());
|
||||
THROW_MSG_LOADER_(name, (char *)message, class_loader, protection_domain, JNI_OK);
|
||||
ShouldNotReachHere();
|
||||
+ return 0; // Mute compiler.
|
||||
JNI_END
|
||||
|
||||
|
||||
55
8141570-pr3548.patch
Normal file
55
8141570-pr3548.patch
Normal file
@ -0,0 +1,55 @@
|
||||
# HG changeset patch
|
||||
# User coleenp
|
||||
# Date 1525713256 -3600
|
||||
# Mon May 07 18:14:16 2018 +0100
|
||||
# Node ID bcbc64dfb629c5f188bbf59b8f986ad95963ed60
|
||||
# Parent 07a1135a327362f157955d470fad5df07cc35164
|
||||
8141570, PR3548: Fix Zero interpreter build for --disable-precompiled-headers
|
||||
Summary: change to include atomic.inline.hpp and allocation.inline.hpp only in .cpp files and some build fixes from Kim to build on ubuntu without devkits
|
||||
Reviewed-by: kbarrett, sgehwolf, erikj
|
||||
|
||||
diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
|
||||
--- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make
|
||||
+++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
|
||||
@@ -1,5 +1,5 @@
|
||||
#
|
||||
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
|
||||
+# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright 2007, 2008 Red Hat, Inc.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
@@ -25,8 +25,15 @@
|
||||
|
||||
# Setup common to Zero (non-Shark) and Shark versions of VM
|
||||
|
||||
-# override this from the main file because some version of llvm do not like -Wundef
|
||||
-WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wunused-function -Wunused-value
|
||||
+# Some versions of llvm do not like -Wundef
|
||||
+ifeq ($(USE_CLANG), true)
|
||||
+ WARNING_FLAGS += -Wno-undef
|
||||
+endif
|
||||
+# Suppress some warning flags that are normally turned on for hotspot,
|
||||
+# because some of the zero code has not been updated accordingly.
|
||||
+WARNING_FLAGS += -Wno-return-type \
|
||||
+ -Wno-format-nonliteral -Wno-format-security \
|
||||
+ -Wno-maybe-uninitialized
|
||||
|
||||
# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
|
||||
OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
|
||||
@@ -42,5 +49,3 @@
|
||||
ifeq ($(ARCH_DATA_MODEL), 64)
|
||||
CFLAGS += -D_LP64=1
|
||||
endif
|
||||
-
|
||||
-OPT_CFLAGS/compactingPermGenGen.o = -O1
|
||||
diff --git openjdk.orig/hotspot/src/share/vm/runtime/java.cpp openjdk/hotspot/src/share/vm/runtime/java.cpp
|
||||
--- openjdk.orig/hotspot/src/share/vm/runtime/java.cpp
|
||||
+++ openjdk/hotspot/src/share/vm/runtime/java.cpp
|
||||
@@ -45,6 +45,7 @@
|
||||
#include "runtime/arguments.hpp"
|
||||
#include "runtime/biasedLocking.hpp"
|
||||
#include "runtime/compilationPolicy.hpp"
|
||||
+#include "runtime/deoptimization.hpp"
|
||||
#include "runtime/fprofiler.hpp"
|
||||
#include "runtime/init.hpp"
|
||||
#include "runtime/interfaceSupport.hpp"
|
||||
154
8143245-pr3548.patch
Normal file
154
8143245-pr3548.patch
Normal file
@ -0,0 +1,154 @@
|
||||
# HG changeset patch
|
||||
# User sgehwolf
|
||||
# Date 1525714161 -3600
|
||||
# Mon May 07 18:29:21 2018 +0100
|
||||
# Node ID afb31413c73cbc06420fdb447aa90a7a38258904
|
||||
# Parent bcbc64dfb629c5f188bbf59b8f986ad95963ed60
|
||||
8143245, PR3548: Zero build requires disabled warnings
|
||||
Reviewed-by: dholmes, coleenp
|
||||
|
||||
diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
|
||||
--- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make
|
||||
+++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
|
||||
@@ -1,5 +1,5 @@
|
||||
#
|
||||
-# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
+# Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright 2007, 2008 Red Hat, Inc.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
@@ -29,11 +29,6 @@
|
||||
ifeq ($(USE_CLANG), true)
|
||||
WARNING_FLAGS += -Wno-undef
|
||||
endif
|
||||
-# Suppress some warning flags that are normally turned on for hotspot,
|
||||
-# because some of the zero code has not been updated accordingly.
|
||||
-WARNING_FLAGS += -Wno-return-type \
|
||||
- -Wno-format-nonliteral -Wno-format-security \
|
||||
- -Wno-maybe-uninitialized
|
||||
|
||||
# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
|
||||
OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
|
||||
diff --git openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
|
||||
--- openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
|
||||
+++ openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
|
||||
@@ -100,7 +100,7 @@
|
||||
case T_DOUBLE:
|
||||
case T_VOID:
|
||||
return result;
|
||||
- default : ShouldNotReachHere();
|
||||
+ default : ShouldNotReachHere(); return NULL_WORD;
|
||||
}
|
||||
}
|
||||
|
||||
diff --git openjdk.orig/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp openjdk/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
|
||||
--- openjdk.orig/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
|
||||
+++ openjdk/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||
+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright 2007, 2008, 2010 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
@@ -62,7 +62,7 @@
|
||||
}
|
||||
|
||||
void InterpreterRuntime::SignatureHandlerGeneratorBase::push(BasicType type) {
|
||||
- ffi_type *ftype;
|
||||
+ ffi_type *ftype = NULL;
|
||||
switch (type) {
|
||||
case T_VOID:
|
||||
ftype = &ffi_type_void;
|
||||
diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
|
||||
--- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
|
||||
+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
- * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
|
||||
+ * Copyright 2016 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@@ -61,6 +61,7 @@
|
||||
|
||||
frame os::get_sender_for_C_frame(frame* fr) {
|
||||
ShouldNotCallThis();
|
||||
+ return frame(NULL, NULL); // silence compile warning.
|
||||
}
|
||||
|
||||
frame os::current_frame() {
|
||||
@@ -98,16 +99,19 @@
|
||||
|
||||
address os::Linux::ucontext_get_pc(ucontext_t* uc) {
|
||||
ShouldNotCallThis();
|
||||
+ return NULL; // silence compile warnings
|
||||
}
|
||||
|
||||
ExtendedPC os::fetch_frame_from_context(void* ucVoid,
|
||||
intptr_t** ret_sp,
|
||||
intptr_t** ret_fp) {
|
||||
ShouldNotCallThis();
|
||||
+ return NULL; // silence compile warnings
|
||||
}
|
||||
|
||||
frame os::fetch_frame_from_context(void* ucVoid) {
|
||||
ShouldNotCallThis();
|
||||
+ return frame(NULL, NULL); // silence compile warnings
|
||||
}
|
||||
|
||||
extern "C" JNIEXPORT int
|
||||
@@ -247,11 +251,16 @@
|
||||
}
|
||||
#endif // !PRODUCT
|
||||
|
||||
- const char *fmt = "caught unhandled signal %d";
|
||||
char buf[64];
|
||||
|
||||
- sprintf(buf, fmt, sig);
|
||||
+ sprintf(buf, "caught unhandled signal %d", sig);
|
||||
+
|
||||
+// Silence -Wformat-security warning for fatal()
|
||||
+PRAGMA_DIAG_PUSH
|
||||
+PRAGMA_FORMAT_NONLITERAL_IGNORED
|
||||
fatal(buf);
|
||||
+PRAGMA_DIAG_POP
|
||||
+ return true; // silence compiler warnings
|
||||
}
|
||||
|
||||
void os::Linux::init_thread_fpu_state(void) {
|
||||
@@ -260,6 +269,7 @@
|
||||
|
||||
int os::Linux::get_fpu_control_word() {
|
||||
ShouldNotCallThis();
|
||||
+ return -1; // silence compile warnings
|
||||
}
|
||||
|
||||
void os::Linux::set_fpu_control_word(int fpu) {
|
||||
@@ -408,6 +418,7 @@
|
||||
|
||||
extern "C" {
|
||||
int SpinPause() {
|
||||
+ return -1; // silence compile warnings
|
||||
}
|
||||
|
||||
|
||||
diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
|
||||
--- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
|
||||
+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
+ * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
@@ -110,6 +110,7 @@
|
||||
void* ucontext,
|
||||
bool isInJava) {
|
||||
ShouldNotCallThis();
|
||||
+ return false; // silence compile warning
|
||||
}
|
||||
|
||||
// These routines are only used on cpu architectures that
|
||||
32
8197981-pr3548.patch
Normal file
32
8197981-pr3548.patch
Normal file
@ -0,0 +1,32 @@
|
||||
# HG changeset patch
|
||||
# User andrew
|
||||
# Date 1518667645 0
|
||||
# Thu Feb 15 04:07:25 2018 +0000
|
||||
# Node ID 1d35411eb7bdf16191e220ffe3b1dc4d5d0c6041
|
||||
# Parent 999983606f5c61b093c6f6316a7b26c4cd4ca79e
|
||||
8197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8
|
||||
Summary: Fix issue discovered by -Wreturn-type on systems without LP64.
|
||||
Reviewed-by: aph
|
||||
|
||||
diff --git openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
|
||||
--- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
|
||||
+++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
|
||||
@@ -457,6 +457,7 @@
|
||||
long long unsigned int oldval,
|
||||
long long unsigned int newval) {
|
||||
ShouldNotCallThis();
|
||||
+ return 0;
|
||||
}
|
||||
};
|
||||
#endif // !_LP64
|
||||
diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
|
||||
--- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
|
||||
+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
|
||||
@@ -498,6 +498,7 @@
|
||||
long long unsigned int oldval,
|
||||
long long unsigned int newval) {
|
||||
ShouldNotCallThis();
|
||||
+ return 0;
|
||||
}
|
||||
};
|
||||
#endif // !_LP64
|
||||
@ -920,7 +920,7 @@ Provides: java-%{javaver}-%{origin}-accessibility = %{epoch}:%{version}-%{releas
|
||||
|
||||
Name: java-%{javaver}-%{origin}
|
||||
Version: %{javaver}.%{updatever}
|
||||
Release: 10.%{buildver}%{?dist}
|
||||
Release: 11.%{buildver}%{?dist}
|
||||
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
|
||||
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
|
||||
# also included the epoch in their virtual provides. This created a
|
||||
@ -1038,9 +1038,11 @@ Patch523: pr2974-rh1337583.patch
|
||||
Patch528: pr3083-rh1346460.patch
|
||||
# RH1566890: CVE-2018-3639
|
||||
Patch529: rh1566890_embargoed20180521.patch
|
||||
# PR3601: Fix additional -Wreturn-type issues introduced by 8061651
|
||||
Patch530: pr3601.patch
|
||||
# 8196516, RH1538767: libfontmanager.so needs to be built with LDFLAGS so as to allow
|
||||
# linking with unresolved symbols.
|
||||
Patch530: rhbz_1538767_fix_linking.patch
|
||||
Patch531: rhbz_1538767_fix_linking.patch
|
||||
|
||||
#############################################
|
||||
#
|
||||
@ -1064,8 +1066,8 @@ Patch103: pr3593-s390-size_t_format_flags.patch
|
||||
Patch104: pr3458-rh1540242-aarch64.patch
|
||||
# x86: S8199936, PR3533: HotSpot generates code with unaligned stack, crashes on SSE operations (-mstackrealign workaround)
|
||||
Patch105: 8199936-pr3533-workaround.patch
|
||||
# Zero: Fix more cases of missing return statements
|
||||
Patch106: pr3458-rh1540242-zero.patch
|
||||
# AArch64: PR3519: Fix further functions with a missing return value (AArch64)
|
||||
Patch106: pr3519.patch
|
||||
|
||||
#############################################
|
||||
#
|
||||
@ -1120,6 +1122,16 @@ Patch570: 8165489-pr3589.patch
|
||||
Patch571: pr3591.patch
|
||||
# 8184309, PR3596: Build warnings from GCC 7.1 on Fedora 26
|
||||
Patch572: 8184309-pr3596.patch
|
||||
# 8141570, PR3548: Fix Zero interpreter build for --disable-precompiled-headers
|
||||
Patch573: 8141570-pr3548.patch
|
||||
# 8143245, PR3548: Zero build requires disabled warnings
|
||||
Patch574: 8143245-pr3548.patch
|
||||
# 8197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8
|
||||
Patch575: 8197981-pr3548.patch
|
||||
# 8064786, PR3599: Fix debug build after 8062808: Turn on the -Wreturn-type warning
|
||||
Patch576: 8064786-pr3599.patch
|
||||
# 8062808, PR3548: Turn on the -Wreturn-type warning
|
||||
Patch577: 8062808-pr3548.patch
|
||||
|
||||
#############################################
|
||||
#
|
||||
@ -1509,6 +1521,7 @@ sh %{SOURCE12}
|
||||
%else
|
||||
%patch104
|
||||
%endif
|
||||
%patch106
|
||||
|
||||
# x86 fixes
|
||||
%patch105
|
||||
@ -1518,9 +1531,6 @@ sh %{SOURCE12}
|
||||
%patch601
|
||||
%patch602
|
||||
|
||||
# Zero fixes.
|
||||
%patch106
|
||||
|
||||
# Upstreamable fixes
|
||||
%patch502
|
||||
%patch504
|
||||
@ -1542,10 +1552,11 @@ sh %{SOURCE12}
|
||||
%patch526
|
||||
%patch528
|
||||
%patch529
|
||||
%patch530
|
||||
%patch538
|
||||
%patch560
|
||||
pushd openjdk/jdk
|
||||
%patch530 -p1
|
||||
%patch531 -p1
|
||||
popd
|
||||
%patch561
|
||||
%patch562
|
||||
@ -1557,6 +1568,11 @@ popd
|
||||
%patch569
|
||||
%patch571
|
||||
%patch572
|
||||
%patch573
|
||||
%patch574
|
||||
%patch575
|
||||
%patch576
|
||||
%patch577
|
||||
|
||||
# RPM-only fixes
|
||||
%patch525
|
||||
@ -2215,6 +2231,14 @@ require "copy_jdk_configs.lua"
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Jun 20 2018 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.172-11.b11
|
||||
- Add additional fix (PR3601) to fix -Wreturn-type failures introduced by 8061651
|
||||
- Backport 8064786 (PR3601) to fix -Wreturn-type failure on debug builds.
|
||||
- Bring in PR3519 from IcedTea 3.7.0 to fix remaining -Wreturn-type failure on AArch64.
|
||||
- Sync with IcedTea 3.8.0 patches to use -Wreturn-type.
|
||||
- Add backports of 8141570, 8143245, 8197981 & 8062808.
|
||||
- Drop pr3458-rh1540242-zero.patch which is covered by 8143245.
|
||||
|
||||
* Wed Jun 20 2018 Jiri Vanek <jvanek@redhat.com> - 11:1.8.0.172-10.b11
|
||||
- jsa files changed to 444 to pass rpm verification
|
||||
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
diff --git a/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
|
||||
--- openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
|
||||
+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
|
||||
@@ -408,6 +408,7 @@
|
||||
|
||||
extern "C" {
|
||||
int SpinPause() {
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
|
||||
19
pr3519.patch
Normal file
19
pr3519.patch
Normal file
@ -0,0 +1,19 @@
|
||||
# HG changeset patch
|
||||
# User andrew
|
||||
# Date 1518669922 0
|
||||
# Thu Feb 15 04:45:22 2018 +0000
|
||||
# Node ID adaf109718c10888cce5b6e73af7f3e15a7ab0db
|
||||
# Parent 3ade0115344b77e6d00462044e0cf68722685bfe
|
||||
PR3519: Fix further functions with a missing return value.
|
||||
|
||||
diff --git openjdk.orig/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp openjdk/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
|
||||
--- openjdk.orig/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
|
||||
+++ openjdk/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
|
||||
@@ -205,6 +205,7 @@
|
||||
return Address(base, tmp, Address::lsl(addr->scale()));
|
||||
}
|
||||
}
|
||||
+ return Address();
|
||||
}
|
||||
|
||||
Address LIR_Assembler::as_Address_hi(LIR_Address* addr) {
|
||||
38
pr3601.patch
Normal file
38
pr3601.patch
Normal file
@ -0,0 +1,38 @@
|
||||
# HG changeset patch
|
||||
# User andrew
|
||||
# Date 1529475043 -3600
|
||||
# Wed Jun 20 07:10:43 2018 +0100
|
||||
# Node ID f6341f4635dacb56678264d29a88cd052b74036b
|
||||
# Parent 30520d5018b509b0ae68f5fcc9a5c540e3e5b2de
|
||||
PR3601: Fix additional -Wreturn-type issues introduced by 8061651
|
||||
|
||||
diff --git openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp openjdk/hotspot/src/share/vm/prims/jvm.cpp
|
||||
--- openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp
|
||||
+++ openjdk/hotspot/src/share/vm/prims/jvm.cpp
|
||||
@@ -835,7 +835,7 @@
|
||||
JVM_ENTRY(jboolean, JVM_KnownToNotExist(JNIEnv *env, jobject loader, const char *classname))
|
||||
JVMWrapper("JVM_KnownToNotExist");
|
||||
#if INCLUDE_CDS
|
||||
- return ClassLoaderExt::known_to_not_exist(env, loader, classname, CHECK_(false));
|
||||
+ return ClassLoaderExt::known_to_not_exist(env, loader, classname, THREAD);
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
@@ -845,7 +845,7 @@
|
||||
JVM_ENTRY(jobjectArray, JVM_GetResourceLookupCacheURLs(JNIEnv *env, jobject loader))
|
||||
JVMWrapper("JVM_GetResourceLookupCacheURLs");
|
||||
#if INCLUDE_CDS
|
||||
- return ClassLoaderExt::get_lookup_cache_urls(env, loader, CHECK_NULL);
|
||||
+ return ClassLoaderExt::get_lookup_cache_urls(env, loader, THREAD);
|
||||
#else
|
||||
return NULL;
|
||||
#endif
|
||||
@@ -855,7 +855,7 @@
|
||||
JVM_ENTRY(jintArray, JVM_GetResourceLookupCache(JNIEnv *env, jobject loader, const char *resource_name))
|
||||
JVMWrapper("JVM_GetResourceLookupCache");
|
||||
#if INCLUDE_CDS
|
||||
- return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, CHECK_NULL);
|
||||
+ return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, THREAD);
|
||||
#else
|
||||
return NULL;
|
||||
#endif
|
||||
Loading…
Reference in New Issue
Block a user