icedtea-1.14 JamVM + OpenJDK 7 -version patch

[Dr Andrew John Hughes]

On 14:17 Thu 26 May     , Xerxes Rånby wrote:
> Hi!
> 
> Today i tested to build JamVM + OpenJDK 7 using the newly released
> icedtea-1.14 
> http://icedtea.classpath.org/download/source/icedtea-1.14.tar.gz
> that contains all JamVM build scripts from icedtea6.
> 
> 
> After some patching the JamVM + OpenJDK 7 combination builds and now
> passes java -version and java -help
> 
> icedtea-1.14/openjdk.build/j2sdk-image/bin/java -version
> java version "1.7.0_136-icedtea"
> IcedTea7 Runtime Environment (1.14) (Ubuntu build
> 1.7.0_136-icedtea-b136)
> JamVM (build 1.6.0-devel, inline-threaded interpreter with
> stack-caching)
> 
> 
> 
> * jamvm-oj7.patch :
> OpenJDK7 complained that JVM_FindClassFromBootLoader not found inside
> the jamvm libjvm.so, a new JVM API in OpenJDK 7, the attached patch fix
> by implementing it using jamvm's internal findSystemClass0 method.
> 

Are you planning to add this to the repo?

> 
> * icedtea-1.14-jamvm.patch :
> I had to do some tweaks to the icedtea-1.14 Makefile.am all contained in
> the icedtea-1.14-jamvm.patch because of a silly issue the jamvm sources
> did not get extracted before patching.
> This patch also makes it possible to rerun the stamps/jamvm.stamp by
> adding -f to ln so that it can replace the symlink if its allready
> there.

Comments on this below.

> OpenJDK 7 have added a check if the "unused by jamvm" libjsig.so
> actually are a valid .so file, so instead of simply touching it i simply
> created a link to the built libjvm.so created by stamps/jamvm.stamp.
> 
> 
> I configured my icedtea-1.14 build using
> ./configure --enable-jamvm --disable-system-lcms --disable-bootstrap
> 

Wow, I'm surprised how few people have lcms2.

> Cheers
> Xerxes

> Index: icedtea-1.14/jamvm/jamvm/src/classlib/openjdk/jvm.c
> ===================================================================
> --- icedtea-1.14.orig/jamvm/jamvm/src/classlib/openjdk/jvm.c	2011-05-26 12:47:39.703360774 +0200
> +++ icedtea-1.14/jamvm/jamvm/src/classlib/openjdk/jvm.c	2011-05-26 13:50:36.038086620 +0200
> @@ -492,6 +492,15 @@
>  }
>  
>  
> +/* JVM_FindClassFromBootLoader */
> +
> +jclass JVM_FindClassFromBootLoader(JNIEnv* env, const char *name) {
> +    TRACE("JVM_FindClassFromBootLoader(env=%p, s=%s)", env, name);
> +
> +    return findSystemClass0((char*)name);
> +}
> +
> +
>  /* JVM_FindClassFromClassLoader */
>  
>  jclass JVM_FindClassFromClassLoader(JNIEnv *env, const char *name,

> Index: icedtea-1.14/Makefile.am
> ===================================================================
> --- icedtea-1.14.orig/Makefile.am	2011-05-26 11:18:03.468701462 +0200
> +++ icedtea-1.14/Makefile.am	2011-05-26 12:18:33.610702371 +0200
> @@ -1343,7 +1343,7 @@
>  	rm -rf $(abs_top_builddir)/generated.build
>  	rm -f stamps/generated.stamp
>  
> -stamps/patch-fsg.stamp: stamps/sanitise-openjdk.stamp
> +stamps/patch-fsg.stamp: stamps/extract.stamp stamps/sanitise-openjdk.stamp

I'm puzzled why you need this.  sanitise-openjdk requires extract.

>  	mkdir -p stamps ; \
>  	rm -f stamps/patch-fsg.stamp.tmp ; \
>  	touch stamps/patch-fsg.stamp.tmp ; \
> @@ -1394,7 +1394,7 @@
>  	  rm -f stamps/patch-fsg.stamp ; \
>  	fi
>  
> -stamps/patch.stamp: stamps/patch-fsg.stamp
> +stamps/patch.stamp: stamps/extract.stamp stamps/patch-fsg.stamp

And likewise, patch-fsg requires extract.

>  	mkdir -p stamps ; \
>  	rm -f stamps/patch.stamp.tmp ; \
>  	touch stamps/patch.stamp.tmp ; \
> @@ -2087,9 +2087,9 @@
>  	$(MAKE) install
>  	mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
>  	cp $(abs_top_builddir)/jamvm/install/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
> -	ln -s server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client
> +	ln -sf server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client
>  	touch $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt
> -	touch $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so
> +	ln -sf client/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so
>  endif
>  	mkdir -p stamps
>  	touch stamps/jamvm.stamp

This is a straight backport from 6, so you may need to make changes there too.

-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37