Blame SOURCES/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch

4ca1da
# HG changeset patch
4ca1da
# User sgehwolf
4ca1da
# Date 1525714161 -3600
4ca1da
#      Mon May 07 18:29:21 2018 +0100
4ca1da
# Node ID afb31413c73cbc06420fdb447aa90a7a38258904
4ca1da
# Parent  bcbc64dfb629c5f188bbf59b8f986ad95963ed60
4ca1da
8143245, PR3548: Zero build requires disabled warnings
4ca1da
Reviewed-by: dholmes, coleenp
4ca1da
4ca1da
diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
4ca1da
--- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make
4ca1da
+++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
4ca1da
@@ -1,5 +1,5 @@
4ca1da
 #
4ca1da
-# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
4ca1da
+# Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
4ca1da
 # Copyright 2007, 2008 Red Hat, Inc.
4ca1da
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4ca1da
 #
d05dfb
@@ -29,12 +29,7 @@
d05dfb
 ifeq ($(JVM_VARIANT_ZEROSHARK), true)
4ca1da
   WARNING_FLAGS += -Wno-undef
4ca1da
 endif
4ca1da
-# Suppress some warning flags that are normally turned on for hotspot,
4ca1da
-# because some of the zero code has not been updated accordingly.
4ca1da
-WARNING_FLAGS += -Wno-return-type \
4ca1da
-  -Wno-format-nonliteral -Wno-format-security \
4ca1da
-  -Wno-maybe-uninitialized
d05dfb
- 
d05dfb
+
4ca1da
 
7305c2
 # If FDLIBM_CFLAGS is non-empty it holds CFLAGS needed to be passed to
7305c2
 # the compiler so as to be able to produce optimized objects
4ca1da
diff --git openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
4ca1da
--- openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
4ca1da
+++ openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
5d19fd
@@ -102,7 +102,7 @@
4ca1da
       return result;
5d19fd
     default:
5d19fd
       ShouldNotReachHere();
5d19fd
-      return result; // silence compiler warnings
5d19fd
+      return NULL_WORD; // silence compiler warnings
4ca1da
   }
4ca1da
 }
4ca1da
 
4ca1da
diff --git openjdk.orig/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp openjdk/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
4ca1da
--- openjdk.orig/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
4ca1da
+++ openjdk/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
4ca1da
@@ -1,5 +1,5 @@
4ca1da
 /*
4ca1da
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
4ca1da
+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
4ca1da
  * Copyright 2007, 2008, 2010 Red Hat, Inc.
4ca1da
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4ca1da
  *
4ca1da
@@ -62,7 +62,7 @@
4ca1da
 }
4ca1da
 
4ca1da
 void InterpreterRuntime::SignatureHandlerGeneratorBase::push(BasicType type) {
4ca1da
-  ffi_type *ftype;
4ca1da
+  ffi_type *ftype = NULL;
4ca1da
   switch (type) {
4ca1da
   case T_VOID:
4ca1da
     ftype = &ffi_type_void;
7305c2
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
4ca1da
--- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
4ca1da
+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
4ca1da
@@ -1,6 +1,6 @@
4ca1da
 /*
4ca1da
  * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
4ca1da
- * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
4ca1da
+ * Copyright 2016 Red Hat, Inc.
4ca1da
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4ca1da
  *
4ca1da
  * This code is free software; you can redistribute it and/or modify it
4ca1da
@@ -61,6 +61,7 @@
4ca1da
 
4ca1da
 frame os::get_sender_for_C_frame(frame* fr) {
4ca1da
   ShouldNotCallThis();
4ca1da
+  return frame(NULL, NULL); // silence compile warning.
4ca1da
 }
4ca1da
 
4ca1da
 frame os::current_frame() {
4ca1da
@@ -98,16 +99,19 @@
4ca1da
 
4ca1da
 address os::Linux::ucontext_get_pc(ucontext_t* uc) {
4ca1da
   ShouldNotCallThis();
4ca1da
+  return NULL; // silence compile warnings
4ca1da
 }
4ca1da
 
4ca1da
 ExtendedPC os::fetch_frame_from_context(void* ucVoid,
4ca1da
                                         intptr_t** ret_sp,
4ca1da
                                         intptr_t** ret_fp) {
4ca1da
   ShouldNotCallThis();
4ca1da
+  return NULL; // silence compile warnings
4ca1da
 }
4ca1da
 
4ca1da
 frame os::fetch_frame_from_context(void* ucVoid) {
4ca1da
   ShouldNotCallThis();
4ca1da
+  return frame(NULL, NULL); // silence compile warnings
4ca1da
 }
4ca1da
 
4ca1da
 extern "C" JNIEXPORT int
4ca1da
@@ -247,11 +251,16 @@
4ca1da
   }
4ca1da
 #endif // !PRODUCT
4ca1da
 
4ca1da
-  const char *fmt = "caught unhandled signal %d";
4ca1da
   char buf[64];
4ca1da
 
4ca1da
-  sprintf(buf, fmt, sig);
4ca1da
+  sprintf(buf, "caught unhandled signal %d", sig);
4ca1da
+
4ca1da
+// Silence -Wformat-security warning for fatal()
4ca1da
+PRAGMA_DIAG_PUSH
4ca1da
+PRAGMA_FORMAT_NONLITERAL_IGNORED
4ca1da
   fatal(buf);
4ca1da
+PRAGMA_DIAG_POP
4ca1da
+  return true; // silence compiler warnings
4ca1da
 }
4ca1da
 
4ca1da
 void os::Linux::init_thread_fpu_state(void) {
4ca1da
@@ -260,6 +269,7 @@
4ca1da
 
4ca1da
 int os::Linux::get_fpu_control_word() {
4ca1da
   ShouldNotCallThis();
4ca1da
+  return -1; // silence compile warnings
4ca1da
 }
4ca1da
 
4ca1da
 void os::Linux::set_fpu_control_word(int fpu) {
4ca1da
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
4ca1da
--- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
4ca1da
+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
4ca1da
@@ -1,5 +1,5 @@
4ca1da
 /*
4ca1da
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
4ca1da
+ * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
4ca1da
  * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
4ca1da
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4ca1da
  *
4ca1da
@@ -110,6 +110,7 @@
4ca1da
                                            void* ucontext,
4ca1da
                                            bool isInJava) {
4ca1da
     ShouldNotCallThis();
4ca1da
+    return false; // silence compile warning
4ca1da
   }
4ca1da
 
0382ac
   bool pd_get_top_frame_for_profiling(frame* fr_addr,