changeset 49631:c96f6f8984f7

8200302: ppc, s390 (non-pch) build errors Reviewed-by: coleenp, lfoltan
author stuefe
date Tue, 27 Mar 2018 18:31:25 +0200
parents 5ef28d560b6f
children 5555ba8fcc5c
files src/hotspot/cpu/ppc/frame_ppc.hpp src/hotspot/cpu/ppc/nativeInst_ppc.cpp src/hotspot/cpu/s390/frame_s390.hpp src/hotspot/os_cpu/aix_ppc/thread_aix_ppc.cpp
diffstat 4 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/cpu/ppc/frame_ppc.hpp	Tue Mar 27 11:53:23 2018 -0400
+++ b/src/hotspot/cpu/ppc/frame_ppc.hpp	Tue Mar 27 18:31:25 2018 +0200
@@ -384,7 +384,7 @@
 
   // Constructors
   inline frame(intptr_t* sp);
-  frame(intptr_t* sp, address pc);
+  inline frame(intptr_t* sp, address pc);
   inline frame(intptr_t* sp, address pc, intptr_t* unextended_sp);
 
  private:
--- a/src/hotspot/cpu/ppc/nativeInst_ppc.cpp	Tue Mar 27 11:53:23 2018 -0400
+++ b/src/hotspot/cpu/ppc/nativeInst_ppc.cpp	Tue Mar 27 18:31:25 2018 +0200
@@ -30,6 +30,7 @@
 #include "oops/compressedOops.inline.hpp"
 #include "oops/oop.hpp"
 #include "runtime/handles.hpp"
+#include "runtime/orderAccess.inline.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "utilities/ostream.hpp"
--- a/src/hotspot/cpu/s390/frame_s390.hpp	Tue Mar 27 11:53:23 2018 -0400
+++ b/src/hotspot/cpu/s390/frame_s390.hpp	Tue Mar 27 18:31:25 2018 +0200
@@ -465,10 +465,10 @@
  // Constructors
 
  public:
-  frame(intptr_t* sp);
+  inline frame(intptr_t* sp);
   // To be used, if sp was not extended to match callee's calling convention.
-  frame(intptr_t* sp, address pc);
-  frame(intptr_t* sp, address pc, intptr_t* unextended_sp);
+  inline frame(intptr_t* sp, address pc);
+  inline frame(intptr_t* sp, address pc, intptr_t* unextended_sp);
 
   // Access frame via stack pointer.
   inline intptr_t* sp_addr_at(int index) const  { return &sp()[index]; }
--- a/src/hotspot/os_cpu/aix_ppc/thread_aix_ppc.cpp	Tue Mar 27 11:53:23 2018 -0400
+++ b/src/hotspot/os_cpu/aix_ppc/thread_aix_ppc.cpp	Tue Mar 27 18:31:25 2018 +0200
@@ -24,7 +24,7 @@
  */
 
 #include "precompiled.hpp"
-#include "runtime/frame.hpp"
+#include "runtime/frame.inline.hpp"
 #include "runtime/thread.hpp"
 
 frame JavaThread::pd_last_frame() {