# HG changeset patch
# User glaubitz
# Date 1504042300 -7200
#      Tue Aug 29 23:31:40 2017 +0200
# Node ID 5a95f276d3603d5f93d37cf4e1c21819a65a9530
# Parent  182f9c89e3376174e82ef58e00021cce431b9d0b
8186578: Zero fails to build on linux-sparc due to sparc-specific code

diff --git a/src/share/vm/compiler/oopMap.cpp b/src/share/vm/compiler/oopMap.cpp
--- a/src/share/vm/compiler/oopMap.cpp
+++ b/src/share/vm/compiler/oopMap.cpp
@@ -40,9 +40,6 @@
 #ifdef COMPILER2
 #include "opto/optoreg.hpp"
 #endif
-#ifdef SPARC
-#include "vmreg_sparc.inline.hpp"
-#endif
 
 // OopMapStream
 
diff --git a/src/cpu/sparc/vm/memset_with_concurrent_readers_sparc.cpp b/src/share/vm/gc/shared/memset_with_concurrent_readers_sparc.cpp
rename from src/cpu/sparc/vm/memset_with_concurrent_readers_sparc.cpp
rename to src/share/vm/gc/shared/memset_with_concurrent_readers_sparc.cpp
--- a/src/cpu/sparc/vm/memset_with_concurrent_readers_sparc.cpp
+++ b/src/share/vm/gc/shared/memset_with_concurrent_readers_sparc.cpp
@@ -22,6 +22,8 @@
  *
  */
 
+#ifdef SPARC
+
 #include "precompiled.hpp"
 
 #include "gc/shared/memset_with_concurrent_readers.hpp"
@@ -158,3 +160,5 @@
 }
 
 #endif // INCLUDE_ALL_GCS
+
+#endif // SPARC