Openjdk fixes from master

From: Stefan Schmidt <[email protected]>

Hello.

Another pull request for openjdk related fixes. They have been in master for quite some time now and we tested them heavily at Buglabs. They improve the openjdk build situation a lot making it more robust and eliminating random failures.

The patch from myself is for the 2011.03 release only as it covers a merge failure I introduced with my last pull request.

Please pull.

Pull URL: git://github.com/Stefan-Schmidt/openembedded
Branch: for-2011.03
Browse: https://github.com/Stefan-Schmidt/openembedded/tree/for-2011.03

Thanks,
Stefan Schmidt <[email protected]>
---

Henning (1):
ecj-bootstrap: try 5 times to compile the classes

Henning Heinold (5):
llvm: merge native recipe into the normal recipe
ecj: for ecj-initial 512 mb heapsize is okay for ecj-bootstrap we

    need 1024

inetlib: move to proper place
icedtea6-native: add libxext-native to the dependencies
cacao-native: add fix for vm-shutdown and multiple threads are
involved

Stefan Schmidt (1):
icedtea6-native_1.7.10: Remove reference to deleted patch.

 recipes/cacao/cacao-native_hg.bb                   |    6 +-
 recipes/cacao/files/cacao-shutdownguard.patch      |  180 ++++++++++++++++++++
 .../inetlib-1.1.1/datadir_java.patch               |    0
 recipes/{classpath => classpathx}/inetlib_1.1.1.bb |    0
 recipes/ecj/ecj-bootstrap-native.bb                |    2 +-
 recipes/ecj/ecj-initial.bb                         |    6 +-
 recipes/ecj/files/ecj-initial.in                   |    1 +
 recipes/ecj/files/ecj.in                           |   14 ++-
 recipes/icedtea/icedtea6-native.inc                |    5 +-
 recipes/icedtea/icedtea6-native_1.7.10.bb          |    1 -
 recipes/llvm/llvm-native.inc                       |   33 ----
 recipes/llvm/llvm.inc                              |   70 ++++++---
 recipes/llvm/llvm2.7-native_2.7.bb                 |   12 --
 recipes/llvm/llvm2.7_2.7.bb                        |    5 +-
 14 files changed, 256 insertions(+), 79 deletions(-)
 create mode 100644 recipes/cacao/files/cacao-shutdownguard.patch
 rename recipes/{classpath => classpathx}/inetlib-1.1.1/datadir_java.patch (100%)
 rename recipes/{classpath => classpathx}/inetlib_1.1.1.bb (100%)
 create mode 100755 recipes/ecj/files/ecj-initial.in
 delete mode 100644 recipes/llvm/llvm-native.inc
 delete mode 100644 recipes/llvm/llvm2.7-native_2.7.bb

1.7.5.1

From: Stefan Schmidt <[email protected]>

During my cherry-pick of Henning's patch from master I somehow b0rked the commit by loosing this hunk that also deletes the reference to the deleted patch file.

---
 recipes/icedtea/icedtea6-native_1.7.10.bb |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

index c55e197..77c6232 100644
@@ -33,5 +33,4 @@ export DISTRIBUTION_PATCHES = "\
 	patches/icedtea-hotspot-make-arch-sane-for-x86.patch \
 	patches/icedtea-jdk-sane-x86-arch.patch \
 	patches/icedtea-unbreak-float.patch \
-	patches/icedtea-jdk-build-sizer-32-on-amd64.patch \
 	"

1.7.5.1

Dear Stefan,

Am Montag, den 09.05.2011, 09:29 +0200 schrieb Stefan Schmidt:

why is not it possible to fix the borked commit using git rebase or just squash this patch and Hennings and resend the pull request?

[…]

Thanks,

Paul

Hello.

Because the broken commit was in my _last_ pull request which already is pulled into the 2011.03 maintenance branch.

As this is a public branch we can't rebase it and thus I'm going with an incremental fix. Hope that clears it up. Maybe the changelog should have been more clear that I meant an old commit already sitting in the tree.

Normally I squash and rebase a lot on non-public or temp branches. :)

regards
Stefan Schmidt

Dear Stefan,

Am Montag, den 09.05.2011, 11:13 +0200 schrieb Stefan Schmidt:

thank you for the clarification. I guess the commit id of the borked commit would be handy too.

It is a great feature!

Thanks,

Paul

From: Henning Heinold <[email protected]>

* use BBCLASSEXTENDED = "native"
* remove do_stage
* bump PR

