[aarch64-port-dev ] Merge JDK8 -> JDK9

[Andrew Haley]

On 07/17/2014 11:10 AM, Cao Hoang Thu wrote:
> No, I don't think JDK problem. Because I cross-compile OpenJDK8 ok, so I ask about cross-compile on OpenJDK7/OpenJDK9

I'm cross-compiling JDK9 OK.  I found one bug building JDK9, and it is
fixed by this patch.  I don't know if that's the correct fix, though.



diff -r 7adc2f18b573 make/common/NativeCompilation.gmk
--- a/make/common/NativeCompilation.gmk Fri May 16 11:41:46 2014 -0400
+++ b/make/common/NativeCompilation.gmk Thu Jul 17 11:25:25 2014 +0100
@@ -370,8 +370,8 @@
   endif

   # Add sys root specific cflags last
-  $1_EXTRA_CFLAGS += $(SYSROOT_CFLAGS)
-  $1_EXTRA_CXXFLAGS += $(SYSROOT_CFLAGS)
+  # $1_EXTRA_CFLAGS += $(SYSROOT_CFLAGS)
+  # $1_EXTRA_CXXFLAGS += $(SYSROOT_CFLAGS)

   # Now call add_native_source for each source file we are going to compile.
   $$(foreach p,$$($1_SRCS), \
@@ -418,7 +418,7 @@
     $1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE))
   endif

-  $1_EXTRA_LDFLAGS += $(SYSROOT_LDFLAGS)
+  # $1_EXTRA_LDFLAGS += $(SYSROOT_LDFLAGS)

   # Need to make sure TARGET is first on list
   $1 := $$($1_TARGET)