RFC: Removal of the ARM assembler port in Icedtea6, unbreaks Zero and Shark builds.

[Dr Andrew John Hughes]

On 13:07 Mon 11 Jul     , Xerxes Rånby wrote:
> Hi team.
> 
> The ARM assembler port that have been broken and unmaintained for about
> a year are currently preventing Zero and Shark from building when using
> the new Hotspot in OpenJDK b23.
> 

Just for clarity, the issue here is not because of changes in b23 as
we've been using using the same HotSpot for months.  The new breakage
is because the HotSpot we now use by default is no longer the
'alternate' Hotspot (and thus WITH_ALT_HSBUILD is not set).  It's the
'original' HotSpot from the b23 tarball.

> The attached patch fixes Zero and Shark builds by removing the ARM
> assembler port from the icedtea6 tree.
> 
> I will also remove the following files:
> arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp
> arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def
> arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
> arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp
> arm_port/hotspot/tools/mkbc.c
> patches/arm.patch
> 
> Ok to push?
> 

This sounds fine.  We did give plenty of warning about this when we
first disabled it for hs20 and the code hasn't been included in the
default build since we switched to using hs20.

> Cheers
> Xerxes

> Index: icedtea6/Makefile.am
> ===================================================================
> --- icedtea6.orig/Makefile.am	2011-07-11 12:37:38.084889776 +0200
> +++ icedtea6/Makefile.am	2011-07-11 12:38:04.565021087 +0200
> @@ -262,7 +262,6 @@
>  	patches/openjdk/6959123-libpng_14.patch \
>  	patches/applet_hole.patch \
>  	patches/jtreg-httpTest.patch \
> -	patches/arm.patch \
>  	patches/debug-dir.patch \
>  	patches/override-redirect-metacity.patch \
>  	patches/openjdk/6967533-pre_epoch.patch \
> @@ -603,7 +602,7 @@
>  check-local: jtregcheck
>  
>  clean-local: clean-jtreg clean-jtreg-reports $(PULSE_JAVA_CLEAN_TARGET) \
> - clean-icedtea clean-icedtea-debug clean-icedtea-ecj clean-extract clean-ports \
> + clean-icedtea clean-icedtea-debug clean-icedtea-ecj clean-extract \
>   clean-overlay clean-native-ecj clean-icedtea-against-icedtea clean-icedtea-debug-against-icedtea \
>   clean-icedtea-against-ecj clean-extract-ecj clean-generated clean-replace-hotspot \
>   clean-rewriter clean-rewrite-rhino clean-rt clean-bootstrap-directory \
> @@ -640,7 +639,7 @@
>  	clean-icedtea-against-ecj \
>  	clean-jamvm clean-add-jamvm clean-add-jamvm-debug \
>  	clean-cacao clean-add-cacao clean-add-cacao-debug \
> -	clean-ports clean-overlay clean-extract-ecj clean-extract clean-extract-openjdk \
> +	clean-overlay clean-extract-ecj clean-extract clean-extract-openjdk \
>  	clean-replace-hotspot clean-generated clean-download clean-hgforest clean-download-openjdk \
>  	clean-rewriter clean-rewrite-rhino clean-add-systemtap clean-add-systemtap-debug \
>  	clean-add-pulseaudio clean-add-pulseaudio-debug clean-add-nss clean-add-nss-debug \
> @@ -996,27 +995,7 @@
>  clean-replace-hotspot:
>  	rm -f stamps/replace-hotspot.stamp
>  
> -# Copy ports sources into tree
> -stamps/ports.stamp: stamps/replace-hotspot.stamp
> -if !WITH_ALT_HSBUILD
> -	for target in $(abs_top_srcdir)/arm_port/hotspot/tools \
> -		      $(abs_top_srcdir)/arm_port/hotspot/src/*cpu/* ; do \
> -	  link=$$(dirname $$target | sed 's/^.*arm_port/openjdk/'); \
> -	  cp -rv $$target $$link; \
> -	done
> -endif
> -	mkdir -p stamps
> -	touch stamps/ports.stamp
> -
> -clean-ports:
> -	for target in $(abs_top_srcdir)/arm_port/hotspot/tools \
> -		      $(abs_top_srcdir)/arm_port/hotspot/src/*cpu/* ; do \
> -	  link=$$(dirname $$target | sed 's/^.*arm_port/openjdk/'); \
> -	  rm -rf $$link; \
> -	done
> -	rm -f stamps/ports.stamp
> -
> -stamps/generated.stamp: stamps/ports.stamp
> +stamps/generated.stamp: stamps/replace-hotspot.stamp
>  	set -e ; \
>  	if [ ! -e $(abs_top_builddir)/generated ]; then \
>  	  cp -a $(abs_top_srcdir)/generated $(abs_top_builddir); \
> @@ -2266,8 +2245,6 @@
>  
>  extract-ecj: stamps/extract-ecj.stamp
>  
> -hotspot-ports: stamps/ports.stamp
> -
>  icedtea: stamps/icedtea.stamp
>  
>  icedtea-against-icedtea: stamps/icedtea-against-icedtea.stamp


-- 
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