--- a/src/hotspot/share/utilities/globalDefinitions_gcc.hpp.ORIG	2019-05-03 02:43:26.000000000 +0200
+++ b/src/hotspot/share/utilities/globalDefinitions_gcc.hpp	2019-08-10 10:37:53.487458858 +0200
@@ -283,6 +283,6 @@
 // GCC versions older than 4.6.4 would fail even with "+0", and needs additional
 // cast to typeof(x) to work around the similar bug.
 //
-#define ATTRIBUTE_ALIGNED(x) __attribute__((aligned((typeof(x))x+0)))
+#define ATTRIBUTE_ALIGNED(x) __attribute__((aligned((__typeof__(x))x+0)))
 
 #endif // SHARE_VM_UTILITIES_GLOBALDEFINITIONS_GCC_HPP
--- a/src/jdk.pack/share/native/common-unpack/constants.h.ORIG	2019-05-03 02:43:26.000000000 +0200
+++ b/src/jdk.pack/share/native/common-unpack/constants.h	2019-08-10 12:49:12.166752655 +0200
@@ -203,7 +203,7 @@
     AO_HAVE_FIELD_FLAGS_HI    = 1<<10,
     AO_HAVE_METHOD_FLAGS_HI   = 1<<11,
     AO_HAVE_CODE_FLAGS_HI     = 1<<12,
-    AO_UNUSED_MBZ             = (-1)<<13, // options bits reserved for future use.
+    AO_UNUSED_MBZ             = 0xfffe000, // (-1)<<13, // options bits reserved for future use.
 
 #define ARCHIVE_BIT_DO(F) \
          F(AO_HAVE_SPECIAL_FORMATS) \