RFR (XS) 8216589: s390x build failures after JDK-8216167 (Update include guards to reflect correct directories)

[Aleksey Shipilev]

Bug:
  https://bugs.openjdk.java.net/browse/JDK-8216589

Fix:

diff -r 2969ff55c29b src/hotspot/cpu/s390/codeBuffer_s390.hpp
--- a/src/hotspot/cpu/s390/codeBuffer_s390.hpp  Fri Jan 11 14:24:23 2019 -0800
+++ b/src/hotspot/cpu/s390/codeBuffer_s390.hpp  Sat Jan 12 13:22:19 2019 +0100
@@ -32,7 +32,6 @@
  public:
   void flush_bundle(bool start_new_bundle) {}

   void getCpuData(const CodeBuffer * const cb) {}

-#endif // CPU_S390_VM_CODEBUFFER_S390_HPP
 #endif // CPU_S390_CODEBUFFER_S390_HPP
diff -r 2969ff55c29b src/hotspot/os_cpu/linux_s390/globals_linux_s390.hpp
--- a/src/hotspot/os_cpu/linux_s390/globals_linux_s390.hpp      Fri Jan 11 14:24:23 2019 -0800
+++ b/src/hotspot/os_cpu/linux_s390/globals_linux_s390.hpp      Sat Jan 12 13:22:19 2019 +0100
@@ -47,7 +47,6 @@
 define_pd_global(size_t, JVMInvokeMethodSlack,    8192);

 // Only used on 64 bit platforms.
 define_pd_global(size_t, HeapBaseMinAddress,      2*G);

-#endif // OS_CPU_LINUX_S390_VM_GLOBALS_LINUX_S390_HPP
 #endif // OS_CPU_LINUX_S390_GLOBALS_LINUX_S390_HPP


Verified no other files like that exist by running:
 $ find src/hotspot -type f -exec grep -H HPP$ {} \; | grep endif | cut -d":" -f 1 | sort | uniq -d

Testing: s390x {fastdebug,release} cross-compile, x86_64 compile, grepping source

Thanks,
-Aleksey