RFR (XS) 8202134: Non-PCH build for arm32 fails

[Aleksey Shipilev]

On 04/23/2018 11:06 AM, Aleksey Shipilev wrote:
> Current arm32 jdk/jdk fails to build without PCH.
> 
> Bug (with sample build failures):
>   https://bugs.openjdk.java.net/browse/JDK-8202134
> 
> Fix:
> 
> diff -r ac761df837c7 src/hotspot/cpu/arm/methodHandles_arm.cpp
> --- a/src/hotspot/cpu/arm/methodHandles_arm.cpp	Thu Apr 19 12:02:38 2018 +0200
> +++ b/src/hotspot/cpu/arm/methodHandles_arm.cpp	Mon Apr 23 10:55:07 2018 +0200
> @@ -35,6 +35,7 @@
>  #include "memory/resourceArea.hpp"
>  #include "prims/methodHandles.hpp"
>  #include "runtime/frame.inline.hpp"
> +#include "utilities/preserveException.hpp"
> 
>  #define __ _masm->
> 
> diff -r ac761df837c7 src/hotspot/cpu/arm/nativeInst_arm_32.hpp
> --- a/src/hotspot/cpu/arm/nativeInst_arm_32.hpp	Thu Apr 19 12:02:38 2018 +0200
> +++ b/src/hotspot/cpu/arm/nativeInst_arm_32.hpp	Mon Apr 23 10:55:07 2018 +0200
> @@ -28,6 +28,7 @@
>  #include "asm/macroAssembler.hpp"
>  #include "code/codeCache.hpp"
>  #include "runtime/icache.hpp"
> +#include "runtime/orderAccess.inline.hpp"
>  #include "runtime/os.hpp"
>  #include "runtime/thread.hpp"
>  #include "register_arm.hpp"

Actually, .inline.hpp is better be in the .cpp that failed to build, not in the header itself:


diff -r fcd5df7aa235 src/hotspot/cpu/arm/methodHandles_arm.cpp
--- a/src/hotspot/cpu/arm/methodHandles_arm.cpp	Wed Apr 18 11:19:32 2018 +0200
+++ b/src/hotspot/cpu/arm/methodHandles_arm.cpp	Mon Apr 23 11:13:32 2018 +0200
@@ -35,6 +35,7 @@
 #include "memory/resourceArea.hpp"
 #include "prims/methodHandles.hpp"
 #include "runtime/frame.inline.hpp"
+#include "utilities/preserveException.hpp"

 #define __ _masm->

diff -r fcd5df7aa235 src/hotspot/cpu/arm/relocInfo_arm.cpp
--- a/src/hotspot/cpu/arm/relocInfo_arm.cpp	Wed Apr 18 11:19:32 2018 +0200
+++ b/src/hotspot/cpu/arm/relocInfo_arm.cpp	Mon Apr 23 11:13:32 2018 +0200
@@ -29,6 +29,7 @@
 #include "nativeInst_arm.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/oop.hpp"
+#include "runtime/orderAccess.inline.hpp"
 #include "runtime/safepoint.hpp"

 void Relocation::pd_set_data_value(address x, intptr_t o, bool verify_only) {


Thanks,
-Aleksey