---
 recipes/llvm/llvm-native.inc       |   33 -----------------
 recipes/llvm/llvm.inc              |   70 +++++++++++++++++++++++++-----------
 recipes/llvm/llvm2.7-native_2.7.bb |   12 ------
 recipes/llvm/llvm2.7_2.7.bb        |    5 +--
 4 files changed, 51 insertions(+), 69 deletions(-)
 delete mode 100644 recipes/llvm/llvm-native.inc
 delete mode 100644 recipes/llvm/llvm2.7-native_2.7.bb

deleted file mode 100644
index b3cb7a6..0000000
@@ -1,33 +0,0 @@
-require llvm.inc
-
-DEPENDS = "llvm-common-native cmake-native binutils-cross perl-native"
-
-inherit native
-
-# the difference to the non-native build is that we do not need
-# to declare the location of the tblgen executable.
-EXTRA_OECMAKE = "\
-  -DLLVM_TARGETS_TO_BUILD=${LLVM_ARCH} \
-  -DCMAKE_LINKER:FILEPATH=${LD} \
-  -DCMAKE_AR:FILEPATH=${AR} \
-  -DCMAKE_OBJCOPY:FILEPATH=${OBJCOPY} \
-  -DCMAKE_OBJDUMP:FILEPATH=${OBJDUMP} \
-  -DCMAKE_RANLIB:FILEPATH=${RANLIB} \
-  -DCMAKE_STRIP:FILEPATH=${STRIP} \
-  -DNM_PATH:FILEPATH=${NM} \
-"
-
-PACKAGES = ""
-
-PACKAGES_DYNAMIC = ""
-
-do_stage() {
-  cd ${OECMAKE_BUILDPATH}
-
-  llvm_stage
-
-  install -d ${STAGING_BINDIR}
-  install -m 0755 bin/llvm-config${LLVM_RELEASE} ${STAGING_BINDIR}
-}
-
-

deleted file mode 100644
index e438702..0000000
@@ -1,12 +0,0 @@
-require llvm-native.inc
-
-PR = "r0"
-
-SRC_URI = "\
-  http://llvm.org/releases/${PV}/llvm-${PV}.tgz \
-"
-
-LLVM_RELEASE = "2.7"
-
-SRC_URI[md5sum] = "ac322661f20e7d6c810b1869f886ad9b"
-SRC_URI[sha256sum] = "99664bdc8503a306038166af33f28eb426d99e297575a59d74a1a0dcbddbbca5"

index ef2da43..4353622 100644
@@ -1,14 +1,13 @@
 require llvm.inc
 
-PR = "r8"
+PR = "r9"
 
 DEPENDS = "llvm-common llvm2.7-native"
 
 # Force arm mode for armv4t until http://llvm.org/bugs/show_bug.cgi?id=6065 is resolved somehow
 ARM_INSTRUCTION_SET_armv4t = "ARM"
 
-SRC_URI = "\
-  http://llvm.org/releases/${PV}/llvm-${PV}.tgz \
+SRC_URI += "\
   file://arm_ppc.patch \
   file://r97745-llvmPR6480.patch \
   file://r104558-VFPmisc.patch \

1.7.5.1

From: Henning Heinold <[email protected]>

---
 recipes/ecj/ecj-bootstrap-native.bb |    2 +-
 recipes/ecj/ecj-initial.bb          |    6 +++---
 recipes/ecj/files/ecj-initial.in    |    1 +
 recipes/ecj/files/ecj.in            |    2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100755 recipes/ecj/files/ecj-initial.in

index 594b08c..bdb9797 100644
@@ -17,7 +17,7 @@ SRC_URI = "file://ecj.in"
 
 S = "${WORKDIR}"
 
-PR = "r2"
+PR = "r3"
 
 JAR = "ecj-bootstrap.jar"
 

index 8ddbc7c..1809cd6 100644
@@ -9,9 +9,9 @@ LICENSE = "EPL"
 
 DEPENDS = "libecj-bootstrap"
 
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "file://ecj.in"
+SRC_URI = "file://ecj-initial.in"
 
 NATIVE_INSTALL_WORKS = "1"
 

