use native ecj, comment some patches

15 files changed, 44 insertions, 19 deletions

diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index 56097f6f8..ad8f29778 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -99,11 +99,13 @@ CONFIGURE_ARGS+=	--disable-docs \
 
 CONFIGURE_ENV+=		PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}:${STAGING_TARGET_DIR}/usr/bin
 MAKE_ENV+=		ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
+			ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \
 			PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}:${STAGING_TARGET_DIR}/usr/bin \
 			GCC_HONOUR_COPTS=s \
 			TARGET_ALIAS=$(GNU_TARGET_NAME) BUILD_ALIAS=$(GNU_HOST_NAME) HOST_ALIAS=$(GNU_TARGET_NAME)
 
 OPENJDK_NATIVE_ENV+=	ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
+			ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \
 			PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}:${STAGING_TARGET_DIR}/usr/bin \
 			GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(ARCH) \
 			TARGET_ALIAS=$(GNU_TARGET_NAME) BUILD_ALIAS=$(GNU_HOST_NAME) HOST_ALIAS=$(GNU_TARGET_NAME)
diff --git a/package/openjdk/patches/cross-compile.patch b/package/openjdk/patches/cross-compile.patch
index afc00b032..604b5d6cb 100644
--- a/package/openjdk/patches/cross-compile.patch
+++ b/package/openjdk/patches/cross-compile.patch
@@ -1,3 +1,6 @@
+
+ disable wrong pathes to /usr, fix cross-compile
+
 --- w-openjdk-6-1.orig/openjdk-6/jdk/make/sun/awt/Makefile	2011-02-28 17:06:11.000000000 +0100
 +++ w-openjdk-6-1/openjdk-6/jdk/make/sun/awt/Makefile	2011-08-07 17:00:37.676468717 +0200
 @@ -509,10 +509,7 @@
diff --git a/package/openjdk/patches/disable-backtrace.patch b/package/openjdk/patches/disable-backtrace.patch
index b54c95741..f3d1424c1 100644
--- a/package/openjdk/patches/disable-backtrace.patch
+++ b/package/openjdk/patches/disable-backtrace.patch
@@ -1,3 +1,6 @@
+
+ uClibc does not have backtrace support right now. Disable it for now.
+
 --- w-openjdk-6-1.orig/openjdk-6/jdk/src/solaris/native/sun/xawt/XToolkit.c	2011-02-28 17:06:50.000000000 +0100
 +++ w-openjdk-6-1/openjdk-6/jdk/src/solaris/native/sun/xawt/XToolkit.c	2011-08-08 10:45:01.445330729 +0200
 @@ -27,9 +27,6 @@
diff --git a/package/openjdk/patches/disable-freetype-check.patch b/package/openjdk/patches/disable-freetype-check.patch
index 5f5f6cf83..cde23910d 100644
--- a/package/openjdk/patches/disable-freetype-check.patch
+++ b/package/openjdk/patches/disable-freetype-check.patch
@@ -1,4 +1,7 @@
---- w-openjdk-6-1.orig/openjdk-6.orig/jdk/make/common/shared/Sanity.gmk	2011-02-28 17:06:10.000000000 +0100
+
+ disable freetype sanity check, not cross-compile safe.
+
+--- w-openjdk-6-1.orig/openjdk-6/jdk/make/common/shared/Sanity.gmk	2011-02-28 17:06:10.000000000 +0100
 +++ w-openjdk-6-1/openjdk-6/jdk/make/common/shared/Sanity.gmk	2011-04-05 14:05:29.691807661 +0200
 @@ -793,7 +793,7 @@
  # Check for availability of FreeType (OpenJDK specific)
diff --git a/package/openjdk/patches/disable-gamma.patch b/package/openjdk/patches/disable-gamma.patch
index 92a80b3be..5dc1b2723 100644
--- a/package/openjdk/patches/disable-gamma.patch
+++ b/package/openjdk/patches/disable-gamma.patch
@@ -1,3 +1,6 @@
+
+ Fails when cross-compilation is done, disable it.
+
 --- w-openjdk-6-1.orig/openjdk-6/hotspot/make/linux/makefiles/buildtree.make	2011-02-28 17:03:13.000000000 +0100
 +++ w-openjdk-6-1/openjdk-6/hotspot/make/linux/makefiles/buildtree.make	2011-04-11 12:47:31.000000000 +0200
 @@ -352,12 +352,8 @@
diff --git a/package/openjdk/patches/dlopen-RTLD_NOLOAD.patch b/package/openjdk/patches/dlopen-RTLD_NOLOAD.patch
index 1baf3411b..cd228391b 100644
--- a/package/openjdk/patches/dlopen-RTLD_NOLOAD.patch
+++ b/package/openjdk/patches/dlopen-RTLD_NOLOAD.patch
@@ -1,5 +1,7 @@
-the option RTLOD_NOLOAD is not portable. (not available in uClibc)
-https://evolvis.org/scm/viewvc.php/jalimo/trunk/oe-overlay/packages/openjdk/openjdk-6-6b18-1.8/icedtea-jdk-RTLD_NOLOAD.patch?revision=840&view=markup&pathrev=867
+
+ the option RTLOD_NOLOAD is not portable. (not available in uClibc)
+ https://evolvis.org/scm/viewvc.php/jalimo/trunk/oe-overlay/packages/openjdk/openjdk-6-6b18-1.8/icedtea-jdk-RTLD_NOLOAD.patch?revision=840&view=markup&pathrev=867
+
 --- w-openjdk-6.orig/openjdk-6/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c	2011-02-28 17:06:50.000000000 +0100
 +++ w-openjdk-6/openjdk-6/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c	2011-08-10 14:41:26.700571862 +0200
 @@ -51,7 +51,7 @@
diff --git a/package/openjdk/patches/icedtea-arm-mkbc.patch b/package/openjdk/patches/icedtea-arm-mkbc.patch
index 1d481740f..9df3ebbf4 100644
--- a/package/openjdk/patches/icedtea-arm-mkbc.patch
+++ b/package/openjdk/patches/icedtea-arm-mkbc.patch
@@ -1,3 +1,6 @@
+
+ execute mkoffsets via Qemu and build mkbc with the host compiler.
+
 --- w-openjdk-6-1.orig/icedtea6-1.10/patches/arm.patch	2011-02-23 23:32:32.909601440 +0100
 +++ w-openjdk-6-1/icedtea6-1.10/patches/arm.patch	2011-08-09 20:05:56.721765260 +0200
 @@ -25,7 +25,7 @@
diff --git a/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in b/package/openjdk/patches/icedtea6-Makefile_in.patch
index 193e008aa..193e008aa 100644
--- a/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in
+++ b/package/openjdk/patches/icedtea6-Makefile_in.patch
diff --git a/package/openjdk/patches/iconv.patch b/package/openjdk/patches/iconv.patch
index 16a6946f6..b79971930 100644
--- a/package/openjdk/patches/iconv.patch
+++ b/package/openjdk/patches/iconv.patch
@@ -1,17 +1,6 @@
-diff -Nur w-openjdk-6.orig/openjdk-6/hotspot/make/linux/makefiles/gcc.make w-openjdk-6/openjdk-6/hotspot/make/linux/makefiles/gcc.make
---- w-openjdk-6.orig/openjdk-6/hotspot/make/linux/makefiles/gcc.make	2011-02-28 17:03:13.000000000 +0100
-+++ w-openjdk-6/openjdk-6/hotspot/make/linux/makefiles/gcc.make	2011-04-11 18:36:16.837665258 +0200
-@@ -108,9 +108,6 @@
-   CFLAGS += -pipe
- endif
- 
--# Compiler warnings are treated as errors
--WARNINGS_ARE_ERRORS = -Werror
--
- # Except for a few acceptable ones
- # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
- # conversions which might affect the values. To avoid that, we need to turn
-diff -Nur w-openjdk-6.orig/openjdk-6/jdk/make/java/instrument/Makefile w-openjdk-6/openjdk-6/jdk/make/java/instrument/Makefile
+
+ add required linker flags.
+
 --- w-openjdk-6.orig/openjdk-6/jdk/make/java/instrument/Makefile	2011-02-28 17:06:10.000000000 +0100
 +++ w-openjdk-6/openjdk-6/jdk/make/java/instrument/Makefile	2011-04-11 23:14:27.571411016 +0200
 @@ -123,6 +123,8 @@
@@ -23,7 +12,6 @@ diff -Nur w-openjdk-6.orig/openjdk-6/jdk/make/java/instrument/Makefile w-openjdk
  #
  # Add to ambient vpath so we pick up the library files
  #
-diff -Nur w-openjdk-6.orig/openjdk-6/jdk/make/java/npt/Makefile w-openjdk-6/openjdk-6/jdk/make/java/npt/Makefile
 --- w-openjdk-6.orig/openjdk-6/jdk/make/java/npt/Makefile	2011-02-28 17:06:11.000000000 +0100
 +++ w-openjdk-6/openjdk-6/jdk/make/java/npt/Makefile	2011-04-11 23:14:07.017670197 +0200
 @@ -65,6 +65,8 @@
@@ -35,7 +23,6 @@ diff -Nur w-openjdk-6.orig/openjdk-6/jdk/make/java/npt/Makefile w-openjdk-6/open
  # Add -export options to explicitly spell exported symbols
  ifeq ($(PLATFORM), windows)
    OTHER_LCF += -export:nptInitialize -export:nptTerminate
-diff -Nur w-openjdk-6.orig/openjdk-6/jdk/make/sun/splashscreen/Makefile w-openjdk-6/openjdk-6/jdk/make/sun/splashscreen/Makefile
 --- w-openjdk-6.orig/openjdk-6/jdk/make/sun/splashscreen/Makefile	2011-02-28 17:06:12.000000000 +0100
 +++ w-openjdk-6/openjdk-6/jdk/make/sun/splashscreen/Makefile	2011-04-11 23:15:07.221411030 +0200
 @@ -55,6 +55,8 @@