@@ -26,7 +26,7 @@ do_compile() {
   echo "#!/bin/sh" > ecj-initial
   echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-initial
   echo "RUNTIME=java-initial" >> ecj-initial
-  cat ecj.in >> ecj-initial
+  cat ecj-initial.in >> ecj-initial
 }
 
 do_install() {

new file mode 100755
index 0000000..2099991
@@ -0,0 +1 @@
+${RUNTIME} -Xmx512m -cp ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main ${1+"$@"}

index 2099991..2cff259 100755
@@ -1 +1 @@
-${RUNTIME} -Xmx512m -cp ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main ${1+"$@"}
+${RUNTIME} -Xmx1024m -cp ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main ${1+"$@"}

1.7.5.1

From: Henning <[email protected]>

* that is an easy fix to workaround the aborts and segfaults of cacao and jamvm
* bump PR

---
 recipes/ecj/ecj-bootstrap-native.bb |    2 +-
 recipes/ecj/files/ecj.in            |   14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

index bdb9797..a11ba74 100644
@@ -17,7 +17,7 @@ SRC_URI = "file://ecj.in"
 
 S = "${WORKDIR}"
 
-PR = "r3"
+PR = "r4"
 
 JAR = "ecj-bootstrap.jar"
 

index 2cff259..0fd4a65 100755
@@ -1 +1,13 @@
-${RUNTIME} -Xmx1024m -cp ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main ${1+"$@"}
+ARGS=${1+"$@"}
+COUNT=5
+END=0
+
+while test "${COUNT}" -gt "${END}"
+do
+ ${RUNTIME} -Xmx1024m -cp ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main ${ARGS}
+ if test "${?}" -eq "${END}"
+ then
+    break
+ fi
+ COUNT=$(($COUNT-1))
+done

1.7.5.1

From: Henning Heinold <[email protected]>

---
 .../inetlib-1.1.1/datadir_java.patch               |    0
 recipes/{classpath => classpathx}/inetlib_1.1.1.bb |    0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename recipes/{classpath => classpathx}/inetlib-1.1.1/datadir_java.patch (100%)
 rename recipes/{classpath => classpathx}/inetlib_1.1.1.bb (100%)

similarity index 100%
rename from recipes/classpath/inetlib-1.1.1/datadir_java.patch
rename to recipes/classpathx/inetlib-1.1.1/datadir_java.patch

similarity index 100%
rename from recipes/classpath/inetlib_1.1.1.bb
rename to recipes/classpathx/inetlib_1.1.1.bb

1.7.5.1

From: Henning Heinold <[email protected]>

* bump PR

---
 recipes/icedtea/icedtea6-native.inc |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

index 39ecdad..06da7c0 100644
@@ -1,12 +1,13 @@
 DESCRIPTION = "Harness to build the source code from OpenJDK using Free Software build tools"
 HOMEPAGE = "http://icedtea.classpath.org"
 LICENSE  = "GPL with Classpath Exception"
-INC_PR = "r3"
+INC_PR = "r4"
 
 DEPENDS = "virtual/javac-native classpath-tools-native \
 	   virtual/java-native classpath-native \
 	   xalan-j-native xerces-j-native rhino-native \
-	   ant-native libx11-native xproto-native libxt-native \
+	   ant-native \
+           libx11-native xproto-native libxt-native libxext-native \
 	   freetype-native zlib-native giflib-native jpeg-native \
            zip-native \
 	  "

1.7.5.1

From: Henning Heinold <[email protected]>

* bump PR

---
 recipes/cacao/cacao-native_hg.bb              |    6 +-
 recipes/cacao/files/cacao-shutdownguard.patch |  180 +++++++++++++++++++++++++
 2 files changed, 184 insertions(+), 2 deletions(-)
 create mode 100644 recipes/cacao/files/cacao-shutdownguard.patch

index 82f56eb..dc35ce8 100644
@@ -1,9 +1,11 @@
 require cacao-native.inc
 
 PV = "1.1.0+hgr${SRCPV}"
-PR = "r3"
+PR = "r4"
 
 SRCREV = "c7bf150bfa46"
-SRC_URI = "hg://mips.complang.tuwien.ac.at/hg/;module=cacao;rev=${SRCREV}"
+SRC_URI = "hg://mips.complang.tuwien.ac.at/hg/;module=cacao;rev=${SRCREV} \
+           file://cacao-shutdownguard.patch \
+          "
 
 S = "${WORKDIR}/cacao"

1.7.5.1

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Sorry for the delay, this has been applied now. Thanks!

- --
Tom Rini
Mentor Graphics Corporation
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJNywrDAAoJEI4NMjfc3nJx6nMIAKNH8EaQlc6qxcdMmrmGufec ktz8a7EODHHQSvwOhLl8x+BTtds8jQBTd79xD4tJSQxf6XJMd3ZnaEeBBYtJF0VK CCnIm5AItoaFOP5OdxsCF5+0DiuifdQA86k4q+R2wkAt58VP14oII95D1YGwYvwj YHmc9ryMwo8+vFDDrQWveEOKdndkJVVLdlKt7a8NWQygNu5Obt131OvJFvgQKnCQ Dr6ZPkn8E+73AlKINU/fjhfjwUiCszvWErpeUoH6aght5RLWp8pxLC8wTqoPw7RI F3nlH0Hjd5RAIlhdvTPWnpS45IYEjg7e/HQiN8lPOsd37XFqnMJzJuauMARtB34= =Z432
-----END PGP SIGNATURE-----