diff --git a/package/openjdk/patches/inc-path.patch b/package/openjdk/patches/inc-path.patch
index 06c006685..4a195f03e 100644
--- a/package/openjdk/patches/inc-path.patch
+++ b/package/openjdk/patches/inc-path.patch
@@ -1,3 +1,6 @@
+
+ disable wrong pathes for cross-compilation
+
 --- w-openjdk-6-1.orig/openjdk-6/jdk/make/common/shared/Defs-linux.gmk	2011-02-28 17:06:10.000000000 +0100
 +++ w-openjdk-6-1/openjdk-6/jdk/make/common/shared/Defs-linux.gmk	2011-08-08 10:07:58.975256728 +0200
 @@ -170,7 +170,7 @@
diff --git a/package/openjdk/patches/llvm-headers.patch b/package/openjdk/patches/llvm-headers.patch
index d0f42146d..25dd137d9 100644
--- a/package/openjdk/patches/llvm-headers.patch
+++ b/package/openjdk/patches/llvm-headers.patch
@@ -1,3 +1,6 @@
+
+ fix wrong header path
+
 --- w-openjdk-6.orig/openjdk-6/hotspot/src/share/vm/shark/llvmHeaders.hpp	2011-02-28 17:03:21.000000000 +0100
 +++ w-openjdk-6/openjdk-6/hotspot/src/share/vm/shark/llvmHeaders.hpp	2011-04-29 18:07:20.171550601 +0200
 @@ -43,7 +43,7 @@
diff --git a/package/openjdk/patches/patch-openjdk-6_Makefile b/package/openjdk/patches/openjdk-6_Makefile.patch
index 2364d7ec0..4425eff7c 100644
--- a/package/openjdk/patches/patch-openjdk-6_Makefile
+++ b/package/openjdk/patches/openjdk-6_Makefile.patch
@@ -1,3 +1,6 @@
+
+ TOPDIR is already used by build system, so always set it.
+
 --- w-openjdk-6-1.orig/openjdk-6/Makefile	2011-02-28 17:02:07.000000000 +0100
 +++ w-openjdk-6-1/openjdk-6/Makefile	2011-03-28 20:06:13.751809044 +0200
 @@ -25,9 +25,7 @@
diff --git a/package/openjdk/patches/remove-libnsl.patch b/package/openjdk/patches/remove-libnsl.patch
index 9c086843e..965829fd6 100644
--- a/package/openjdk/patches/remove-libnsl.patch
+++ b/package/openjdk/patches/remove-libnsl.patch
@@ -1,3 +1,6 @@
+
+ remove libnsl from linking.
+
 --- w-openjdk-6-1.orig/openjdk-6/jdk/make/java/hpi/hpi_common.gmk	2011-02-28 17:06:10.000000000 +0100
 +++ w-openjdk-6-1/openjdk-6/jdk/make/java/hpi/hpi_common.gmk	2011-04-10 20:05:01.417672476 +0200
 @@ -86,5 +86,5 @@
diff --git a/package/openjdk/patches/shark-adlc-cross-compile.patch b/package/openjdk/patches/shark-adlc-cross-compile.patch
index 79670f9ac..fc3b804ea 100644
--- a/package/openjdk/patches/shark-adlc-cross-compile.patch
+++ b/package/openjdk/patches/shark-adlc-cross-compile.patch
@@ -1,3 +1,6 @@
+
+ Execute adlc via Qemu.
+
 --- w-openjdk-6.orig/openjdk-6/hotspot/make/linux/makefiles/adlc.make	2011-02-28 17:03:13.000000000 +0100
 +++ w-openjdk-6/openjdk-6/hotspot/make/linux/makefiles/adlc.make	2011-08-17 13:05:55.317470977 +0200
 @@ -103,7 +103,7 @@
diff --git a/package/openjdk/patches/uClibc-compat.patch b/package/openjdk/patches/uClibc-compat.patch
index 1bdf56b5b..1cc16cbb1 100644
--- a/package/openjdk/patches/uClibc-compat.patch
+++ b/package/openjdk/patches/uClibc-compat.patch
@@ -1,3 +1,7 @@
+
+ some uClibc compatibility hacks.
+ Partly from https://evolvis.org/scm/viewvc.php/jalimo/trunk/oe-overlay/packages/openjdk/openjdk-6-6b18-1.8/
+
 --- w-openjdk-6-1.orig/openjdk-6/hotspot/src/os/linux/vm/os_linux.cpp	2011-02-28 17:03:14.000000000 +0100
 +++ w-openjdk-6-1/openjdk-6/hotspot/src/os/linux/vm/os_linux.cpp	2011-08-07 14:30:00.195403776 +0200
 @@ -53,7 +53,6 @@