Merge lp:~xranby/ubuntu/quantal/avian/lp1047395 into lp:ubuntu/quantal/avian

[Xerxes Rånby]

Update using the latest Avian source .tar.gz from upstream 2012-09-10:
wget https://github.com/ReadyTalk/avian/tarball/master -O avian_0.6+20120910.orig.tar.gz

Removed patches that are now upsteam and close fixed lp1047395 bug.
https://bugs.launchpad.net/ubuntu/+source/avian/+bug/1047395
Tested on armhf:
java -avian -version
java version "1.7.0_07"
OpenJDK Runtime Environment (IcedTea7 2.3.2) (7u7-2.3.2-1ubuntu1)
Avian (build 0.6, package 0.6+20120910-0ubuntu2)

[Matthias Klose (doko)]

merged

review: Approve

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2012-09-05 12:24:24 +0000
+++ .pc/applied-patches	2012-09-11 08:19:21 +0000
@@ -1,3 +1,1 @@
-soname.diff
 dpkg-buildflags.diff
-version-info.diff

=== modified file '.pc/dpkg-buildflags.diff/makefile'
--- .pc/dpkg-buildflags.diff/makefile	2012-09-05 12:24:24 +0000
+++ .pc/dpkg-buildflags.diff/makefile	2012-09-11 08:19:21 +0000
@@ -194,6 +194,7 @@
 common-cflags = $(warnings) -fno-rtti -fno-exceptions -I$(classpath-src) \
 	"-I$(JAVA_HOME)/include" -idirafter $(src) -I$(build) $(classpath-cflags) \
 	-D__STDC_LIMIT_MACROS -D_JNI_IMPLEMENTATION_ -DAVIAN_VERSION=\"$(version)\" \
+	-DAVIAN_INFO="\"$(info)\"" \
 	-DUSE_ATOMIC_OPERATIONS -DAVIAN_JAVA_HOME=\"$(javahome)\" \
 	-DAVIAN_EMBED_PREFIX=\"$(embed-prefix)\" $(target-cflags)
 
@@ -1161,7 +1162,8 @@
 		-IMPLIB:$(build)/$(name).lib -MANIFESTFILE:$(@).manifest
 	$(mt) -manifest $(@).manifest -outputresource:"$(@);2"
 else
-	$(ld) $(^) $(version-script-flag) $(soname-flag) $(shared) $(lflags) $(bootimage-lflags) \
+	$(ld) $(^) $(version-script-flag) $(soname-flag) \
+		$(shared) $(lflags) $(bootimage-lflags) \
 		-o $(@)
 endif
 	$(strip) $(strip-all) $(@)

=== removed directory '.pc/soname.diff'
=== removed file '.pc/soname.diff/makefile'
--- .pc/soname.diff/makefile	2012-09-05 12:24:24 +0000
+++ .pc/soname.diff/makefile	1970-01-01 00:00:00 +0000
@@ -1,1283 +0,0 @@
-MAKEFLAGS = -s
-
-name = avian
-version = 0.6
-
-build-arch := $(shell uname -m \
-	| sed 's/^i.86$$/i386/' \
-	| sed 's/^x86pc$$/i386/' \
-	| sed 's/amd64/x86_64/' \
-	| sed 's/^arm.*$$/arm/' \
-	| sed 's/ppc/powerpc/')
-
-ifeq (Power,$(filter Power,$(build-arch)))
-	build-arch = powerpc
-endif
-
-build-platform := \
-	$(shell uname -s | tr [:upper:] [:lower:] \
-		| sed 's/^mingw32.*$$/mingw32/' \
-		| sed 's/^cygwin.*$$/cygwin/')
-
-arch = $(build-arch)
-target-arch = $(arch)
-bootimage-platform = \
-	$(subst cygwin,windows,$(subst mingw32,windows,$(build-platform)))
-platform = $(bootimage-platform)
-
-mode = fast
-process = compile
-
-ifneq ($(process),compile)
-	options := -$(process)
-endif
-ifneq ($(mode),fast)
-	options := $(options)-$(mode)
-endif
-ifneq ($(lzma),)
-	options := $(options)-lzma
-endif
-ifeq ($(bootimage),true)
-	options := $(options)-bootimage
-endif
-ifeq ($(heapdump),true)
-	options := $(options)-heapdump
-endif
-ifeq ($(tails),true)
-	options := $(options)-tails
-endif
-ifeq ($(continuations),true)
-	options := $(options)-continuations
-endif
-
-root := $(shell (cd .. && pwd))
-build = build/$(platform)-$(arch)$(options)
-classpath-build = $(build)/classpath
-test-build = $(build)/test
-src = src
-classpath-src = classpath
-test = test
-win32 ?= $(root)/win32
-win64 ?= $(root)/win64
-
-classpath = avian
-
-test-executable = $(shell pwd)/$(executable)
-boot-classpath = $(classpath-build)
-embed-prefix = /avian-embedded
-
-native-path = echo
-
-ifeq ($(build-platform),cygwin)
-	native-path = cygpath -m
-endif
-
-windows-path = echo
-
-path-separator = :
-
-ifneq (,$(filter mingw32 cygwin,$(build-platform)))
-	path-separator = ;
-endif
-
-library-path-variable = LD_LIBRARY_PATH
-
-ifeq ($(build-platform),darwin)
-	library-path-variable = DYLD_LIBRARY_PATH
-endif
-
-library-path = $(library-path-variable)=$(build)
-
-ifneq ($(openjdk),)
-	openjdk-arch = $(arch)
-	ifeq ($(arch),x86_64)
-		openjdk-arch = amd64
-	endif
-
-	ifneq ($(openjdk-src),)
-		include openjdk-src.mk
-	  options := $(options)-openjdk-src
-		classpath-objects = $(openjdk-objects) $(openjdk-local-objects)
-		classpath-cflags = -DAVIAN_OPENJDK_SRC -DBOOT_JAVAHOME
-		openjdk-jar-dep = $(build)/openjdk-jar.dep
-		classpath-jar-dep = $(openjdk-jar-dep)
-		javahome = $(embed-prefix)/javahomeJar
-		javahome-files = lib/zi lib/currency.data lib/security/java.security \
-			lib/security/java.policy lib/security/cacerts
-
-		local-policy = lib/security/local_policy.jar
-		ifeq ($(shell test -e "$(openjdk)/$(local-policy)" && echo found),found)
-			javahome-files += $(local-policy)
-		endif
-
-		export-policy = lib/security/US_export_policy.jar
-		ifeq ($(shell test -e "$(openjdk)/$(export-policy)" && echo found),found)
-			javahome-files += $(export-policy)
-		endif
-
-		ifeq ($(platform),windows)
-			javahome-files += lib/tzmappings
-		endif
-		javahome-object = $(build)/javahome-jar.o
-		boot-javahome-object = $(build)/boot-javahome.o
-	else
-	  options := $(options)-openjdk
-		test-executable = $(shell pwd)/$(executable-dynamic)
-		ifeq ($(build-platform),darwin)
-			library-path = \
-				$(library-path-variable)=$(build):$(openjdk)/jre/lib
-		else
-			library-path = \
-				$(library-path-variable)=$(build):$(openjdk)/jre/lib/$(openjdk-arch)
-		endif
-		javahome = "$$($(native-path) "$(openjdk)/jre")"
-	endif
-
-  classpath = openjdk
-	boot-classpath := "$(boot-classpath)$(path-separator)$$($(native-path) "$(openjdk)/jre/lib/rt.jar")"
-	build-javahome = $(openjdk)/jre
-endif
-
-ifeq ($(classpath),avian)
-	jni-sources := $(shell find $(classpath-src) -name '*.cpp')
-	jni-objects = $(call cpp-objects,$(jni-sources),$(classpath-src),$(build))
-	classpath-objects = $(jni-objects)
-endif
-
-input = List
-
-ifeq ($(use-clang),true)
-	build-cxx = clang -std=c++11
-	build-cc = clang
-else
-	build-cxx = g++
-	build-cc = gcc
-endif
-
-mflag =
-ifneq ($(platform),darwin)
-	ifeq ($(arch),i386)
-		mflag = -m32
-	endif
-	ifeq ($(arch),x86_64)
-		mflag = -m64
-	endif
-endif
-
-target-format = elf
-
-cxx = $(build-cxx) $(mflag)
-cc = $(build-cc) $(mflag)
-
-ar = ar
-ranlib = ranlib
-dlltool = dlltool
-vg = nice valgrind --num-callers=32 --db-attach=yes --freelist-vol=100000000
-vg += --leak-check=full --suppressions=valgrind.supp
-db = gdb --args
-javac = "$(JAVA_HOME)/bin/javac"
-javah = "$(JAVA_HOME)/bin/javah"
-jar = "$(JAVA_HOME)/bin/jar"
-strip = strip
-strip-all = --strip-all
-
-rdynamic = -rdynamic
-
-# note that we suppress the non-virtual-dtor warning because we never
-# use the delete operator, which means we don't need virtual
-# destructors:
-warnings = -Wall -Wextra -Werror -Wunused-parameter -Winit-self \
-	-Wno-non-virtual-dtor
-
-target-cflags = -DTARGET_BYTES_PER_WORD=$(pointer-size)
-
-common-cflags = $(warnings) -fno-rtti -fno-exceptions -I$(classpath-src) \
-	"-I$(JAVA_HOME)/include" -idirafter $(src) -I$(build) $(classpath-cflags) \
-	-D__STDC_LIMIT_MACROS -D_JNI_IMPLEMENTATION_ -DAVIAN_VERSION=\"$(version)\" \
-	-DUSE_ATOMIC_OPERATIONS -DAVIAN_JAVA_HOME=\"$(javahome)\" \
-	-DAVIAN_EMBED_PREFIX=\"$(embed-prefix)\" $(target-cflags)
-
-asmflags = $(target-cflags)
-
-ifneq (,$(filter i386 x86_64,$(arch)))
-	ifeq ($(use-frame-pointer),true)
-		common-cflags += -fno-omit-frame-pointer -DAVIAN_USE_FRAME_POINTER
-		asmflags += -DAVIAN_USE_FRAME_POINTER
-	endif
-endif
-
-build-cflags = $(common-cflags) -fPIC -fvisibility=hidden \
-	"-I$(JAVA_HOME)/include/linux" -I$(src) -pthread
-
-converter-cflags = -D__STDC_CONSTANT_MACROS -Isrc/binaryToObject -Isrc/ \
-	-fno-rtti -fno-exceptions \
-	-DAVIAN_TARGET_ARCH=AVIAN_ARCH_UNKNOWN \
-	-DAVIAN_TARGET_FORMAT=AVIAN_FORMAT_UNKNOWN \
-	-Wall -Wextra -Werror -Wunused-parameter -Winit-self -Wno-non-virtual-dtor
-
-cflags = $(build-cflags)
-
-common-lflags = -lm -lz $(classpath-lflags)
-
-build-lflags = -lz -lpthread -ldl
-
-lflags = $(common-lflags) -lpthread -ldl
-
-version-script-flag = -Wl,--version-script=openjdk.ld
-
-build-system = posix
-
-system = posix
-asm = x86
-
-pointer-size = 8
-
-so-prefix = lib
-so-suffix = .so
-
-shared = -shared
-
-no-error = -Wno-error
-
-openjdk-extra-cflags = -fvisibility=hidden
-
-bootimage-cflags = -DTARGET_BYTES_PER_WORD=$(pointer-size)
-
-developer-dir := $(shell if test -d /Developer; then echo /Developer; \
-	else echo /Applications/Xcode.app/Contents/Developer; fi)
-
-ifeq ($(build-arch),powerpc)
-	ifneq ($(arch),$(build-arch))
-		bootimage-cflags += -DTARGET_OPPOSITE_ENDIAN
-	endif
-endif
-
-ifeq ($(arch),i386)
-	pointer-size = 4
-endif
-
-ifeq ($(arch),powerpc)
-	asm = powerpc
-	pointer-size = 4
-
-	ifneq ($(arch),$(build-arch))
-		bootimage-cflags += -DTARGET_OPPOSITE_ENDIAN
-	endif
-
-	ifneq ($(platform),darwin)
-		ifneq ($(arch),$(build-arch))
-			cxx = powerpc-linux-gnu-g++
-			cc = powerpc-linux-gnu-gcc
-			ar = powerpc-linux-gnu-ar
-			ranlib = powerpc-linux-gnu-ranlib
-			strip = powerpc-linux-gnu-strip
-		endif
-	endif
-endif
-
-ifeq ($(arch),arm)
-	asm = arm
-	pointer-size = 4
-
-	ifeq ($(build-platform),darwin)
-		ios = true
-	else
-		no-psabi = -Wno-psabi
-		cflags += -marm $(no-psabi)
-	endif
-
-	ifneq ($(arch),$(build-arch))
-		ifeq ($(platform),darwin)
-			ios-bin = $(developer-dir)/Platforms/iPhoneOS.platform/Developer/usr/bin
-			cxx = $(ios-bin)/g++
-			cc = $(ios-bin)/gcc
-			ar = $(ios-bin)/ar
-			ranlib = $(ios-bin)/ranlib
-			strip = $(ios-bin)/strip
-		else
-			cxx = arm-linux-gnueabi-g++
-			cc = arm-linux-gnueabi-gcc
-			ar = arm-linux-gnueabi-ar
-			ranlib = arm-linux-gnueabi-ranlib
-			strip = arm-linux-gnueabi-strip
-		endif
-	endif
-endif
-
-ifeq ($(ios),true)
-	cflags += -DAVIAN_IOS
-endif
-
-ifeq ($(build-platform),darwin)
-	build-cflags = $(common-cflags) -fPIC -fvisibility=hidden -I$(src)
-	cflags += -I/System/Library/Frameworks/JavaVM.framework/Headers/
-	build-lflags += -framework CoreFoundation
-endif
-
-ifeq ($(platform),qnx)
-	cflags = $(common-cflags) -fPIC -fvisibility=hidden -I$(src)
-	lflags = $(common-lflags) -lsocket
-	ifeq ($(build-platform),qnx)
-		build-cflags = $(common-cflags) -fPIC -fvisibility=hidden -I$(src)
-		build-lflags = $(common-lflags)
-	else
-		ifeq ($(arch),i386)
-			prefix = i486-pc-nto-qnx6.5.0-
-		else
-			prefix = arm-unknown-nto-qnx6.5.0-
-		endif
-	endif
-	cxx = $(prefix)g++
-	cc = $(prefix)gcc
-	ar = $(prefix)ar
-	ranlib = $(prefix)ranlib
-	strip = $(prefix)strip
-	rdynamic = -Wl,--export-dynamic
-endif
-
-ifeq ($(platform),freebsd)
-# There is no -ldl on FreeBSD
-	build-lflags = $(common-lflags) -lz -lpthread
-	lflags = $(common-lflags) -lpthread
-# include/freebsd instead of include/linux
-	build-cflags = $(common-cflags) -fPIC -fvisibility=hidden \
-		"-I$(JAVA_HOME)/include/freebsd" -I$(src) -pthread
-	cflags = $(build-cflags)
-endif
-
-ifeq ($(platform),darwin)
-	target-format = macho
-	ifeq (${OSX_SDK_SYSROOT},)
-		OSX_SDK_SYSROOT = 10.4u
-	endif
-	ifeq (${OSX_SDK_VERSION},)
-		OSX_SDK_VERSION = 10.4
-	endif
-	ifneq ($(build-platform),darwin)
-		cxx = i686-apple-darwin8-g++ $(mflag)
-		cc = i686-apple-darwin8-gcc $(mflag)
-		ar = i686-apple-darwin8-ar
-		ranlib = i686-apple-darwin8-ranlib
-		strip = i686-apple-darwin8-strip
-		sysroot = /opt/mac/SDKs/MacOSX${OSX_SDK_SYSROOT}.sdk
-		cflags = -I$(sysroot)/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Headers/ \
-			$(common-cflags) -fPIC -fvisibility=hidden -I$(src)
-	endif
-
-	version-script-flag =
-	lflags = $(common-lflags) -ldl -framework CoreFoundation
-
-	ifeq (,$(shell ld -v 2>&1 | grep cctools))
-		lflags += -Wl,-compatibility_version,1.0.0
-	endif
-
-	ifneq ($(arch),arm)
-		lflags +=	-framework CoreServices -framework SystemConfiguration \
-			-framework Security
-	endif
-	ifeq ($(bootimage),true)
-		bootimage-lflags = -Wl,-segprot,__RWX,rwx,rwx
-	endif
-	rdynamic =
-	strip-all = -S -x
-	so-suffix = .dylib
-	shared = -dynamiclib
-
-	sdk-dir = $(developer-dir)/Platforms/iPhoneOS.platform/Developer/SDKs
-
-	ifeq ($(arch),arm)
-		ios-version := \
-			$(shell if test -d $(sdk-dir)/iPhoneOS5.1.sdk; then echo 5.1; \
-				elif test -d $(sdk-dir)/iPhoneOS5.0.sdk; then echo 5.0; \
-				elif test -d $(sdk-dir)/iPhoneOS4.3.sdk; then echo 4.3; \
-				elif test -d $(sdk-dir)/iPhoneOS4.2.sdk; then echo 4.2; \
-				else echo; fi)
-
-		ifeq ($(ios-version),)
-			x := $(error "couldn't find SDK for iOS version")
-		endif
-
-		flags = -arch armv7 -isysroot \
-			$(sdk-dir)/iPhoneOS$(ios-version).sdk/
-		openjdk-extra-cflags += $(flags)
-		cflags += $(flags)
-		asmflags += $(flags)
-		lflags += $(flags)
-	endif
-
-	ifeq ($(arch),powerpc)
-		openjdk-extra-cflags += -arch ppc -mmacosx-version-min=${OSX_SDK_VERSION}
-		cflags += -arch ppc -mmacosx-version-min=${OSX_SDK_VERSION}
-		asmflags += -arch ppc -mmacosx-version-min=${OSX_SDK_VERSION}
-		lflags += -arch ppc -mmacosx-version-min=${OSX_SDK_VERSION}
-	endif
-
-	ifeq ($(arch),i386)
-		openjdk-extra-cflags += -arch i386 -mmacosx-version-min=${OSX_SDK_VERSION}
-		cflags += -arch i386 -mmacosx-version-min=${OSX_SDK_VERSION}
-		asmflags += -arch i386 -mmacosx-version-min=${OSX_SDK_VERSION}
-		lflags += -arch i386 -mmacosx-version-min=${OSX_SDK_VERSION}
-	endif
-
-	ifeq ($(arch),x86_64)
-		openjdk-extra-cflags += -arch x86_64
-		cflags += -arch x86_64
-		asmflags += -arch x86_64
-		lflags += -arch x86_64
-	endif
-endif
-
-ifeq ($(platform),windows)
-	target-format = pe
-
-	inc = "$(win32)/include"
-	lib = "$(win32)/lib"
-
-	embed-prefix = c:/avian-embedded
-
-	system = windows
-
-	so-prefix =
-	so-suffix = .dll
-	exe-suffix = .exe
-
-	lflags = -L$(lib) $(common-lflags) -lws2_32 -liphlpapi -mwindows -mconsole
-	cflags = -I$(inc) $(common-cflags) -DWINVER=0x0500
-
-	ifeq (,$(filter mingw32 cygwin,$(build-platform)))
-		openjdk-extra-cflags += -I$(src)/openjdk/caseSensitive
-		prefix := $(shell i686-w64-mingw32-gcc --version >/dev/null 2>&1 \
-			&& echo i686-w64-mingw32- || echo x86_64-w64-mingw32-)
-		cxx = $(prefix)g++ -m32
-		cc = $(prefix)gcc -m32
-		dlltool = $(prefix)dlltool -mi386 --as-flags=--32 
-		ar = $(prefix)ar
-		ranlib = $(prefix)ranlib
-		strip = $(prefix)strip --strip-all
-	else
-		build-system = windows
-		common-cflags += "-I$(JAVA_HOME)/include/win32"
-		build-cflags = $(common-cflags) -I$(src) -I$(inc) -mthreads
-		openjdk-extra-cflags =
-		build-lflags = -L$(lib) $(common-lflags)
-		ifeq ($(build-platform),cygwin)
-			build-cxx = i686-w64-mingw32-g++
-			build-cc = i686-w64-mingw32-gcc
-			dlltool = i686-w64-mingw32-dlltool
-			ar = i686-w64-mingw32-ar
-			ranlib = i686-w64-mingw32-ranlib
-			strip = i686-w64-mingw32-strip
-		endif
-	endif
-
-	ifeq ($(arch),x86_64)
-		ifeq ($(build-platform),cygwin)
-			build-cxx = x86_64-w64-mingw32-g++
-			build-cc = x86_64-w64-mingw32-gcc
-		endif
-		cxx = x86_64-w64-mingw32-g++ $(mflag)
-		cc = x86_64-w64-mingw32-gcc $(mflag)
-		dlltool = x86_64-w64-mingw32-dlltool
-		ar = x86_64-w64-mingw32-ar
-		ranlib = x86_64-w64-mingw32-ranlib
-		strip = x86_64-w64-mingw32-strip
-		inc = "$(win64)/include"
-		lib = "$(win64)/lib"
-	else
-		shared += -Wl,--add-stdcall-alias
-	endif
-endif
-
-ifeq ($(mode),debug)
-	optimization-cflags = -O0 -g3
-	converter-cflags += -O0 -g3
-	strip = :
-endif
-ifeq ($(mode),debug-fast)
-	optimization-cflags = -O0 -g3 -DNDEBUG
-	strip = :
-endif
-ifeq ($(mode),stress)
-	optimization-cflags = -O0 -g3 -DVM_STRESS
-	strip = :
-endif
-ifeq ($(mode),stress-major)
-	optimization-cflags = -O0 -g3 -DVM_STRESS -DVM_STRESS_MAJOR
-	strip = :
-endif
-ifeq ($(mode),fast)
-	ifeq ($(use-clang),true)
-		optimization-cflags = -O4 -g3 -DNDEBUG
-	else
-		optimization-cflags = -O3 -g3 -DNDEBUG
-	endif
-	use-lto = true
-endif
-ifeq ($(mode),small)
-	ifeq ($(use-clang),true)
-		optimization-cflags = -Oz -g3 -DNDEBUG
-	else
-		optimization-cflags = -Os -g3 -DNDEBUG
-	endif
-	use-lto = true
-endif
-
-ifeq ($(use-lto),true)
-	ifeq ($(use-clang),true)
-		optimization-cflags += -flto
-		lflags += $(optimization-cflags)
-	else
-# only try to use LTO when GCC 4.6.0 or greater is available
-		gcc-major := $(shell $(cc) -dumpversion | cut -f1 -d.)
-		gcc-minor := $(shell $(cc) -dumpversion | cut -f2 -d.)
-		ifeq ($(shell expr 4 \< $(gcc-major) \
-				\| \( 4 \<= $(gcc-major) \& 6 \<= $(gcc-minor) \)),1)
-			optimization-cflags += -flto
-			no-lto = -fno-lto
-			lflags += $(optimization-cflags)
-		endif
-	endif
-endif
-
-cflags += $(optimization-cflags)
-
-ifneq ($(platform),darwin)
-ifeq ($(arch),i386)
-# this is necessary to support __sync_bool_compare_and_swap:
-	cflags += -march=i586
-	lflags += -march=i586
-endif
-endif
-
-output = -o $(1)
-as := $(cc)
-ld := $(cc)
-build-ld := $(build-cc)
-
-ifdef msvc
-	no-error =
-	windows-path = $(native-path)
-	windows-java-home := $(shell $(windows-path) "$(JAVA_HOME)")
-	zlib := $(shell $(windows-path) "$(win32)/msvc")
-	cxx = "$(msvc)/BIN/cl.exe"
-	cc = $(cxx)
-	ld = "$(msvc)/BIN/link.exe"
-	mt = "mt.exe"
-	cflags = -nologo -DAVIAN_VERSION=\"$(version)\" -D_JNI_IMPLEMENTATION_ \
-		-DUSE_ATOMIC_OPERATIONS -DAVIAN_JAVA_HOME=\"$(javahome)\" \
-		-DAVIAN_EMBED_PREFIX=\"$(embed-prefix)\" \
-		-Fd$(build)/$(name).pdb -I"$(zlib)/include" -I$(src) -I$(classpath-src) \
-		-I"$(build)" \
-		-I"$(windows-java-home)/include" -I"$(windows-java-home)/include/win32" \
-		-DTARGET_BYTES_PER_WORD=$(pointer-size)
-
-  ifneq ($(lzma),)
-		cflags += -I$(shell $(windows-path) "$(lzma)")
-	endif
-
-	shared = -dll
-	lflags = -nologo -LIBPATH:"$(zlib)/lib" -DEFAULTLIB:ws2_32 \
-		-DEFAULTLIB:zlib -MANIFEST -debug
-	output = -Fo$(1)
-
-	ifeq ($(mode),debug)
-		cflags += -Od -Zi -MDd
-	endif
-	ifeq ($(mode),debug-fast)
-		cflags += -Od -Zi -DNDEBUG
-	endif
-	ifeq ($(mode),fast)
-		cflags += -O2 -GL -Zi -DNDEBUG
-		lflags += -LTCG
-	endif
-	ifeq ($(mode),small)
-		cflags += -O1s -Zi -GL -DNDEBUG
-		lflags += -LTCG
-	endif
-
-	strip = :
-endif
-
-c-objects = $(foreach x,$(1),$(patsubst $(2)/%.c,$(3)/%.o,$(x)))
-cpp-objects = $(foreach x,$(1),$(patsubst $(2)/%.cpp,$(3)/%.o,$(x)))
-asm-objects = $(foreach x,$(1),$(patsubst $(2)/%.S,$(3)/%-asm.o,$(x)))
-java-classes = $(foreach x,$(1),$(patsubst $(2)/%.java,$(3)/%.class,$(x)))
-
-generated-code = \
-	$(build)/type-enums.cpp \
-	$(build)/type-declarations.cpp \
-	$(build)/type-constructors.cpp \
-	$(build)/type-initializations.cpp \
-	$(build)/type-java-initializations.cpp \
-	$(build)/type-name-initializations.cpp \
-	$(build)/type-maps.cpp
-
-vm-depends := $(generated-code) $(wildcard $(src)/*.h)
-
-vm-sources = \
-	$(src)/$(system).cpp \
-	$(src)/finder.cpp \
-	$(src)/machine.cpp \
-	$(src)/util.cpp \
-	$(src)/heap.cpp \
-	$(src)/$(process).cpp \
-	$(src)/classpath-$(classpath).cpp \
-	$(src)/builtin.cpp \
-	$(src)/jnienv.cpp \
-	$(src)/process.cpp
-
-vm-asm-sources = $(src)/$(asm).S
-
-target-asm = $(asm)
-
-ifeq ($(process),compile)
-	vm-sources += \
-		$(src)/compiler.cpp \
-		$(src)/$(target-asm).cpp
-
-	vm-asm-sources += $(src)/compile-$(asm).S
-endif
-
-vm-cpp-objects = $(call cpp-objects,$(vm-sources),$(src),$(build))
-vm-asm-objects = $(call asm-objects,$(vm-asm-sources),$(src),$(build))
-vm-objects = $(vm-cpp-objects) $(vm-asm-objects)
-
-heapwalk-sources = $(src)/heapwalk.cpp 
-heapwalk-objects = \
-	$(call cpp-objects,$(heapwalk-sources),$(src),$(build))
-
-ifeq ($(heapdump),true)
-	vm-sources += $(src)/heapdump.cpp
-	vm-heapwalk-objects = $(heapwalk-objects)
-	cflags += -DAVIAN_HEAPDUMP
-endif
-
-ifeq ($(tails),true)
-	cflags += -DAVIAN_TAILS
-endif
-
-ifeq ($(continuations),true)
-	cflags += -DAVIAN_CONTINUATIONS
-	asmflags += -DAVIAN_CONTINUATIONS
-endif
-
-bootimage-generator-sources = $(src)/bootimage.cpp
-ifneq ($(lzma),)
-	bootimage-generator-sources += $(src)/lzma-encode.cpp
-endif
-bootimage-generator-objects = \
-	$(call cpp-objects,$(bootimage-generator-sources),$(src),$(build))
-bootimage-generator = $(build)/bootimage-generator
-
-bootimage-object = $(build)/bootimage-bin.o
-codeimage-object = $(build)/codeimage-bin.o
-
-ifeq ($(bootimage),true)
-	vm-classpath-objects = $(bootimage-object) $(codeimage-object)
-	cflags += -DBOOT_IMAGE -DAVIAN_CLASSPATH=\"\"
-else
-	vm-classpath-objects = $(classpath-object)
-	cflags += -DBOOT_CLASSPATH=\"[classpathJar]\" \
-		-DAVIAN_CLASSPATH=\"[classpathJar]\"
-endif
-
-cflags += $(extra-cflags)
-lflags += $(extra-lflags)
-
-openjdk-cflags += $(extra-cflags)
-
-driver-source = $(src)/main.cpp
-driver-object = $(build)/main.o
-driver-dynamic-objects = \
-	$(build)/main-dynamic.o
-
-boot-source = $(src)/boot.cpp
-boot-object = $(build)/boot.o
-
-generator-depends := $(wildcard $(src)/*.h)
-generator-sources = \
-	$(src)/type-generator.cpp \
-	$(src)/$(build-system).cpp \
-	$(src)/finder.cpp
-
-ifneq ($(lzma),)
-	common-cflags += -I$(lzma) -DAVIAN_USE_LZMA -D_7ZIP_ST
-
-	vm-sources += \
-		$(src)/lzma-decode.cpp
-
-	generator-sources += \
-		$(src)/lzma-decode.cpp
-
-	lzma-decode-sources = \
-		$(lzma)/C/LzmaDec.c
-
-	lzma-decode-objects = \
-		$(call c-objects,$(lzma-decode-sources),$(lzma)/C,$(build))
-
-	lzma-encode-sources = \
-		$(lzma)/C/LzmaEnc.c \
-		$(lzma)/C/LzFind.c
-
-	lzma-encode-objects = \
-		$(call c-objects,$(lzma-encode-sources),$(lzma)/C,$(build))
-
-	lzma-encoder = $(build)/lzma/lzma
-
-	lzma-encoder-cflags = -D__STDC_CONSTANT_MACROS -fno-rtti -fno-exceptions \
-		-I$(lzma)/C
-
-	lzma-encoder-sources = \
-		$(src)/lzma/main.cpp
-
-	lzma-encoder-objects = \
-		$(call cpp-objects,$(lzma-encoder-sources),$(src),$(build))
-
-	lzma-encoder-lzma-sources = $(lzma-encode-sources) $(lzma-decode-sources)
-
-	lzma-encoder-lzma-objects = \
-		$(call generator-c-objects,$(lzma-encoder-lzma-sources),$(lzma)/C,$(build))
-
-	lzma-loader = $(build)/lzma/load.o
-endif
-
-generator-cpp-objects = \
-	$(foreach x,$(1),$(patsubst $(2)/%.cpp,$(3)/%-build.o,$(x)))
-generator-c-objects = \
-	$(foreach x,$(1),$(patsubst $(2)/%.c,$(3)/%-build.o,$(x)))
-generator-objects = \
-	$(call generator-cpp-objects,$(generator-sources),$(src),$(build))
-generator-lzma-objects = \
-	$(call generator-c-objects,$(lzma-decode-sources),$(lzma)/C,$(build))
-generator = $(build)/generator
-
-converter-depends = \
-	$(src)/binaryToObject/tools.h \
-	$(src)/binaryToObject/endianness.h
-
-converter-sources = \
-	$(src)/binaryToObject/tools.cpp \
-	$(src)/binaryToObject/elf.cpp \
-	$(src)/binaryToObject/mach-o.cpp \
-	$(src)/binaryToObject/pe.cpp
-
-converter-tool-sources = \
-	$(src)/binaryToObject/main.cpp
-
-converter-objects = $(call cpp-objects,$(converter-sources),$(src),$(build))
-converter-tool-objects = $(call cpp-objects,$(converter-tool-sources),$(src),$(build))
-converter = $(build)/binaryToObject/binaryToObject
-
-static-library = $(build)/lib$(name).a
-executable = $(build)/$(name)${exe-suffix}
-dynamic-library = $(build)/$(so-prefix)jvm$(so-suffix)
-executable-dynamic = $(build)/$(name)-dynamic${exe-suffix}
-
-ifneq ($(classpath),avian)
-# Assembler, ConstantPool, and Stream are not technically needed for a
-# working build, but we include them since our Subroutine test uses
-# them to synthesize a class:
-	classpath-sources := \
-		$(classpath-src)/avian/Addendum.java \
-		$(classpath-src)/avian/Assembler.java \
-		$(classpath-src)/avian/Callback.java \
-		$(classpath-src)/avian/CallbackReceiver.java \
-		$(classpath-src)/avian/ClassAddendum.java \
-		$(classpath-src)/avian/Classes.java \
-		$(classpath-src)/avian/ConstantPool.java \
-		$(classpath-src)/avian/Continuations.java \
-		$(classpath-src)/avian/FieldAddendum.java \
-		$(classpath-src)/avian/IncompatibleContinuationException.java \
-		$(classpath-src)/avian/Machine.java \
-		$(classpath-src)/avian/MethodAddendum.java \
-		$(classpath-src)/avian/Singleton.java \
-		$(classpath-src)/avian/Stream.java \
-		$(classpath-src)/avian/SystemClassLoader.java \
-		$(classpath-src)/avian/VMClass.java \
-		$(classpath-src)/avian/VMField.java \
-		$(classpath-src)/avian/VMMethod.java \
-		$(classpath-src)/avian/avian_vm_resource/Handler.java
-
-	ifneq ($(openjdk),)
-		classpath-sources := $(classpath-sources) \
-			$(classpath-src)/avian/OpenJDK.java
-	endif
-else
-	classpath-sources := $(shell find $(classpath-src) -name '*.java')
-endif
-
-classpath-classes = \
-	$(call java-classes,$(classpath-sources),$(classpath-src),$(classpath-build))
-classpath-object = $(build)/classpath-jar.o
-classpath-dep = $(classpath-build).dep
-
-vm-classes = \
-	avian/*.class \
-	avian/resource/*.class
-
-test-support-sources = $(shell find $(test)/avian/ -name '*.java')
-test-sources = $(wildcard $(test)/*.java)
-test-cpp-sources = $(wildcard $(test)/*.cpp)
-test-sources += $(test-support-sources)
-test-support-classes = $(call java-classes, $(test-support-sources),$(test),$(test-build))
-test-classes = $(call java-classes,$(test-sources),$(test),$(test-build))
-test-cpp-objects = $(call cpp-objects,$(test-cpp-sources),$(test),$(test-build))
-test-library = $(build)/$(so-prefix)test$(so-suffix)
-test-dep = $(test-build).dep
-
-test-extra-sources = $(wildcard $(test)/extra/*.java)
-test-extra-classes = \
-	$(call java-classes,$(test-extra-sources),$(test),$(test-build))
-test-extra-dep = $(test-build)-extra.dep
-
-ifeq ($(continuations),true)
-	continuation-tests = \
-		extra.Continuations \
-		extra.Coroutines \
-		extra.DynamicWind
-endif
-
-ifeq ($(tails),true)
-	tail-tests = \
-		extra.Tails
-endif
-
-ifeq ($(target-arch),i386)
-	cflags += -DAVIAN_TARGET_ARCH=AVIAN_ARCH_X86
-endif
-
-ifeq ($(target-arch),x86_64)
-	cflags += -DAVIAN_TARGET_ARCH=AVIAN_ARCH_X86_64
-endif
-
-ifeq ($(target-arch),powerpc)
-	cflags += -DAVIAN_TARGET_ARCH=AVIAN_ARCH_POWERPC
-endif
-
-ifeq ($(target-arch),arm)
-	cflags += -DAVIAN_TARGET_ARCH=AVIAN_ARCH_ARM
-endif
-
-ifeq ($(target-format),elf)
-	cflags += -DAVIAN_TARGET_FORMAT=AVIAN_FORMAT_ELF
-endif
-
-ifeq ($(target-format),pe)
-	cflags += -DAVIAN_TARGET_FORMAT=AVIAN_FORMAT_PE
-endif
-
-ifeq ($(target-format),macho)
-	cflags += -DAVIAN_TARGET_FORMAT=AVIAN_FORMAT_MACHO
-endif
-
-class-name = $(patsubst $(1)/%.class,%,$(2))
-class-names = $(foreach x,$(2),$(call class-name,$(1),$(x)))
-
-test-flags = -Djava.library.path=$(build) -cp $(build)/test
-
-test-args = $(test-flags) $(input)
-
-.PHONY: build
-build: $(static-library) $(executable) $(dynamic-library) $(lzma-loader) \
-	$(lzma-encoder) $(executable-dynamic) $(classpath-dep) $(test-dep) \
-	$(test-extra-dep)
-
-$(test-dep): $(classpath-dep)
-
-$(test-extra-dep): $(classpath-dep)
-
-.PHONY: run
-run: build
-	$(library-path) $(test-executable) $(test-args)
-
-.PHONY: debug
-debug: build
-	$(library-path) gdb --args $(test-executable) $(test-args)
-
-.PHONY: vg
-vg: build
-	$(library-path) $(vg) $(test-executable) $(test-args)
-
-.PHONY: test
-test: build
-	$(library-path) /bin/sh $(test)/test.sh 2>/dev/null \
-		$(test-executable) $(mode) "$(test-flags)" \
-		$(call class-names,$(test-build),$(filter-out $(test-support-classes), $(test-classes))) \
-		$(continuation-tests) $(tail-tests)
-
-.PHONY: tarball
-tarball:
-	@echo "creating build/avian-$(version).tar.bz2"
-	@mkdir -p build
-	(cd .. && tar --exclude=build --exclude='.*' --exclude='*~' -cjf \
-		avian/build/avian-$(version).tar.bz2 avian)
-
-.PHONY: javadoc
-javadoc:
-	javadoc -sourcepath classpath -d build/javadoc -subpackages avian:java \
-		-windowtitle "Avian v$(version) Class Library API" \
-		-doctitle "Avian v$(version) Class Library API" \
-		-header "Avian v$(version)" \
-		-bottom "<a href=\"http://oss.readytalk.com/avian/\">http://oss.readytalk.com/avian</a>"
-
-.PHONY: clean
-clean:
-	@echo "removing build"
-	rm -rf build
-
-$(build)/compile-x86-asm.o: $(src)/continuations-x86.S
-
-gen-arg = $(shell echo $(1) | sed -e 's:$(build)/type-\(.*\)\.cpp:\1:')
-$(generated-code): %.cpp: $(src)/types.def $(generator) $(classpath-dep)
-	@echo "generating $(@)"
-	@mkdir -p $(dir $(@))
-	$(generator) $(boot-classpath) $(<) $(@) $(call gen-arg,$(@))
-
-$(classpath-build)/%.class: $(classpath-src)/%.java
-	@echo $(<)
-
-$(classpath-dep): $(classpath-sources)
-	@echo "compiling classpath classes"
-	@mkdir -p $(classpath-build)
-	$(javac) -d $(classpath-build) -bootclasspath $(boot-classpath) \
-		$(shell $(MAKE) -s --no-print-directory build=$(build) \
-			$(classpath-classes))
-	@touch $(@)
-
-$(test-build)/%.class: $(test)/%.java
-	@echo $(<)
-
-$(test-dep): $(test-sources) $(test-library)
-	@echo "compiling test classes"
-	@mkdir -p $(test-build)
-	files="$(shell $(MAKE) -s --no-print-directory build=$(build) $(test-classes))"; \
-	if test -n "$${files}"; then \
-		$(javac) -d $(test-build) -bootclasspath $(boot-classpath) $${files}; \
-	fi
-	$(javac) -source 1.2 -target 1.1 -XDjsrlimit=0 -d $(test-build) \
-		-bootclasspath $(boot-classpath) test/Subroutine.java
-	@touch $(@)
-
-$(test-extra-dep): $(test-extra-sources)
-	@echo "compiling extra test classes"
-	@mkdir -p $(test-build)
-	files="$(shell $(MAKE) -s --no-print-directory build=$(build) $(test-extra-classes))"; \
-	if test -n "$${files}"; then \
-		$(javac) -d $(test-build) -bootclasspath $(boot-classpath) $${files}; \
-	fi
-	@touch $(@)
-
-define compile-object
-	@echo "compiling $(@)"
-	@mkdir -p $(dir $(@))
-	$(cxx) $(cflags) -c $$($(windows-path) $(<)) $(call output,$(@))
-endef
-
-define compile-asm-object
-	@echo "compiling $(@)"
-	@mkdir -p $(dir $(@))
-	$(as) -I$(src) $(asmflags) -c $(<) -o $(@)
-endef
-
-$(vm-cpp-objects): $(build)/%.o: $(src)/%.cpp $(vm-depends)
-	$(compile-object)
-
-$(test-cpp-objects): $(test-build)/%.o: $(test)/%.cpp $(vm-depends)
-	$(compile-object)
-
-$(test-library): $(test-cpp-objects)
-	@echo "linking $(@)"
-ifdef msvc
-	$(ld) $(shared) $(lflags) $(^) -out:$(@) -PDB:$(@).pdb \
-		-IMPLIB:$(test-build)/$(name).lib -MANIFESTFILE:$(@).manifest
-	$(mt) -manifest $(@).manifest -outputresource:"$(@);2"
-else
-	$(ld) $(^) $(shared) $(lflags) -o $(@)
-endif
-
-$(build)/%.o: $(lzma)/C/%.c
-	@echo "compiling $(@)"
-	@mkdir -p $(dir $(@))
-	$(cxx) $(cflags) $(no-error) -c $$($(windows-path) $(<)) $(call output,$(@))
-
-$(vm-asm-objects): $(build)/%-asm.o: $(src)/%.S
-	$(compile-asm-object)
-
-$(bootimage-generator-objects): $(build)/%.o: $(src)/%.cpp $(vm-depends)
-	$(compile-object)
-
-$(heapwalk-objects): $(build)/%.o: $(src)/%.cpp $(vm-depends)
-	$(compile-object)
-
-$(driver-object): $(driver-source)
-	$(compile-object)
-
-$(build)/main-dynamic.o: $(driver-source)
-	@echo "compiling $(@)"
-	@mkdir -p $(dir $(@))
-	$(cxx) $(cflags) -DBOOT_LIBRARY=\"$(so-prefix)jvm$(so-suffix)\" \
-		-c $(<) $(call output,$(@))
-
-$(boot-object): $(boot-source)
-	$(compile-object)
-
-$(boot-javahome-object): $(src)/boot-javahome.cpp
-	$(compile-object)
-
-$(converter-objects) $(converter-tool-objects): $(build)/binaryToObject/%.o: $(src)/binaryToObject/%.cpp $(converter-depends)
-	@mkdir -p $(dir $(@))
-	$(build-cxx) $(converter-cflags) -c $(<) -o $(@)
-
-$(converter): $(converter-objects) $(converter-tool-objects)
-	$(build-cc) $(^) -g -o $(@)
-
-$(lzma-encoder-objects): $(build)/lzma/%.o: $(src)/lzma/%.cpp
-	@mkdir -p $(dir $(@))
-	$(build-cxx) $(lzma-encoder-cflags) -c $(<) -o $(@)
-
-$(lzma-encoder): $(lzma-encoder-objects) $(lzma-encoder-lzma-objects)
-	$(build-cc) $(^) -g -o $(@)
-
-$(lzma-loader): $(src)/lzma/load.cpp
-	$(compile-object)
-
-$(build)/classpath.jar: $(classpath-dep) $(classpath-jar-dep)
-	@echo "creating $(@)"
-	(wd=$$(pwd) && \
-	 cd $(classpath-build) && \
-	 $(jar) c0f "$$($(native-path) "$${wd}/$(@)")" .)
-
-$(classpath-object): $(build)/classpath.jar $(converter)
-	@echo "creating $(@)"
-	$(converter) $(<) $(@) _binary_classpath_jar_start \
-		_binary_classpath_jar_end $(target-format) $(arch)
-
-$(build)/javahome.jar:
-	@echo "creating $(@)"
-	(wd=$$(pwd) && \
-	 cd "$(build-javahome)" && \
-	 $(jar) c0f "$$($(native-path) "$${wd}/$(@)")" $(javahome-files))
-
-$(javahome-object): $(build)/javahome.jar $(converter)
-	@echo "creating $(@)"
-	$(converter) $(<) $(@) _binary_javahome_jar_start \
-		_binary_javahome_jar_end $(target-format) $(arch)
-
-define compile-generator-object
-	@echo "compiling $(@)"
-	@mkdir -p $(dir $(@))
-	$(build-cxx) -DPOINTER_SIZE=$(pointer-size) -O0 -g3 $(build-cflags) \
-		-c $(<) -o $(@)
-endef
-
-$(generator-objects): $(generator-depends)
-$(generator-objects): $(build)/%-build.o: $(src)/%.cpp
-	$(compile-generator-object)
-
-$(build)/%-build.o: $(lzma)/C/%.c
-	@echo "compiling $(@)"
-	@mkdir -p $(dir $(@))
-	$(build-cxx) -DPOINTER_SIZE=$(pointer-size) -O0 -g3 $(build-cflags) \
-		$(no-error) -c $(<) -o $(@)
-
-$(jni-objects): $(build)/%.o: $(classpath-src)/%.cpp
-	$(compile-object)
-
-$(static-library): $(vm-objects) $(classpath-objects) $(vm-heapwalk-objects) \
-		$(javahome-object) $(boot-javahome-object) $(lzma-decode-objects)
-	@echo "creating $(@)"
-	rm -rf $(@)
-	$(ar) cru $(@) $(^)
-	$(ranlib) $(@)
-
-$(bootimage-object) $(codeimage-object): $(bootimage-generator)
-	$(<) -cp $(classpath-build) -bootimage $(bootimage-object) -codeimage $(codeimage-object) \
-		-bootimage-symbols _binary_bootimage_bin_start:_binary_bootimage_bin_end \
-		-codeimage-symbols _binary_codeimage_bin_start:_binary_codeimage_bin_end
-
-executable-objects = $(vm-objects) $(classpath-objects) $(driver-object) \
-	$(vm-heapwalk-objects) $(boot-object) $(vm-classpath-objects) \
-	$(javahome-object) $(boot-javahome-object) $(lzma-decode-objects)
-
-$(executable): $(executable-objects)
-	@echo "linking $(@)"
-ifeq ($(platform),windows)
-ifdef msvc
-	$(ld) $(lflags) $(executable-objects) -out:$(@) -PDB:$(@).pdb \
-		-IMPLIB:$(@).lib -MANIFESTFILE:$(@).manifest
-	$(mt) -manifest $(@).manifest -outputresource:"$(@);1"
-else
-	$(dlltool) -z $(@).def $(executable-objects)
-	$(dlltool) -d $(@).def -e $(@).exp
-	$(ld) $(@).exp $(executable-objects) $(lflags) -o $(@)
-endif
-else
-	$(ld) $(executable-objects) $(rdynamic) $(lflags) $(bootimage-lflags) -o $(@)
-endif
-	$(strip) $(strip-all) $(@)
-
-$(bootimage-generator): $(bootimage-generator-objects)
-	echo arch=$(arch) platform=$(platform)
-	$(MAKE) mode=$(mode) \
-		arch=$(build-arch) \
-		target-arch=$(arch) \
-		platform=$(bootimage-platform) \
-		target-format=$(target-format) \
-		openjdk=$(openjdk) \
-		openjdk-src=$(openjdk-src) \
-		bootimage-generator= \
-		build-bootimage-generator=$(bootimage-generator) \
-		target-cflags="$(bootimage-cflags)" \
-		target-asm=$(asm) \
-		$(bootimage-generator)
-
-$(build-bootimage-generator): \
-		$(vm-objects) $(classpath-object) $(classpath-objects) \
-		$(heapwalk-objects) $(bootimage-generator-objects) $(converter-objects) \
-		$(lzma-decode-objects) $(lzma-encode-objects)
-	@echo "linking $(@)"
-ifeq ($(platform),windows)
-ifdef msvc
-	$(ld) $(lflags) $(^) -out:$(@) -PDB:$(@).pdb -IMPLIB:$(@).lib \
-		-MANIFESTFILE:$(@).manifest
-	$(mt) -manifest $(@).manifest -outputresource:"$(@);1"
-else
-	$(dlltool) -z $(@).def $(^)
-	$(dlltool) -d $(@).def -e $(@).exp
-	$(ld) $(@).exp $(^) $(lflags) -o $(@)
-endif
-else
-	$(ld) $(^) $(rdynamic) $(lflags) -o $(@)
-endif
-
-$(dynamic-library): $(vm-objects) $(dynamic-object) $(classpath-objects) \
-		$(vm-heapwalk-objects) $(boot-object) $(vm-classpath-objects) \
-		$(classpath-libraries) $(javahome-object) $(boot-javahome-object) \
-		$(lzma-decode-objects)
-	@echo "linking $(@)"
-ifdef msvc
-	$(ld) $(shared) $(lflags) $(^) -out:$(@) -PDB:$(@).pdb \
-		-IMPLIB:$(build)/$(name).lib -MANIFESTFILE:$(@).manifest
-	$(mt) -manifest $(@).manifest -outputresource:"$(@);2"
-else
-	$(ld) $(^) $(version-script-flag)	$(shared) $(lflags) $(bootimage-lflags) \
-		-o $(@)
-endif
-	$(strip) $(strip-all) $(@)
-
-# todo: the $(no-lto) flag below is due to odd undefined reference errors on
-# Ubuntu 11.10 which may be fixable without disabling LTO.
-$(executable-dynamic): $(driver-dynamic-objects) $(dynamic-library)
-	@echo "linking $(@)"
-ifdef msvc
-	$(ld) $(lflags) -LIBPATH:$(build) -DEFAULTLIB:$(name) \
-		-PDB:$(@).pdb -IMPLIB:$(@).lib $(driver-dynamic-objects) -out:$(@) \
-		-MANIFESTFILE:$(@).manifest
-	$(mt) -manifest $(@).manifest -outputresource:"$(@);1"
-else
-	$(ld) $(driver-dynamic-objects) -L$(build) -ljvm $(lflags) $(no-lto) -o $(@)
-endif
-	$(strip) $(strip-all) $(@)
-
-$(generator): $(generator-objects) $(generator-lzma-objects)
-	@echo "linking $(@)"
-	$(build-ld) $(^) $(build-lflags) -o $(@)
-
-$(openjdk-objects): $(build)/openjdk/%-openjdk.o: $(openjdk-src)/%.c \
-		$(openjdk-headers-dep)
-	@echo "compiling $(@)"
-	@mkdir -p $(dir $(@))
-	sed 's/^static jclass ia_class;//' < $(<) > $(build)/openjdk/$(notdir $(<))
-ifeq ($(ios),true)
-	sed \
-		-e 's/^#ifndef __APPLE__/#if 1/' \
-		-e 's/^#ifdef __APPLE__/#if 0/' \
-		< "$(openjdk-src)/solaris/native/java/lang/ProcessEnvironment_md.c" \
-		> $(build)/openjdk/ProcessEnvironment_md.c
-	sed \
-		-e 's/^#ifndef __APPLE__/#if 1/' \
-		-e 's/^#ifdef __APPLE__/#if 0/' \
-		< "$(openjdk-src)/solaris/native/java/lang/UNIXProcess_md.c" \
-		> $(build)/openjdk/UNIXProcess_md.c
-endif
-	$(cc) -fPIC $(openjdk-extra-cflags) $(openjdk-cflags) \
-		$(optimization-cflags) -w -c $(build)/openjdk/$(notdir $(<)) \
-		$(call output,$(@))
-
-$(openjdk-local-objects): $(build)/openjdk/%-openjdk.o: $(src)/openjdk/%.c \
-		$(openjdk-headers-dep)
-	@echo "compiling $(@)"
-	@mkdir -p $(dir $(@))
-	$(cc) -fPIC $(openjdk-extra-cflags) $(openjdk-cflags) \
-		$(optimization-cflags) -w -c $(<) $(call output,$(@))
-
-$(openjdk-headers-dep):
-	@echo "generating openjdk headers"
-	@mkdir -p $(dir $(@))
-	$(javah) -d $(build)/openjdk -bootclasspath $(boot-classpath) \
-		$(openjdk-headers-classes)
-ifeq ($(platform),windows)
-	sed 's/^#ifdef _WIN64/#if 1/' \
-		< "$(openjdk-src)/windows/native/java/net/net_util_md.h" \
-		> $(build)/openjdk/net_util_md.h
-	sed \
-		-e 's/\(^#include "net_util.h"\)/\1\n#if (defined _INC_NLDEF) || (defined _WS2DEF_)\n#define HIDE(x) hide_##x\n#else\n#define HIDE(x) x\n#define _WINSOCK2API_\n#endif/' \
-		-e 's/\(IpPrefix[a-zA-Z_]*\)/HIDE(\1)/' \
-		-e 's/\(IpSuffix[a-zA-Z_]*\)/HIDE(\1)/' \
-		-e 's/\(IpDad[a-zA-Z_]*\)/HIDE(\1)/' \
-		-e 's/\(ScopeLevel[a-zA-Z_]*\)/HIDE(\1)/' \
-		-e 's/\(SCOPE_LEVEL[a-zA-Z_]*\)/HIDE(\1)/' \
-		< "$(openjdk-src)/windows/native/java/net/NetworkInterface.h" \
-		> $(build)/openjdk/NetworkInterface.h
-	echo 'static int getAddrsFromAdapter(IP_ADAPTER_ADDRESSES *ptr, netaddr **netaddrPP);' >> $(build)/openjdk/NetworkInterface.h
-endif
-ifeq ($(platform),darwin)
-	mkdir -p $(build)/openjdk/netinet
-	for file in \
-		/usr/include/netinet/ip.h \
-		/usr/include/netinet/in_systm.h \
-		/usr/include/netinet/ip_icmp.h \
-		/usr/include/netinet/in_var.h \
-		/usr/include/netinet/icmp6.h \
-		/usr/include/netinet/ip_var.h; do \
-		if [ ! -f "$(build)/openjdk/netinet/$$(basename $${file})" ]; then \
-			ln "$${file}" "$(build)/openjdk/netinet/$$(basename $${file})"; \
-		fi; \
-	done
-	mkdir -p $(build)/openjdk/netinet6
-	for file in \
-		/usr/include/netinet6/in6_var.h; do \
-		if [ ! -f "$(build)/openjdk/netinet6/$$(basename $${file})" ]; then \
-			ln "$${file}" "$(build)/openjdk/netinet6/$$(basename $${file})"; \
-		fi; \
-	done
-	mkdir -p $(build)/openjdk/net
-	for file in \
-		/usr/include/net/if_arp.h; do \
-		if [ ! -f "$(build)/openjdk/net/$$(basename $${file})" ]; then \
-			ln "$${file}" "$(build)/openjdk/net/$$(basename $${file})"; \
-		fi; \
-	done
-	mkdir -p $(build)/openjdk/sys
-	for file in \
-		/usr/include/sys/kern_event.h \
-		/usr/include/sys/sys_domain.h; do \
-		if [ ! -f "$(build)/openjdk/sys/$$(basename $${file})" ]; then \
-			ln "$${file}" "$(build)/openjdk/sys/$$(basename $${file})"; \
-		fi; \
-	done
-endif
-	@touch $(@)
-
-$(openjdk-jar-dep):
-	@echo "extracting openjdk classes"
-	@mkdir -p $(dir $(@))
-	@mkdir -p $(classpath-build)
-	(cd $(classpath-build) && \
-		$(jar) xf "$$($(native-path) "$(openjdk)/jre/lib/rt.jar")" && \
-		$(jar) xf "$$($(native-path) "$(openjdk)/jre/lib/jsse.jar")" && \
-		$(jar) xf "$$($(native-path) "$(openjdk)/jre/lib/jce.jar")" && \
-		$(jar) xf "$$($(native-path) "$(openjdk)/jre/lib/charsets.jar")" && \
-		$(jar) xf "$$($(native-path) "$(openjdk)/jre/lib/ext/sunjce_provider.jar")" && \
-		$(jar) xf "$$($(native-path) "$(openjdk)/jre/lib/resources.jar")")
-	@touch $(@)

=== removed directory '.pc/version-info.diff'
=== removed file '.pc/version-info.diff/makefile'
--- .pc/version-info.diff/makefile	2012-09-05 12:24:24 +0000
+++ .pc/version-info.diff/makefile	1970-01-01 00:00:00 +0000
@@ -1,1287 +0,0 @@
-MAKEFLAGS = -s
-
-name = avian
-version = 0.6
-
-build-arch := $(shell uname -m \
-	| sed 's/^i.86$$/i386/' \
-	| sed 's/^x86pc$$/i386/' \
-	| sed 's/amd64/x86_64/' \
-	| sed 's/^arm.*$$/arm/' \
-	| sed 's/ppc/powerpc/')
-
-ifeq (Power,$(filter Power,$(build-arch)))
-	build-arch = powerpc
-endif
-
-build-platform := \
-	$(shell uname -s | tr [:upper:] [:lower:] \
-		| sed 's/^mingw32.*$$/mingw32/' \
-		| sed 's/^cygwin.*$$/cygwin/')
-
-arch = $(build-arch)
-target-arch = $(arch)
-bootimage-platform = \
-	$(subst cygwin,windows,$(subst mingw32,windows,$(build-platform)))
-platform = $(bootimage-platform)
-
-mode = fast
-process = compile
-
-ifneq ($(process),compile)
-	options := -$(process)
-endif
-ifneq ($(mode),fast)
-	options := $(options)-$(mode)
-endif
-ifneq ($(lzma),)
-	options := $(options)-lzma
-endif
-ifeq ($(bootimage),true)
-	options := $(options)-bootimage
-endif
-ifeq ($(heapdump),true)
-	options := $(options)-heapdump
-endif
-ifeq ($(tails),true)
-	options := $(options)-tails
-endif
-ifeq ($(continuations),true)
-	options := $(options)-continuations
-endif
-
-root := $(shell (cd .. && pwd))
-build = build/$(platform)-$(arch)$(options)
-classpath-build = $(build)/classpath
-test-build = $(build)/test
-src = src
-classpath-src = classpath
-test = test
-win32 ?= $(root)/win32
-win64 ?= $(root)/win64
-
-classpath = avian
-
-test-executable = $(shell pwd)/$(executable)
-boot-classpath = $(classpath-build)
-embed-prefix = /avian-embedded
-
-native-path = echo
-
-ifeq ($(build-platform),cygwin)
-	native-path = cygpath -m
-endif
-
-windows-path = echo
-
-path-separator = :
-
-ifneq (,$(filter mingw32 cygwin,$(build-platform)))
-	path-separator = ;
-endif
-
-library-path-variable = LD_LIBRARY_PATH
-
-ifeq ($(build-platform),darwin)
-	library-path-variable = DYLD_LIBRARY_PATH
-endif
-
-library-path = $(library-path-variable)=$(build)
-
-ifneq ($(openjdk),)
-	openjdk-arch = $(arch)
-	ifeq ($(arch),x86_64)
-		openjdk-arch = amd64
-	endif
-
-	ifneq ($(openjdk-src),)
-		include openjdk-src.mk
-	  options := $(options)-openjdk-src
-		classpath-objects = $(openjdk-objects) $(openjdk-local-objects)
-		classpath-cflags = -DAVIAN_OPENJDK_SRC -DBOOT_JAVAHOME
-		openjdk-jar-dep = $(build)/openjdk-jar.dep
-		classpath-jar-dep = $(openjdk-jar-dep)
-		javahome = $(embed-prefix)/javahomeJar
-		javahome-files = lib/zi lib/currency.data lib/security/java.security \
-			lib/security/java.policy lib/security/cacerts
-
-		local-policy = lib/security/local_policy.jar
-		ifeq ($(shell test -e "$(openjdk)/$(local-policy)" && echo found),found)
-			javahome-files += $(local-policy)
-		endif
-
-		export-policy = lib/security/US_export_policy.jar
-		ifeq ($(shell test -e "$(openjdk)/$(export-policy)" && echo found),found)
-			javahome-files += $(export-policy)
-		endif
-
-		ifeq ($(platform),windows)
-			javahome-files += lib/tzmappings
-		endif
-		javahome-object = $(build)/javahome-jar.o
-		boot-javahome-object = $(build)/boot-javahome.o
-	else
-	  options := $(options)-openjdk
-		test-executable = $(shell pwd)/$(executable-dynamic)
-		ifeq ($(build-platform),darwin)
-			library-path = \
-				$(library-path-variable)=$(build):$(openjdk)/jre/lib
-		else
-			library-path = \
-				$(library-path-variable)=$(build):$(openjdk)/jre/lib/$(openjdk-arch)
-		endif
-		javahome = "$$($(native-path) "$(openjdk)/jre")"
-	endif
-
-  classpath = openjdk
-	boot-classpath := "$(boot-classpath)$(path-separator)$$($(native-path) "$(openjdk)/jre/lib/rt.jar")"
-	build-javahome = $(openjdk)/jre
-endif
-
-ifeq ($(classpath),avian)
-	jni-sources := $(shell find $(classpath-src) -name '*.cpp')
-	jni-objects = $(call cpp-objects,$(jni-sources),$(classpath-src),$(build))
-	classpath-objects = $(jni-objects)
-endif
-
-input = List
-
-ifeq ($(use-clang),true)
-	build-cxx = clang -std=c++11
-	build-cc = clang
-else
-	build-cxx = g++
-	build-cc = gcc
-endif
-
-mflag =
-ifneq ($(platform),darwin)
-	ifeq ($(arch),i386)
-		mflag = -m32
-	endif
-	ifeq ($(arch),x86_64)
-		mflag = -m64
-	endif
-endif
-
-target-format = elf
-
-cxx = $(build-cxx) $(mflag)
-cc = $(build-cc) $(mflag)
-
-ar = ar
-ranlib = ranlib
-dlltool = dlltool
-vg = nice valgrind --num-callers=32 --db-attach=yes --freelist-vol=100000000
-vg += --leak-check=full --suppressions=valgrind.supp
-db = gdb --args
-javac = "$(JAVA_HOME)/bin/javac"
-javah = "$(JAVA_HOME)/bin/javah"
-jar = "$(JAVA_HOME)/bin/jar"
-strip = strip
-strip-all = --strip-all
-
-rdynamic = -rdynamic
-
-# note that we suppress the non-virtual-dtor warning because we never
-# use the delete operator, which means we don't need virtual
-# destructors:
-warnings = -Wall -Wextra -Werror -Wunused-parameter -Winit-self \
-	-Wno-non-virtual-dtor
-
-target-cflags = -DTARGET_BYTES_PER_WORD=$(pointer-size)
-
-common-cflags = $(warnings) -fno-rtti -fno-exceptions -I$(classpath-src) \
-	"-I$(JAVA_HOME)/include" -idirafter $(src) -I$(build) $(classpath-cflags) \
-	-D__STDC_LIMIT_MACROS -D_JNI_IMPLEMENTATION_ -DAVIAN_VERSION=\"$(version)\" \
-	-DUSE_ATOMIC_OPERATIONS -DAVIAN_JAVA_HOME=\"$(javahome)\" \
-	-DAVIAN_EMBED_PREFIX=\"$(embed-prefix)\" $(target-cflags)
-
-asmflags = $(target-cflags)
-
-ifneq (,$(filter i386 x86_64,$(arch)))
-	ifeq ($(use-frame-pointer),true)
-		common-cflags += -fno-omit-frame-pointer -DAVIAN_USE_FRAME_POINTER
-		asmflags += -DAVIAN_USE_FRAME_POINTER
-	endif
-endif
-
-build-cflags = $(common-cflags) -fPIC -fvisibility=hidden \
-	"-I$(JAVA_HOME)/include/linux" -I$(src) -pthread
-
-converter-cflags = -D__STDC_CONSTANT_MACROS -Isrc/binaryToObject -Isrc/ \
-	-fno-rtti -fno-exceptions \
-	-DAVIAN_TARGET_ARCH=AVIAN_ARCH_UNKNOWN \
-	-DAVIAN_TARGET_FORMAT=AVIAN_FORMAT_UNKNOWN \
-	-Wall -Wextra -Werror -Wunused-parameter -Winit-self -Wno-non-virtual-dtor
-
-cflags = $(build-cflags)
-
-common-lflags = -lm -lz $(classpath-lflags)
-
-build-lflags = -lz -lpthread -ldl
-
-lflags = $(common-lflags) -lpthread -ldl
-
-soname-flag = -Wl,-soname -Wl,$(so-prefix)jvm$(so-suffix)
-version-script-flag = -Wl,--version-script=openjdk.ld
-
-cflags += $(DPKG_CFLAGS)
-lflags += $(DPKG_LFLAGS)
-
-build-system = posix
-
-system = posix
-asm = x86
-
-pointer-size = 8
-
-so-prefix = lib
-so-suffix = .so
-
-shared = -shared
-
-no-error = -Wno-error
-
-openjdk-extra-cflags = -fvisibility=hidden
-
-bootimage-cflags = -DTARGET_BYTES_PER_WORD=$(pointer-size)
-
-developer-dir := $(shell if test -d /Developer; then echo /Developer; \
-	else echo /Applications/Xcode.app/Contents/Developer; fi)
-
-ifeq ($(build-arch),powerpc)
-	ifneq ($(arch),$(build-arch))
-		bootimage-cflags += -DTARGET_OPPOSITE_ENDIAN
-	endif
-endif
-
-ifeq ($(arch),i386)
-	pointer-size = 4
-endif
-
-ifeq ($(arch),powerpc)
-	asm = powerpc
-	pointer-size = 4
-
-	ifneq ($(arch),$(build-arch))
-		bootimage-cflags += -DTARGET_OPPOSITE_ENDIAN
-	endif
-
-	ifneq ($(platform),darwin)
-		ifneq ($(arch),$(build-arch))
-			cxx = powerpc-linux-gnu-g++
-			cc = powerpc-linux-gnu-gcc
-			ar = powerpc-linux-gnu-ar
-			ranlib = powerpc-linux-gnu-ranlib
-			strip = powerpc-linux-gnu-strip
-		endif
-	endif
-endif
-
-ifeq ($(arch),arm)
-	asm = arm
-	pointer-size = 4
-
-	ifeq ($(build-platform),darwin)
-		ios = true
-	else
-		no-psabi = -Wno-psabi
-		cflags += -marm $(no-psabi)
-	endif
-
-	ifneq ($(arch),$(build-arch))
-		ifeq ($(platform),darwin)
-			ios-bin = $(developer-dir)/Platforms/iPhoneOS.platform/Developer/usr/bin
-			cxx = $(ios-bin)/g++
-			cc = $(ios-bin)/gcc
-			ar = $(ios-bin)/ar
-			ranlib = $(ios-bin)/ranlib
-			strip = $(ios-bin)/strip
-		else
-			cxx = arm-linux-gnueabi-g++
-			cc = arm-linux-gnueabi-gcc
-			ar = arm-linux-gnueabi-ar
-			ranlib = arm-linux-gnueabi-ranlib
-			strip = arm-linux-gnueabi-strip
-		endif
-	endif
-endif
-
-ifeq ($(ios),true)
-	cflags += -DAVIAN_IOS
-endif
-
-ifeq ($(build-platform),darwin)
-	build-cflags = $(common-cflags) -fPIC -fvisibility=hidden -I$(src)
-	cflags += -I/System/Library/Frameworks/JavaVM.framework/Headers/
-	build-lflags += -framework CoreFoundation
-endif
-
-ifeq ($(platform),qnx)
-	cflags = $(common-cflags) -fPIC -fvisibility=hidden -I$(src)
-	lflags = $(common-lflags) -lsocket
-	ifeq ($(build-platform),qnx)
-		build-cflags = $(common-cflags) -fPIC -fvisibility=hidden -I$(src)
-		build-lflags = $(common-lflags)
-	else
-		ifeq ($(arch),i386)
-			prefix = i486-pc-nto-qnx6.5.0-
-		else
-			prefix = arm-unknown-nto-qnx6.5.0-
-		endif
-	endif
-	cxx = $(prefix)g++
-	cc = $(prefix)gcc
-	ar = $(prefix)ar
-	ranlib = $(prefix)ranlib
-	strip = $(prefix)strip
-	rdynamic = -Wl,--export-dynamic
-endif
-
-ifeq ($(platform),freebsd)
-# There is no -ldl on FreeBSD
-	build-lflags = $(common-lflags) -lz -lpthread
-	lflags = $(common-lflags) -lpthread
-# include/freebsd instead of include/linux
-	build-cflags = $(common-cflags) -fPIC -fvisibility=hidden \
-		"-I$(JAVA_HOME)/include/freebsd" -I$(src) -pthread
-	cflags = $(build-cflags)
-endif
-
-ifeq ($(platform),darwin)
-	target-format = macho
-	ifeq (${OSX_SDK_SYSROOT},)
-		OSX_SDK_SYSROOT = 10.4u
-	endif
-	ifeq (${OSX_SDK_VERSION},)
-		OSX_SDK_VERSION = 10.4
-	endif
-	ifneq ($(build-platform),darwin)
-		cxx = i686-apple-darwin8-g++ $(mflag)
-		cc = i686-apple-darwin8-gcc $(mflag)
-		ar = i686-apple-darwin8-ar
-		ranlib = i686-apple-darwin8-ranlib
-		strip = i686-apple-darwin8-strip
-		sysroot = /opt/mac/SDKs/MacOSX${OSX_SDK_SYSROOT}.sdk
-		cflags = -I$(sysroot)/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Headers/ \
-			$(common-cflags) -fPIC -fvisibility=hidden -I$(src)
-	endif
-
-	version-script-flag =
-	lflags = $(common-lflags) -ldl -framework CoreFoundation
-
-	ifeq (,$(shell ld -v 2>&1 | grep cctools))
-		lflags += -Wl,-compatibility_version,1.0.0
-	endif
-
-	ifneq ($(arch),arm)
-		lflags +=	-framework CoreServices -framework SystemConfiguration \
-			-framework Security
-	endif
-	ifeq ($(bootimage),true)
-		bootimage-lflags = -Wl,-segprot,__RWX,rwx,rwx
-	endif
-	rdynamic =
-	strip-all = -S -x
-	so-suffix = .dylib
-	shared = -dynamiclib
-
-	sdk-dir = $(developer-dir)/Platforms/iPhoneOS.platform/Developer/SDKs
-
-	ifeq ($(arch),arm)
-		ios-version := \
-			$(shell if test -d $(sdk-dir)/iPhoneOS5.1.sdk; then echo 5.1; \
-				elif test -d $(sdk-dir)/iPhoneOS5.0.sdk; then echo 5.0; \
-				elif test -d $(sdk-dir)/iPhoneOS4.3.sdk; then echo 4.3; \
-				elif test -d $(sdk-dir)/iPhoneOS4.2.sdk; then echo 4.2; \
-				else echo; fi)
-
-		ifeq ($(ios-version),)
-			x := $(error "couldn't find SDK for iOS version")
-		endif
-
-		flags = -arch armv7 -isysroot \
-			$(sdk-dir)/iPhoneOS$(ios-version).sdk/
-		openjdk-extra-cflags += $(flags)
-		cflags += $(flags)
-		asmflags += $(flags)
-		lflags += $(flags)
-	endif
-
-	ifeq ($(arch),powerpc)
-		openjdk-extra-cflags += -arch ppc -mmacosx-version-min=${OSX_SDK_VERSION}
-		cflags += -arch ppc -mmacosx-version-min=${OSX_SDK_VERSION}
-		asmflags += -arch ppc -mmacosx-version-min=${OSX_SDK_VERSION}
-		lflags += -arch ppc -mmacosx-version-min=${OSX_SDK_VERSION}
-	endif
-
-	ifeq ($(arch),i386)
-		openjdk-extra-cflags += -arch i386 -mmacosx-version-min=${OSX_SDK_VERSION}
-		cflags += -arch i386 -mmacosx-version-min=${OSX_SDK_VERSION}
-		asmflags += -arch i386 -mmacosx-version-min=${OSX_SDK_VERSION}
-		lflags += -arch i386 -mmacosx-version-min=${OSX_SDK_VERSION}
-	endif
-
-	ifeq ($(arch),x86_64)
-		openjdk-extra-cflags += -arch x86_64
-		cflags += -arch x86_64
-		asmflags += -arch x86_64
-		lflags += -arch x86_64
-	endif
-endif
-
-ifeq ($(platform),windows)
-	target-format = pe
-
-	inc = "$(win32)/include"
-	lib = "$(win32)/lib"
-
-	embed-prefix = c:/avian-embedded
-
-	system = windows
-
-	so-prefix =
-	so-suffix = .dll
-	exe-suffix = .exe
-
-	lflags = -L$(lib) $(common-lflags) -lws2_32 -liphlpapi -mwindows -mconsole
-	cflags = -I$(inc) $(common-cflags) -DWINVER=0x0500
-
-	ifeq (,$(filter mingw32 cygwin,$(build-platform)))
-		openjdk-extra-cflags += -I$(src)/openjdk/caseSensitive
-		prefix := $(shell i686-w64-mingw32-gcc --version >/dev/null 2>&1 \
-			&& echo i686-w64-mingw32- || echo x86_64-w64-mingw32-)
-		cxx = $(prefix)g++ -m32
-		cc = $(prefix)gcc -m32
-		dlltool = $(prefix)dlltool -mi386 --as-flags=--32 
-		ar = $(prefix)ar
-		ranlib = $(prefix)ranlib
-		strip = $(prefix)strip --strip-all
-	else
-		build-system = windows
-		common-cflags += "-I$(JAVA_HOME)/include/win32"
-		build-cflags = $(common-cflags) -I$(src) -I$(inc) -mthreads
-		openjdk-extra-cflags =
-		build-lflags = -L$(lib) $(common-lflags)
-		ifeq ($(build-platform),cygwin)
-			build-cxx = i686-w64-mingw32-g++
-			build-cc = i686-w64-mingw32-gcc
-			dlltool = i686-w64-mingw32-dlltool
-			ar = i686-w64-mingw32-ar
-			ranlib = i686-w64-mingw32-ranlib
-			strip = i686-w64-mingw32-strip
-		endif
-	endif
-
-	ifeq ($(arch),x86_64)
-		ifeq ($(build-platform),cygwin)
-			build-cxx = x86_64-w64-mingw32-g++
-			build-cc = x86_64-w64-mingw32-gcc
-		endif
-		cxx = x86_64-w64-mingw32-g++ $(mflag)
-		cc = x86_64-w64-mingw32-gcc $(mflag)
-		dlltool = x86_64-w64-mingw32-dlltool
-		ar = x86_64-w64-mingw32-ar
-		ranlib = x86_64-w64-mingw32-ranlib
-		strip = x86_64-w64-mingw32-strip
-		inc = "$(win64)/include"
-		lib = "$(win64)/lib"
-	else
-		shared += -Wl,--add-stdcall-alias
-	endif
-endif
-
-ifeq ($(mode),debug)
-	optimization-cflags = -O0 -g3
-	converter-cflags += -O0 -g3
-	strip = :
-endif
-ifeq ($(mode),debug-fast)
-	optimization-cflags = -O0 -g3 -DNDEBUG
-	strip = :
-endif
-ifeq ($(mode),stress)
-	optimization-cflags = -O0 -g3 -DVM_STRESS
-	strip = :
-endif
-ifeq ($(mode),stress-major)
-	optimization-cflags = -O0 -g3 -DVM_STRESS -DVM_STRESS_MAJOR
-	strip = :
-endif
-ifeq ($(mode),fast)
-	ifeq ($(use-clang),true)
-		optimization-cflags = -O4 -g3 -DNDEBUG
-	else
-		optimization-cflags = -O3 -g3 -DNDEBUG
-	endif
-	use-lto = true
-endif
-ifeq ($(mode),small)
-	ifeq ($(use-clang),true)
-		optimization-cflags = -Oz -g3 -DNDEBUG
-	else
-		optimization-cflags = -Os -g3 -DNDEBUG
-	endif
-	use-lto = true
-endif
-
-ifeq ($(use-lto),true)
-	ifeq ($(use-clang),true)
-		optimization-cflags += -flto
-		lflags += $(optimization-cflags)
-	else
-# only try to use LTO when GCC 4.6.0 or greater is available
-		gcc-major := $(shell $(cc) -dumpversion | cut -f1 -d.)
-		gcc-minor := $(shell $(cc) -dumpversion | cut -f2 -d.)
-		ifeq ($(shell expr 4 \< $(gcc-major) \
-				\| \( 4 \<= $(gcc-major) \& 6 \<= $(gcc-minor) \)),1)
-			optimization-cflags += -flto
-			no-lto = -fno-lto
-			lflags += $(optimization-cflags)
-		endif
-	endif
-endif
-
-cflags += $(optimization-cflags)
-
-ifneq ($(platform),darwin)
-ifeq ($(arch),i386)
-# this is necessary to support __sync_bool_compare_and_swap:
-	cflags += -march=i586
-	lflags += -march=i586
-endif
-endif
-
-output = -o $(1)
-as := $(cc)
-ld := $(cc)
-build-ld := $(build-cc)
-
-ifdef msvc
-	no-error =
-	windows-path = $(native-path)
-	windows-java-home := $(shell $(windows-path) "$(JAVA_HOME)")
-	zlib := $(shell $(windows-path) "$(win32)/msvc")
-	cxx = "$(msvc)/BIN/cl.exe"
-	cc = $(cxx)
-	ld = "$(msvc)/BIN/link.exe"
-	mt = "mt.exe"
-	cflags = -nologo -DAVIAN_VERSION=\"$(version)\" -D_JNI_IMPLEMENTATION_ \
-		-DUSE_ATOMIC_OPERATIONS -DAVIAN_JAVA_HOME=\"$(javahome)\" \
-		-DAVIAN_EMBED_PREFIX=\"$(embed-prefix)\" \
-		-Fd$(build)/$(name).pdb -I"$(zlib)/include" -I$(src) -I$(classpath-src) \
-		-I"$(build)" \
-		-I"$(windows-java-home)/include" -I"$(windows-java-home)/include/win32" \
-		-DTARGET_BYTES_PER_WORD=$(pointer-size)
-
-  ifneq ($(lzma),)
-		cflags += -I$(shell $(windows-path) "$(lzma)")
-	endif
-
-	shared = -dll
-	lflags = -nologo -LIBPATH:"$(zlib)/lib" -DEFAULTLIB:ws2_32 \
-		-DEFAULTLIB:zlib -MANIFEST -debug
-	output = -Fo$(1)
-
-	ifeq ($(mode),debug)
-		cflags += -Od -Zi -MDd
-	endif
-	ifeq ($(mode),debug-fast)
-		cflags += -Od -Zi -DNDEBUG
-	endif
-	ifeq ($(mode),fast)
-		cflags += -O2 -GL -Zi -DNDEBUG
-		lflags += -LTCG
-	endif
-	ifeq ($(mode),small)
-		cflags += -O1s -Zi -GL -DNDEBUG
-		lflags += -LTCG
-	endif
-
-	strip = :
-endif
-
-c-objects = $(foreach x,$(1),$(patsubst $(2)/%.c,$(3)/%.o,$(x)))
-cpp-objects = $(foreach x,$(1),$(patsubst $(2)/%.cpp,$(3)/%.o,$(x)))
-asm-objects = $(foreach x,$(1),$(patsubst $(2)/%.S,$(3)/%-asm.o,$(x)))
-java-classes = $(foreach x,$(1),$(patsubst $(2)/%.java,$(3)/%.class,$(x)))
-
-generated-code = \
-	$(build)/type-enums.cpp \
-	$(build)/type-declarations.cpp \
-	$(build)/type-constructors.cpp \
-	$(build)/type-initializations.cpp \
-	$(build)/type-java-initializations.cpp \
-	$(build)/type-name-initializations.cpp \
-	$(build)/type-maps.cpp
-
-vm-depends := $(generated-code) $(wildcard $(src)/*.h)
-
-vm-sources = \
-	$(src)/$(system).cpp \
-	$(src)/finder.cpp \
-	$(src)/machine.cpp \
-	$(src)/util.cpp \
-	$(src)/heap.cpp \
-	$(src)/$(process).cpp \
-	$(src)/classpath-$(classpath).cpp \
-	$(src)/builtin.cpp \
-	$(src)/jnienv.cpp \
-	$(src)/process.cpp
-
-vm-asm-sources = $(src)/$(asm).S
-
-target-asm = $(asm)
-
-ifeq ($(process),compile)
-	vm-sources += \
-		$(src)/compiler.cpp \
-		$(src)/$(target-asm).cpp
-
-	vm-asm-sources += $(src)/compile-$(asm).S
-endif
-
-vm-cpp-objects = $(call cpp-objects,$(vm-sources),$(src),$(build))
-vm-asm-objects = $(call asm-objects,$(vm-asm-sources),$(src),$(build))
-vm-objects = $(vm-cpp-objects) $(vm-asm-objects)
-
-heapwalk-sources = $(src)/heapwalk.cpp 
-heapwalk-objects = \
-	$(call cpp-objects,$(heapwalk-sources),$(src),$(build))
-
-ifeq ($(heapdump),true)
-	vm-sources += $(src)/heapdump.cpp
-	vm-heapwalk-objects = $(heapwalk-objects)
-	cflags += -DAVIAN_HEAPDUMP
-endif
-
-ifeq ($(tails),true)
-	cflags += -DAVIAN_TAILS
-endif
-
-ifeq ($(continuations),true)
-	cflags += -DAVIAN_CONTINUATIONS
-	asmflags += -DAVIAN_CONTINUATIONS
-endif
-
-bootimage-generator-sources = $(src)/bootimage.cpp
-ifneq ($(lzma),)
-	bootimage-generator-sources += $(src)/lzma-encode.cpp
-endif
-bootimage-generator-objects = \
-	$(call cpp-objects,$(bootimage-generator-sources),$(src),$(build))
-bootimage-generator = $(build)/bootimage-generator
-
-bootimage-object = $(build)/bootimage-bin.o
-codeimage-object = $(build)/codeimage-bin.o
-
-ifeq ($(bootimage),true)
-	vm-classpath-objects = $(bootimage-object) $(codeimage-object)
-	cflags += -DBOOT_IMAGE -DAVIAN_CLASSPATH=\"\"
-else
-	vm-classpath-objects = $(classpath-object)
-	cflags += -DBOOT_CLASSPATH=\"[classpathJar]\" \
-		-DAVIAN_CLASSPATH=\"[classpathJar]\"
-endif
-
-cflags += $(extra-cflags)
-lflags += $(extra-lflags)
-
-openjdk-cflags += $(extra-cflags)
-
-driver-source = $(src)/main.cpp
-driver-object = $(build)/main.o
-driver-dynamic-objects = \
-	$(build)/main-dynamic.o
-
-boot-source = $(src)/boot.cpp
-boot-object = $(build)/boot.o
-
-generator-depends := $(wildcard $(src)/*.h)
-generator-sources = \
-	$(src)/type-generator.cpp \
-	$(src)/$(build-system).cpp \
-	$(src)/finder.cpp
-
-ifneq ($(lzma),)
-	common-cflags += -I$(lzma) -DAVIAN_USE_LZMA -D_7ZIP_ST
-
-	vm-sources += \
-		$(src)/lzma-decode.cpp
-
-	generator-sources += \
-		$(src)/lzma-decode.cpp
-
-	lzma-decode-sources = \
-		$(lzma)/C/LzmaDec.c
-
-	lzma-decode-objects = \
-		$(call c-objects,$(lzma-decode-sources),$(lzma)/C,$(build))
-
-	lzma-encode-sources = \
-		$(lzma)/C/LzmaEnc.c \
-		$(lzma)/C/LzFind.c
-
-	lzma-encode-objects = \
-		$(call c-objects,$(lzma-encode-sources),$(lzma)/C,$(build))
-
-	lzma-encoder = $(build)/lzma/lzma
-
-	lzma-encoder-cflags = -D__STDC_CONSTANT_MACROS -fno-rtti -fno-exceptions \
-		-I$(lzma)/C
-
-	lzma-encoder-sources = \
-		$(src)/lzma/main.cpp
-
-	lzma-encoder-objects = \
-		$(call cpp-objects,$(lzma-encoder-sources),$(src),$(build))
-
-	lzma-encoder-lzma-sources = $(lzma-encode-sources) $(lzma-decode-sources)
-
-	lzma-encoder-lzma-objects = \
-		$(call generator-c-objects,$(lzma-encoder-lzma-sources),$(lzma)/C,$(build))
-
-	lzma-loader = $(build)/lzma/load.o
-endif
-
-generator-cpp-objects = \
-	$(foreach x,$(1),$(patsubst $(2)/%.cpp,$(3)/%-build.o,$(x)))
-generator-c-objects = \
-	$(foreach x,$(1),$(patsubst $(2)/%.c,$(3)/%-build.o,$(x)))
-generator-objects = \
-	$(call generator-cpp-objects,$(generator-sources),$(src),$(build))
-generator-lzma-objects = \
-	$(call generator-c-objects,$(lzma-decode-sources),$(lzma)/C,$(build))
-generator = $(build)/generator
-
-converter-depends = \
-	$(src)/binaryToObject/tools.h \
-	$(src)/binaryToObject/endianness.h
-
-converter-sources = \
-	$(src)/binaryToObject/tools.cpp \
-	$(src)/binaryToObject/elf.cpp \
-	$(src)/binaryToObject/mach-o.cpp \
-	$(src)/binaryToObject/pe.cpp
-
-converter-tool-sources = \
-	$(src)/binaryToObject/main.cpp
-
-converter-objects = $(call cpp-objects,$(converter-sources),$(src),$(build))
-converter-tool-objects = $(call cpp-objects,$(converter-tool-sources),$(src),$(build))
-converter = $(build)/binaryToObject/binaryToObject
-
-static-library = $(build)/lib$(name).a
-executable = $(build)/$(name)${exe-suffix}
-dynamic-library = $(build)/$(so-prefix)jvm$(so-suffix)
-executable-dynamic = $(build)/$(name)-dynamic${exe-suffix}
-
-ifneq ($(classpath),avian)
-# Assembler, ConstantPool, and Stream are not technically needed for a
-# working build, but we include them since our Subroutine test uses
-# them to synthesize a class:
-	classpath-sources := \
-		$(classpath-src)/avian/Addendum.java \
-		$(classpath-src)/avian/Assembler.java \
-		$(classpath-src)/avian/Callback.java \
-		$(classpath-src)/avian/CallbackReceiver.java \
-		$(classpath-src)/avian/ClassAddendum.java \
-		$(classpath-src)/avian/Classes.java \
-		$(classpath-src)/avian/ConstantPool.java \
-		$(classpath-src)/avian/Continuations.java \
-		$(classpath-src)/avian/FieldAddendum.java \
-		$(classpath-src)/avian/IncompatibleContinuationException.java \
-		$(classpath-src)/avian/Machine.java \
-		$(classpath-src)/avian/MethodAddendum.java \
-		$(classpath-src)/avian/Singleton.java \
-		$(classpath-src)/avian/Stream.java \
-		$(classpath-src)/avian/SystemClassLoader.java \
-		$(classpath-src)/avian/VMClass.java \
-		$(classpath-src)/avian/VMField.java \
-		$(classpath-src)/avian/VMMethod.java \
-		$(classpath-src)/avian/avian_vm_resource/Handler.java
-
-	ifneq ($(openjdk),)
-		classpath-sources := $(classpath-sources) \
-			$(classpath-src)/avian/OpenJDK.java
-	endif
-else
-	classpath-sources := $(shell find $(classpath-src) -name '*.java')
-endif
-
-classpath-classes = \
-	$(call java-classes,$(classpath-sources),$(classpath-src),$(classpath-build))
-classpath-object = $(build)/classpath-jar.o
-classpath-dep = $(classpath-build).dep
-
-vm-classes = \
-	avian/*.class \
-	avian/resource/*.class
-
-test-support-sources = $(shell find $(test)/avian/ -name '*.java')
-test-sources = $(wildcard $(test)/*.java)
-test-cpp-sources = $(wildcard $(test)/*.cpp)
-test-sources += $(test-support-sources)
-test-support-classes = $(call java-classes, $(test-support-sources),$(test),$(test-build))
-test-classes = $(call java-classes,$(test-sources),$(test),$(test-build))
-test-cpp-objects = $(call cpp-objects,$(test-cpp-sources),$(test),$(test-build))
-test-library = $(build)/$(so-prefix)test$(so-suffix)
-test-dep = $(test-build).dep
-
-test-extra-sources = $(wildcard $(test)/extra/*.java)
-test-extra-classes = \
-	$(call java-classes,$(test-extra-sources),$(test),$(test-build))
-test-extra-dep = $(test-build)-extra.dep
-
-ifeq ($(continuations),true)
-	continuation-tests = \
-		extra.Continuations \
-		extra.Coroutines \
-		extra.DynamicWind
-endif
-
-ifeq ($(tails),true)
-	tail-tests = \
-		extra.Tails
-endif
-
-ifeq ($(target-arch),i386)
-	cflags += -DAVIAN_TARGET_ARCH=AVIAN_ARCH_X86
-endif
-
-ifeq ($(target-arch),x86_64)
-	cflags += -DAVIAN_TARGET_ARCH=AVIAN_ARCH_X86_64
-endif
-
-ifeq ($(target-arch),powerpc)
-	cflags += -DAVIAN_TARGET_ARCH=AVIAN_ARCH_POWERPC
-endif
-
-ifeq ($(target-arch),arm)
-	cflags += -DAVIAN_TARGET_ARCH=AVIAN_ARCH_ARM
-endif
-
-ifeq ($(target-format),elf)
-	cflags += -DAVIAN_TARGET_FORMAT=AVIAN_FORMAT_ELF
-endif
-
-ifeq ($(target-format),pe)
-	cflags += -DAVIAN_TARGET_FORMAT=AVIAN_FORMAT_PE
-endif
-
-ifeq ($(target-format),macho)
-	cflags += -DAVIAN_TARGET_FORMAT=AVIAN_FORMAT_MACHO
-endif
-
-class-name = $(patsubst $(1)/%.class,%,$(2))
-class-names = $(foreach x,$(2),$(call class-name,$(1),$(x)))
-
-test-flags = -Djava.library.path=$(build) -cp $(build)/test
-
-test-args = $(test-flags) $(input)
-
-.PHONY: build
-build: $(static-library) $(executable) $(dynamic-library) $(lzma-loader) \
-	$(lzma-encoder) $(executable-dynamic) $(classpath-dep) $(test-dep) \
-	$(test-extra-dep)
-
-$(test-dep): $(classpath-dep)
-
-$(test-extra-dep): $(classpath-dep)
-
-.PHONY: run
-run: build
-	$(library-path) $(test-executable) $(test-args)
-
-.PHONY: debug
-debug: build
-	$(library-path) gdb --args $(test-executable) $(test-args)
-
-.PHONY: vg
-vg: build
-	$(library-path) $(vg) $(test-executable) $(test-args)
-
-.PHONY: test
-test: build
-	$(library-path) /bin/sh $(test)/test.sh 2>/dev/null \
-		$(test-executable) $(mode) "$(test-flags)" \
-		$(call class-names,$(test-build),$(filter-out $(test-support-classes), $(test-classes))) \
-		$(continuation-tests) $(tail-tests)
-
-.PHONY: tarball
-tarball:
-	@echo "creating build/avian-$(version).tar.bz2"
-	@mkdir -p build
-	(cd .. && tar --exclude=build --exclude='.*' --exclude='*~' -cjf \
-		avian/build/avian-$(version).tar.bz2 avian)
-
-.PHONY: javadoc
-javadoc:
-	javadoc -sourcepath classpath -d build/javadoc -subpackages avian:java \
-		-windowtitle "Avian v$(version) Class Library API" \
-		-doctitle "Avian v$(version) Class Library API" \
-		-header "Avian v$(version)" \
-		-bottom "<a href=\"http://oss.readytalk.com/avian/\">http://oss.readytalk.com/avian</a>"
-
-.PHONY: clean
-clean:
-	@echo "removing build"
-	rm -rf build
-
-$(build)/compile-x86-asm.o: $(src)/continuations-x86.S
-
-gen-arg = $(shell echo $(1) | sed -e 's:$(build)/type-\(.*\)\.cpp:\1:')
-$(generated-code): %.cpp: $(src)/types.def $(generator) $(classpath-dep)
-	@echo "generating $(@)"
-	@mkdir -p $(dir $(@))
-	$(generator) $(boot-classpath) $(<) $(@) $(call gen-arg,$(@))
-
-$(classpath-build)/%.class: $(classpath-src)/%.java
-	@echo $(<)
-
-$(classpath-dep): $(classpath-sources)
-	@echo "compiling classpath classes"
-	@mkdir -p $(classpath-build)
-	$(javac) -d $(classpath-build) -bootclasspath $(boot-classpath) \
-		$(shell $(MAKE) -s --no-print-directory build=$(build) \
-			$(classpath-classes))
-	@touch $(@)
-
-$(test-build)/%.class: $(test)/%.java
-	@echo $(<)
-
-$(test-dep): $(test-sources) $(test-library)
-	@echo "compiling test classes"
-	@mkdir -p $(test-build)
-	files="$(shell $(MAKE) -s --no-print-directory build=$(build) $(test-classes))"; \
-	if test -n "$${files}"; then \
-		$(javac) -d $(test-build) -bootclasspath $(boot-classpath) $${files}; \
-	fi
-	$(javac) -source 1.2 -target 1.1 -XDjsrlimit=0 -d $(test-build) \
-		-bootclasspath $(boot-classpath) test/Subroutine.java
-	@touch $(@)
-
-$(test-extra-dep): $(test-extra-sources)
-	@echo "compiling extra test classes"
-	@mkdir -p $(test-build)
-	files="$(shell $(MAKE) -s --no-print-directory build=$(build) $(test-extra-classes))"; \
-	if test -n "$${files}"; then \
-		$(javac) -d $(test-build) -bootclasspath $(boot-classpath) $${files}; \
-	fi
-	@touch $(@)
-
-define compile-object
-	@echo "compiling $(@)"
-	@mkdir -p $(dir $(@))
-	$(cxx) $(cflags) -c $$($(windows-path) $(<)) $(call output,$(@))
-endef
-
-define compile-asm-object
-	@echo "compiling $(@)"
-	@mkdir -p $(dir $(@))
-	$(as) -I$(src) $(asmflags) -c $(<) -o $(@)
-endef
-
-$(vm-cpp-objects): $(build)/%.o: $(src)/%.cpp $(vm-depends)
-	$(compile-object)
-
-$(test-cpp-objects): $(test-build)/%.o: $(test)/%.cpp $(vm-depends)
-	$(compile-object)
-
-$(test-library): $(test-cpp-objects)
-	@echo "linking $(@)"
-ifdef msvc
-	$(ld) $(shared) $(lflags) $(^) -out:$(@) -PDB:$(@).pdb \
-		-IMPLIB:$(test-build)/$(name).lib -MANIFESTFILE:$(@).manifest
-	$(mt) -manifest $(@).manifest -outputresource:"$(@);2"
-else
-	$(ld) $(^) $(shared) $(lflags) -o $(@)
-endif
-
-$(build)/%.o: $(lzma)/C/%.c
-	@echo "compiling $(@)"
-	@mkdir -p $(dir $(@))
-	$(cxx) $(cflags) $(no-error) -c $$($(windows-path) $(<)) $(call output,$(@))
-
-$(vm-asm-objects): $(build)/%-asm.o: $(src)/%.S
-	$(compile-asm-object)
-
-$(bootimage-generator-objects): $(build)/%.o: $(src)/%.cpp $(vm-depends)
-	$(compile-object)
-
-$(heapwalk-objects): $(build)/%.o: $(src)/%.cpp $(vm-depends)
-	$(compile-object)
-
-$(driver-object): $(driver-source)
-	$(compile-object)
-
-$(build)/main-dynamic.o: $(driver-source)
-	@echo "compiling $(@)"
-	@mkdir -p $(dir $(@))
-	$(cxx) $(cflags) -DBOOT_LIBRARY=\"$(so-prefix)jvm$(so-suffix)\" \
-		-c $(<) $(call output,$(@))
-
-$(boot-object): $(boot-source)
-	$(compile-object)
-
-$(boot-javahome-object): $(src)/boot-javahome.cpp
-	$(compile-object)
-
-$(converter-objects) $(converter-tool-objects): $(build)/binaryToObject/%.o: $(src)/binaryToObject/%.cpp $(converter-depends)
-	@mkdir -p $(dir $(@))
-	$(build-cxx) $(converter-cflags) -c $(<) -o $(@)
-
-$(converter): $(converter-objects) $(converter-tool-objects)
-	$(build-cc) $(^) -g -o $(@)
-
-$(lzma-encoder-objects): $(build)/lzma/%.o: $(src)/lzma/%.cpp
-	@mkdir -p $(dir $(@))
-	$(build-cxx) $(lzma-encoder-cflags) -c $(<) -o $(@)
-
-$(lzma-encoder): $(lzma-encoder-objects) $(lzma-encoder-lzma-objects)
-	$(build-cc) $(^) -g -o $(@)
-
-$(lzma-loader): $(src)/lzma/load.cpp
-	$(compile-object)
-
-$(build)/classpath.jar: $(classpath-dep) $(classpath-jar-dep)
-	@echo "creating $(@)"
-	(wd=$$(pwd) && \
-	 cd $(classpath-build) && \
-	 $(jar) c0f "$$($(native-path) "$${wd}/$(@)")" .)
-
-$(classpath-object): $(build)/classpath.jar $(converter)
-	@echo "creating $(@)"
-	$(converter) $(<) $(@) _binary_classpath_jar_start \
-		_binary_classpath_jar_end $(target-format) $(arch)
-
-$(build)/javahome.jar:
-	@echo "creating $(@)"
-	(wd=$$(pwd) && \
-	 cd "$(build-javahome)" && \
-	 $(jar) c0f "$$($(native-path) "$${wd}/$(@)")" $(javahome-files))
-
-$(javahome-object): $(build)/javahome.jar $(converter)
-	@echo "creating $(@)"
-	$(converter) $(<) $(@) _binary_javahome_jar_start \
-		_binary_javahome_jar_end $(target-format) $(arch)
-
-define compile-generator-object
-	@echo "compiling $(@)"
-	@mkdir -p $(dir $(@))
-	$(build-cxx) -DPOINTER_SIZE=$(pointer-size) -O0 -g3 $(build-cflags) \
-		-c $(<) -o $(@)
-endef
-
-$(generator-objects): $(generator-depends)
-$(generator-objects): $(build)/%-build.o: $(src)/%.cpp
-	$(compile-generator-object)
-
-$(build)/%-build.o: $(lzma)/C/%.c
-	@echo "compiling $(@)"
-	@mkdir -p $(dir $(@))
-	$(build-cxx) -DPOINTER_SIZE=$(pointer-size) -O0 -g3 $(build-cflags) \
-		$(no-error) -c $(<) -o $(@)
-
-$(jni-objects): $(build)/%.o: $(classpath-src)/%.cpp
-	$(compile-object)
-
-$(static-library): $(vm-objects) $(classpath-objects) $(vm-heapwalk-objects) \
-		$(javahome-object) $(boot-javahome-object) $(lzma-decode-objects)
-	@echo "creating $(@)"
-	rm -rf $(@)
-	$(ar) cru $(@) $(^)
-	$(ranlib) $(@)
-
-$(bootimage-object) $(codeimage-object): $(bootimage-generator)
-	$(<) -cp $(classpath-build) -bootimage $(bootimage-object) -codeimage $(codeimage-object) \
-		-bootimage-symbols _binary_bootimage_bin_start:_binary_bootimage_bin_end \
-		-codeimage-symbols _binary_codeimage_bin_start:_binary_codeimage_bin_end
-
-executable-objects = $(vm-objects) $(classpath-objects) $(driver-object) \
-	$(vm-heapwalk-objects) $(boot-object) $(vm-classpath-objects) \
-	$(javahome-object) $(boot-javahome-object) $(lzma-decode-objects)
-
-$(executable): $(executable-objects)
-	@echo "linking $(@)"
-ifeq ($(platform),windows)
-ifdef msvc
-	$(ld) $(lflags) $(executable-objects) -out:$(@) -PDB:$(@).pdb \
-		-IMPLIB:$(@).lib -MANIFESTFILE:$(@).manifest
-	$(mt) -manifest $(@).manifest -outputresource:"$(@);1"
-else
-	$(dlltool) -z $(@).def $(executable-objects)
-	$(dlltool) -d $(@).def -e $(@).exp
-	$(ld) $(@).exp $(executable-objects) $(lflags) -o $(@)
-endif
-else
-	$(ld) $(executable-objects) $(rdynamic) $(lflags) $(bootimage-lflags) -o $(@)
-endif
-	$(strip) $(strip-all) $(@)
-
-$(bootimage-generator): $(bootimage-generator-objects)
-	echo arch=$(arch) platform=$(platform)
-	$(MAKE) mode=$(mode) \
-		arch=$(build-arch) \
-		target-arch=$(arch) \
-		platform=$(bootimage-platform) \
-		target-format=$(target-format) \
-		openjdk=$(openjdk) \
-		openjdk-src=$(openjdk-src) \
-		bootimage-generator= \
-		build-bootimage-generator=$(bootimage-generator) \
-		target-cflags="$(bootimage-cflags)" \
-		target-asm=$(asm) \
-		$(bootimage-generator)
-
-$(build-bootimage-generator): \
-		$(vm-objects) $(classpath-object) $(classpath-objects) \
-		$(heapwalk-objects) $(bootimage-generator-objects) $(converter-objects) \
-		$(lzma-decode-objects) $(lzma-encode-objects)
-	@echo "linking $(@)"
-ifeq ($(platform),windows)
-ifdef msvc
-	$(ld) $(lflags) $(^) -out:$(@) -PDB:$(@).pdb -IMPLIB:$(@).lib \
-		-MANIFESTFILE:$(@).manifest
-	$(mt) -manifest $(@).manifest -outputresource:"$(@);1"
-else
-	$(dlltool) -z $(@).def $(^)
-	$(dlltool) -d $(@).def -e $(@).exp
-	$(ld) $(@).exp $(^) $(lflags) -o $(@)
-endif
-else
-	$(ld) $(^) $(rdynamic) $(lflags) -o $(@)
-endif
-
-$(dynamic-library): $(vm-objects) $(dynamic-object) $(classpath-objects) \
-		$(vm-heapwalk-objects) $(boot-object) $(vm-classpath-objects) \
-		$(classpath-libraries) $(javahome-object) $(boot-javahome-object) \
-		$(lzma-decode-objects)
-	@echo "linking $(@)"
-ifdef msvc
-	$(ld) $(shared) $(lflags) $(^) -out:$(@) -PDB:$(@).pdb \
-		-IMPLIB:$(build)/$(name).lib -MANIFESTFILE:$(@).manifest
-	$(mt) -manifest $(@).manifest -outputresource:"$(@);2"
-else
-	$(ld) $(^) $(version-script-flag) $(soname-flag) $(shared) $(lflags) $(bootimage-lflags) \
-		-o $(@)
-endif
-	$(strip) $(strip-all) $(@)
-
-# todo: the $(no-lto) flag below is due to odd undefined reference errors on
-# Ubuntu 11.10 which may be fixable without disabling LTO.
-$(executable-dynamic): $(driver-dynamic-objects) $(dynamic-library)
-	@echo "linking $(@)"
-ifdef msvc
-	$(ld) $(lflags) -LIBPATH:$(build) -DEFAULTLIB:$(name) \
-		-PDB:$(@).pdb -IMPLIB:$(@).lib $(driver-dynamic-objects) -out:$(@) \
-		-MANIFESTFILE:$(@).manifest
-	$(mt) -manifest $(@).manifest -outputresource:"$(@);1"
-else
-	$(ld) $(driver-dynamic-objects) -L$(build) -ljvm $(lflags) $(no-lto) -o $(@)
-endif
-	$(strip) $(strip-all) $(@)
-
-$(generator): $(generator-objects) $(generator-lzma-objects)
-	@echo "linking $(@)"
-	$(build-ld) $(^) $(build-lflags) -o $(@)
-
-$(openjdk-objects): $(build)/openjdk/%-openjdk.o: $(openjdk-src)/%.c \
-		$(openjdk-headers-dep)
-	@echo "compiling $(@)"
-	@mkdir -p $(dir $(@))
-	sed 's/^static jclass ia_class;//' < $(<) > $(build)/openjdk/$(notdir $(<))
-ifeq ($(ios),true)
-	sed \
-		-e 's/^#ifndef __APPLE__/#if 1/' \
-		-e 's/^#ifdef __APPLE__/#if 0/' \
-		< "$(openjdk-src)/solaris/native/java/lang/ProcessEnvironment_md.c" \
-		> $(build)/openjdk/ProcessEnvironment_md.c
-	sed \
-		-e 's/^#ifndef __APPLE__/#if 1/' \
-		-e 's/^#ifdef __APPLE__/#if 0/' \
-		< "$(openjdk-src)/solaris/native/java/lang/UNIXProcess_md.c" \
-		> $(build)/openjdk/UNIXProcess_md.c
-endif
-	$(cc) -fPIC $(openjdk-extra-cflags) $(openjdk-cflags) \
-		$(optimization-cflags) -w -c $(build)/openjdk/$(notdir $(<)) \
-		$(call output,$(@))
-
-$(openjdk-local-objects): $(build)/openjdk/%-openjdk.o: $(src)/openjdk/%.c \
-		$(openjdk-headers-dep)
-	@echo "compiling $(@)"
-	@mkdir -p $(dir $(@))
-	$(cc) -fPIC $(openjdk-extra-cflags) $(openjdk-cflags) \
-		$(optimization-cflags) -w -c $(<) $(call output,$(@))
-
-$(openjdk-headers-dep):
-	@echo "generating openjdk headers"
-	@mkdir -p $(dir $(@))
-	$(javah) -d $(build)/openjdk -bootclasspath $(boot-classpath) \
-		$(openjdk-headers-classes)
-ifeq ($(platform),windows)
-	sed 's/^#ifdef _WIN64/#if 1/' \
-		< "$(openjdk-src)/windows/native/java/net/net_util_md.h" \
-		> $(build)/openjdk/net_util_md.h
-	sed \
-		-e 's/\(^#include "net_util.h"\)/\1\n#if (defined _INC_NLDEF) || (defined _WS2DEF_)\n#define HIDE(x) hide_##x\n#else\n#define HIDE(x) x\n#define _WINSOCK2API_\n#endif/' \
-		-e 's/\(IpPrefix[a-zA-Z_]*\)/HIDE(\1)/' \
-		-e 's/\(IpSuffix[a-zA-Z_]*\)/HIDE(\1)/' \
-		-e 's/\(IpDad[a-zA-Z_]*\)/HIDE(\1)/' \
-		-e 's/\(ScopeLevel[a-zA-Z_]*\)/HIDE(\1)/' \
-		-e 's/\(SCOPE_LEVEL[a-zA-Z_]*\)/HIDE(\1)/' \
-		< "$(openjdk-src)/windows/native/java/net/NetworkInterface.h" \
-		> $(build)/openjdk/NetworkInterface.h
-	echo 'static int getAddrsFromAdapter(IP_ADAPTER_ADDRESSES *ptr, netaddr **netaddrPP);' >> $(build)/openjdk/NetworkInterface.h
-endif
-ifeq ($(platform),darwin)
-	mkdir -p $(build)/openjdk/netinet
-	for file in \
-		/usr/include/netinet/ip.h \
-		/usr/include/netinet/in_systm.h \
-		/usr/include/netinet/ip_icmp.h \
-		/usr/include/netinet/in_var.h \
-		/usr/include/netinet/icmp6.h \
-		/usr/include/netinet/ip_var.h; do \
-		if [ ! -f "$(build)/openjdk/netinet/$$(basename $${file})" ]; then \
-			ln "$${file}" "$(build)/openjdk/netinet/$$(basename $${file})"; \
-		fi; \
-	done
-	mkdir -p $(build)/openjdk/netinet6
-	for file in \
-		/usr/include/netinet6/in6_var.h; do \
-		if [ ! -f "$(build)/openjdk/netinet6/$$(basename $${file})" ]; then \
-			ln "$${file}" "$(build)/openjdk/netinet6/$$(basename $${file})"; \
-		fi; \
-	done
-	mkdir -p $(build)/openjdk/net
-	for file in \
-		/usr/include/net/if_arp.h; do \
-		if [ ! -f "$(build)/openjdk/net/$$(basename $${file})" ]; then \
-			ln "$${file}" "$(build)/openjdk/net/$$(basename $${file})"; \
-		fi; \
-	done
-	mkdir -p $(build)/openjdk/sys
-	for file in \
-		/usr/include/sys/kern_event.h \
-		/usr/include/sys/sys_domain.h; do \
-		if [ ! -f "$(build)/openjdk/sys/$$(basename $${file})" ]; then \
-			ln "$${file}" "$(build)/openjdk/sys/$$(basename $${file})"; \
-		fi; \
-	done
-endif
-	@touch $(@)
-
-$(openjdk-jar-dep):
-	@echo "extracting openjdk classes"
-	@mkdir -p $(dir $(@))
-	@mkdir -p $(classpath-build)
-	(cd $(classpath-build) && \
-		$(jar) xf "$$($(native-path) "$(openjdk)/jre/lib/rt.jar")" && \
-		$(jar) xf "$$($(native-path) "$(openjdk)/jre/lib/jsse.jar")" && \
-		$(jar) xf "$$($(native-path) "$(openjdk)/jre/lib/jce.jar")" && \
-		$(jar) xf "$$($(native-path) "$(openjdk)/jre/lib/charsets.jar")" && \
-		$(jar) xf "$$($(native-path) "$(openjdk)/jre/lib/ext/sunjce_provider.jar")" && \
-		$(jar) xf "$$($(native-path) "$(openjdk)/jre/lib/resources.jar")")
-	@touch $(@)

=== removed directory '.pc/version-info.diff/src'
=== removed file '.pc/version-info.diff/src/classpath-openjdk.cpp'
--- .pc/version-info.diff/src/classpath-openjdk.cpp	2012-09-05 12:24:24 +0000
+++ .pc/version-info.diff/src/classpath-openjdk.cpp	1970-01-01 00:00:00 +0000
@@ -1,5544 +0,0 @@
-/* Copyright (c) 2010-2012, Avian Contributors
-
-   Permission to use, copy, modify, and/or distribute this software
-   for any purpose with or without fee is hereby granted, provided
-   that the above copyright notice and this permission notice appear
-   in all copies.
-
-   There is NO WARRANTY for this software.  See license.txt for
-   details. */
-
-#include "machine.h"
-#include "classpath-common.h"
-#include "util.h"
-#include "process.h"
-
-#ifdef PLATFORM_WINDOWS
-
-#  include <windows.h>
-#  include <io.h>
-#  include <direct.h>
-#  include <share.h>
-#  include <errno.h>
-#  include <fcntl.h>
-#  include <sys/stat.h>
-#  include <sys/types.h>
-
-#  undef interface
-
-#  define CLOSE _close
-#  define READ _read
-#  define WRITE _write
-#  define FSTAT _fstat
-#  define STAT _stat
-#  define LSEEK _lseek
-
-#  define S_ISSOCK(x) false
-
-#  ifdef _MSC_VER
-#    define S_ISREG(x) ((x) | _S_IFREG)
-#    define S_ISDIR(x) ((x) | _S_IFDIR)
-#    define S_IRUSR _S_IREAD
-#    define S_IWUSR _S_IWRITE
-#  else
-#    define OPEN _open
-#  endif
-
-#  define O_RDONLY _O_RDONLY
-
-#  ifdef AVIAN_OPENJDK_SRC
-#    define EXPORT(x) x
-#  else
-#    define EXPORT(x) _##x
-#  endif
-
-typedef int socklen_t;
-
-#  define RTLD_DEFAULT 0
-
-#else // not PLATFORM_WINDOWS
-
-#  include <unistd.h>
-#  include <limits.h>
-#  include <sys/types.h>
-#  include <sys/stat.h>
-#  include <sys/socket.h>
-#  include <sys/ioctl.h>
-#  include <fcntl.h>
-#  include <errno.h>
-#  include <sched.h>
-#  include <dlfcn.h>
-
-#  define OPEN open
-#  define CLOSE close
-#  define READ read
-#  define WRITE write
-#  define STAT stat
-#  define FSTAT fstat
-#  define LSEEK lseek
-
-#  define EXPORT(x) x
-
-#endif // not PLATFORM_WINDOWS
-
-#define JVM_EEXIST -100
-
-using namespace vm;
-
-namespace {
-
-#ifdef _MSC_VER
-inline int 
-OPEN(string_t path, int mask, int mode)
-{
-  int fd; 
-  if (_wsopen_s(&fd, path, mask, _SH_DENYNO, mode) == 0) {
-    return fd; 
-  } else {
-    return -1; 
-  }
-}
-#endif
-
-namespace local {
-
-const int JMM_VERSION_1_0 = 0x20010000;
-
-struct jmmOptionalSupport {
-  unsigned isLowMemoryDetectionSupported : 1;
-  unsigned isCompilationTimeMonitoringSupported : 1;
-  unsigned isThreadContentionMonitoringSupported : 1;
-  unsigned isCurrentThreadCpuTimeSupported : 1;
-  unsigned isOtherThreadCpuTimeSupported : 1;
-  unsigned isBootClassPathSupported : 1;
-  unsigned isObjectMonitorUsageSupported : 1;
-  unsigned isSynchronizerUsageSupported : 1;
-};
-
-typedef unsigned jmmLongAttribute;
-typedef unsigned jmmBoolAttribute;
-typedef unsigned jmmStatisticType;
-typedef unsigned jmmThresholdType;
-typedef unsigned jmmVMGlobalType;
-typedef unsigned jmmVMGlobalOrigin;
-
-struct jmmVMGlobal {
-  jstring name;
-  jvalue value;
-  jmmVMGlobalType type;
-  jmmVMGlobalOrigin origin;
-  unsigned writeable : 1;
-  unsigned external : 1;
-  unsigned reserved : 30;
-  void* reserved1;
-  void* reserved2;
-};
-
-struct jmmExtAttributeInfo {
-  const char* name;
-  char type;
-  const char* description;
-};
-
-struct jmmGCStat {
-  jlong gc_index;
-  jlong start_time;
-  jlong end_time;
-  jobjectArray usage_before_gc;
-  jobjectArray usage_after_gc;
-  jint gc_ext_attribute_values_size;
-  jvalue* gc_ext_attribute_values;
-  jint num_gc_ext_attributes;
-};
-
-struct JmmInterface {
-  void* reserved1;
-  void* reserved2;
-
-  jint
-  (JNICALL *GetVersion)
-    (JNIEnv*);
-
-  jint
-  (JNICALL *GetOptionalSupport)
-    (JNIEnv*, jmmOptionalSupport*);
-
-  jobject
-  (JNICALL *GetInputArguments)
-    (JNIEnv*);
-
-  jint
-  (JNICALL *GetThreadInfo)
-    (JNIEnv*, jlongArray, jint, jobjectArray);
-
-  jobjectArray
-  (JNICALL *GetInputArgumentArray)
-    (JNIEnv*);
-
-  jobjectArray
-  (JNICALL *GetMemoryPools)
-    (JNIEnv*, jobject);
-
-  jobjectArray
-  (JNICALL *GetMemoryManagers)
-    (JNIEnv*, jobject);
-
-  jobject
-  (JNICALL *GetMemoryPoolUsage)
-    (JNIEnv*, jobject);
-
-  jobject
-  (JNICALL *GetPeakMemoryPoolUsage)
-    (JNIEnv*, jobject);
-
-  void* reserved4;
-
-  jobject
-  (JNICALL *GetMemoryUsage)
-    (JNIEnv*, jboolean);
-
-  jlong
-  (JNICALL *GetLongAttribute)
-    (JNIEnv*, jobject, jmmLongAttribute);
-
-  jboolean (JNICALL *GetBoolAttribute)
-    (JNIEnv*, jmmBoolAttribute);
-
-  jboolean
-  (JNICALL *SetBoolAttribute)
-    (JNIEnv*, jmmBoolAttribute, jboolean);
-
-  jint
-  (JNICALL *GetLongAttributes)
-    (JNIEnv*, jobject, jmmLongAttribute*, jint, jlong*);
-
-  jobjectArray
-  (JNICALL *FindCircularBlockedThreads)
-    (JNIEnv*);
-
-  jlong
-  (JNICALL *GetThreadCpuTime)
-  (JNIEnv*, jlong);
-
-  jobjectArray
-  (JNICALL *GetVMGlobalNames)
-    (JNIEnv*);
-
-  jint
-  (JNICALL *GetVMGlobals)
-    (JNIEnv*, jobjectArray, jmmVMGlobal*, jint);
-
-  jint
-  (JNICALL *GetInternalThreadTimes)
-    (JNIEnv*, jobjectArray, jlongArray);
-
-  jboolean
-  (JNICALL *ResetStatistic)
-    (JNIEnv*, jvalue, jmmStatisticType);
-
-  void
-  (JNICALL *SetPoolSensor)
-  (JNIEnv*, jobject, jmmThresholdType, jobject);
-
-  jlong
-  (JNICALL *SetPoolThreshold)
-    (JNIEnv*, jobject, jmmThresholdType, jlong);
-
-  jobject
-  (JNICALL *GetPoolCollectionUsage)
-  (JNIEnv*, jobject);
-
-  jint
-  (JNICALL *GetGCExtAttributeInfo)
-    (JNIEnv*, jobject, jmmExtAttributeInfo*, jint);
-
-  void
-  (JNICALL *GetLastGCStat)
-  (JNIEnv*, jobject, jmmGCStat*);
-
-  jlong
-  (JNICALL *GetThreadCpuTimeWithKind)
-    (JNIEnv*, jlong, jboolean);
-
-  void* reserved5;
-
-  jint
-  (JNICALL *DumpHeap0)
-    (JNIEnv*, jstring, jboolean);
-
-  jobjectArray
-  (JNICALL *FindDeadlocks)
-    (JNIEnv*, jboolean);
-
-  void
-  (JNICALL *SetVMGlobal)
-  (JNIEnv*, jstring, jvalue );
-
-  void* reserved6;
-
-  jobjectArray
-  (JNICALL *DumpThreads)
-    (JNIEnv*, jlongArray, jboolean, jboolean);
-};
-
-const unsigned InterfaceVersion = 4;
-const unsigned PageSize = 4 * 1024;
-const int VirtualFileBase = 1000000000;
-
-Machine* globalMachine;
-
-const char*
-primitiveName(Thread* t, object c)
-{
-  if (c == primitiveClass(t, 'V')) {
-    return "void";
-  } else if (c == primitiveClass(t, 'Z')) {
-    return "boolean";
-  } else if (c == primitiveClass(t, 'B')) {
-    return "byte";
-  } else if (c == primitiveClass(t, 'C')) {
-    return "char";
-  } else if (c == primitiveClass(t, 'S')) {
-    return "short";
-  } else if (c == primitiveClass(t, 'I')) {
-    return "int";
-  } else if (c == primitiveClass(t, 'F')) {
-    return "float";
-  } else if (c == primitiveClass(t, 'J')) {
-    return "long";
-  } else if (c == primitiveClass(t, 'D')) {
-    return "double";
-  } else {
-    abort(t);
-  }
-}
-
-object
-getClassName(Thread* t, object c)
-{
-  if (className(t, c) == 0) {
-    if (classVmFlags(t, c) & PrimitiveFlag) {
-      PROTECT(t, c);
-      
-      object name = makeByteArray(t, primitiveName(t, c));
-
-      set(t, c, ClassName, name);
-    } else {
-      abort(t);
-    }
-  }
-
-  return className(t, c);
-}
-
-object
-makeClassNameString(Thread* t, object name)
-{
-  THREAD_RUNTIME_ARRAY(t, char, s, byteArrayLength(t, name));
-  replace('/', '.', RUNTIME_ARRAY_BODY(s),
-          reinterpret_cast<char*>(&byteArrayBody(t, name, 0)));
-
-  return makeString(t, "%s", s);
-}
-
-void
-interceptFileOperations(Thread*);
-
-void
-clearInterrupted(Thread*);
-
-class MyClasspath : public Classpath {
- public:
-  static const unsigned BufferSize = 1024;
-
-  MyClasspath(System* s, Allocator* allocator, const char* javaHome,
-              const char* embedPrefix):
-    allocator(allocator), ranNetOnLoad(0), ranManagementOnLoad(0)
-  {
-    class StringBuilder {
-     public:
-      StringBuilder(System* s, char* pointer, unsigned remaining):
-        s(s), pointer(pointer), remaining(remaining)
-      { }
-
-      void append(const char* append) {
-        unsigned length = strlen(append);
-        expect(s, remaining > length);
-  
-        strncpy(pointer, append, remaining);
-        
-        remaining -= length;
-        pointer += length;
-      }
-
-      void append(char c) {
-        assert(s, remaining > 1);
-        
-        pointer[0] = c;
-        pointer[1] = 0;
-
-        -- remaining;
-        ++ pointer;
-      }
-
-      System* s;
-      char* pointer;
-      unsigned remaining;
-    } sb(s, buffer, BufferSize);
-
-    this->javaHome = sb.pointer;
-    sb.append(javaHome);
-    sb.append('\0');
-
-    this->classpath = sb.pointer;
-    sb.append(AVIAN_CLASSPATH);
-    sb.append(s->pathSeparator());
-    sb.append(javaHome);
-    sb.append("/lib/rt.jar");
-    sb.append(s->pathSeparator());
-    sb.append(javaHome);
-    sb.append("/lib/jsse.jar");
-    sb.append(s->pathSeparator());
-    sb.append(javaHome);
-    sb.append("/lib/jce.jar");
-    sb.append(s->pathSeparator());
-    sb.append(javaHome);
-    sb.append("/lib/ext/sunjce_provider.jar");
-    sb.append(s->pathSeparator());
-    sb.append(javaHome);
-    sb.append("/lib/resources.jar");
-    sb.append('\0');
-
-    this->libraryPath = sb.pointer;
-    sb.append(javaHome);
-#ifdef PLATFORM_WINDOWS
-    sb.append("/bin");
-#elif defined __APPLE__
-    sb.append("/lib");
-#elif defined ARCH_x86_64
-    sb.append("/lib/amd64");
-#elif defined ARCH_arm
-    sb.append("/lib/arm");
-#else
-    // todo: handle other architectures
-    sb.append("/lib/i386");
-#endif
-    sb.append('\0');
-    
-    this->tzMappings = sb.pointer;
-    sb.append(javaHome);
-    sb.append("/lib/tzmappings");
-    this->tzMappingsLength = sb.pointer - tzMappings;
-    sb.append('\0');
-
-    this->embedPrefix = sb.pointer;
-    sb.append(embedPrefix);
-    this->embedPrefixLength = sb.pointer - this->embedPrefix;
-  }
-
-  virtual object
-  makeJclass(Thread* t, object class_)
-  {
-    PROTECT(t, class_);
-
-    object name = makeClassNameString(t, getClassName(t, class_));
-    PROTECT(t, name);
-
-    object c = allocate(t, FixedSizeOfJclass, true);
-    setObjectClass(t, c, type(t, Machine::JclassType));
-    set(t, c, JclassName, name);
-    set(t, c, JclassVmClass, class_);
-
-    return c;
-  }
-
-  virtual object
-  makeString(Thread* t, object array, int32_t offset, int32_t length)
-  {
-    if (objectClass(t, array) == type(t, Machine::ByteArrayType)) {
-      PROTECT(t, array);
-      
-      object charArray = makeCharArray(t, length);
-      for (int i = 0; i < length; ++i) {
-        charArrayBody(t, charArray, i) = byteArrayBody(t, array, offset + i);
-      }
-
-      array = charArray;
-    } else {
-      expect(t, objectClass(t, array) == type(t, Machine::CharArrayType));
-    }
-
-    return vm::makeString(t, array, offset, length, 0);
-  }
-
-  virtual object
-  makeThread(Thread* t, Thread* parent)
-  {
-    const unsigned MaxPriority = 10;
-    const unsigned NormalPriority = 5;
-
-    object group;
-    if (parent) {
-      group = threadGroup(t, parent->javaThread);
-    } else {
-      group = allocate(t, FixedSizeOfThreadGroup, true);
-      setObjectClass(t, group, type(t, Machine::ThreadGroupType));
-      threadGroupMaxPriority(t, group) = MaxPriority;
-    }
-
-    PROTECT(t, group);
-    
-    object thread = allocate(t, FixedSizeOfThread, true);
-    setObjectClass(t, thread, type(t, Machine::ThreadType));
-    threadPriority(t, thread) = NormalPriority;
-    threadGroup(t, thread) = group;
-    threadContextClassLoader(t, thread) = root(t, Machine::AppLoader);
-
-    PROTECT(t, thread);
-
-    object blockerLock = makeJobject(t);
-    set(t, thread, ThreadBlockerLock, blockerLock);
-
-    const unsigned BufferSize = 256;
-    char buffer[BufferSize];
-    unsigned length = vm::snprintf(buffer, BufferSize, "Thread-%p", thread);
-    object name = makeCharArray(t, length);
-    for (unsigned i = 0; i < length; ++i) {
-      charArrayBody(t, name, i) = buffer[i];
-    }
-    set(t, thread, ThreadName, name);
-
-    return thread;
-  }
-
-  virtual void
-  clearInterrupted(Thread* t)
-  {
-    local::clearInterrupted(t);
-  }
-
-  virtual void
-  runThread(Thread* t)
-  {
-    object method = resolveMethod
-      (t, root(t, Machine::BootLoader), "java/lang/Thread", "run", "()V");
-
-    t->m->processor->invoke(t, method, t->javaThread);
-
-    acquire(t, t->javaThread);
-    t->flags &= ~Thread::ActiveFlag;
-    notifyAll(t, t->javaThread);
-    release(t, t->javaThread);
-  }
-
-  virtual void
-  resolveNative(Thread* t, object method)
-  {
-    if (strcmp(reinterpret_cast<const int8_t*>("sun/font/SunFontManager"),
-               &byteArrayBody(t, className(t, methodClass(t, method)), 0)) == 0
-        and strcmp(reinterpret_cast<const int8_t*>("initIDs"),
-                   &byteArrayBody(t, methodName(t, method), 0)) == 0
-        and strcmp(reinterpret_cast<const int8_t*>("()V"),
-                   &byteArrayBody(t, methodSpec(t, method), 0)) == 0)
-    {
-      PROTECT(t, method);
-
-      expect(t, loadLibrary(t, libraryPath, "fontmanager", true, true));
-    }
-
-    vm::resolveNative(t, method);
-  }
-
-  virtual void
-  boot(Thread* t)
-  {
-    globalMachine = t->m;
-
-    resolveSystemClass(t, root(t, Machine::BootLoader),
-                       className(t, type(t, Machine::ClassLoaderType)));
-
-#ifdef AVIAN_OPENJDK_SRC
-    interceptFileOperations(t);
-#else // not AVIAN_OPENJDK_SRC
-    expect(t, loadLibrary(t, libraryPath, "verify", true, true));
-    expect(t, loadLibrary(t, libraryPath, "java", true, true));
-#endif // not AVIAN_OPENJDK_SRC
-
-    { object assertionLock = resolveField
-        (t, type(t, Machine::ClassLoaderType), "assertionLock",
-         "Ljava/lang/Object;");
-
-      set(t, root(t, Machine::BootLoader), fieldOffset(t, assertionLock),
-          root(t, Machine::BootLoader));
-    }
-
-    { object class_ = resolveClass
-        (t, root(t, Machine::BootLoader), "java/util/Properties", true,
-         Machine::NoClassDefFoundErrorType);
-
-      PROTECT(t, class_);
-      
-      object instance = makeNew(t, class_);
-
-      PROTECT(t, instance);
-
-      object constructor = resolveMethod(t, class_, "<init>", "()V");
-
-      t->m->processor->invoke(t, constructor, instance);
-
-      t->m->processor->invoke
-        (t, root(t, Machine::BootLoader), "java/lang/System",
-         "setProperties", "(Ljava/util/Properties;)V", 0, instance);
-    }
-
-    { object constructor = resolveMethod
-      (t, type(t, Machine::ClassLoaderType), "<init>",
-       "(Ljava/lang/ClassLoader;)V");
-
-      PROTECT(t, constructor);
-
-      t->m->processor->invoke(t, constructor, root(t, Machine::BootLoader), 0);
-
-      t->m->processor->invoke
-        (t, constructor, root(t, Machine::AppLoader),
-         root(t, Machine::BootLoader));
-    }
-
-    { object scl = resolveField
-        (t, type(t, Machine::ClassLoaderType), "scl",
-         "Ljava/lang/ClassLoader;");
-
-      PROTECT(t, scl);
-
-      object sclSet = resolveField
-        (t, type(t, Machine::ClassLoaderType), "sclSet", "Z");
-
-      set(t, classStaticTable(t, type(t, Machine::ClassLoaderType)),
-          fieldOffset(t, scl), root(t, Machine::AppLoader));
-
-      cast<uint8_t>(classStaticTable(t, type(t, Machine::ClassLoaderType)),
-                    fieldOffset(t, sclSet)) = true;
-    }
-
-    t->m->processor->invoke
-      (t, root(t, Machine::BootLoader), "java/lang/System",
-       "initializeSystemClass", "()V", 0);
-
-    t->m->processor->invoke
-      (t, root(t, Machine::BootLoader), "sun/misc/Launcher",
-       "getLauncher", "()Lsun/misc/Launcher;", 0);
-
-    set(t, t->javaThread, ThreadContextClassLoader,
-        root(t, Machine::AppLoader));
-  }
-
-  virtual const char*
-  bootClasspath()
-  {
-    return classpath;
-  }
-
-  virtual void
-  dispose()
-  { 
-    allocator->free(this, sizeof(*this));
-  }
-
-  Allocator* allocator;
-  const char* javaHome;
-  const char* classpath;
-  const char* libraryPath;
-  const char* tzMappings;
-  const char* embedPrefix;
-  unsigned tzMappingsLength;
-  unsigned embedPrefixLength;
-  unsigned filePathField;
-  unsigned fileDescriptorFdField;
-  unsigned fileInputStreamFdField;
-  unsigned zipFileJzfileField;
-  unsigned zipEntryNameField;
-  unsigned zipEntryTimeField;
-  unsigned zipEntryCrcField;
-  unsigned zipEntrySizeField;
-  unsigned zipEntryCsizeField;
-  unsigned zipEntryMethodField;
-  bool ranNetOnLoad;
-  bool ranManagementOnLoad;
-  char buffer[BufferSize];
-  JmmInterface jmmInterface;
-};
-
-struct JVM_ExceptionTableEntryType {
-  jint start_pc;
-  jint end_pc;
-  jint handler_pc;
-  jint catchType;
-};
-
-struct jvm_version_info {
-  unsigned jvm_version;
-  unsigned update_version: 8;
-  unsigned special_update_version: 8;
-  unsigned reserved1: 16;
-  unsigned reserved2;
-  unsigned is_attach_supported: 1;
-  unsigned is_kernel_jvm: 1;
-  unsigned: 30;
-  unsigned: 32;
-  unsigned: 32;
-};
-
-Finder*
-getFinder(Thread* t, const char* name, unsigned nameLength)
-{
-  ACQUIRE(t, t->m->referenceLock);
-    
-  for (object p = root(t, Machine::VirtualFileFinders);
-       p; p = finderNext(t, p))
-  {
-    if (byteArrayLength(t, finderName(t, p)) == nameLength
-        and strncmp(reinterpret_cast<const char*>
-                    (&byteArrayBody(t, finderName(t, p), 0)),
-                    name, nameLength))
-    {
-      return static_cast<Finder*>(finderFinder(t, p));
-    }
-  }
-
-  object n = makeByteArray(t, nameLength + 1);
-  memcpy(&byteArrayBody(t, n, 0), name, nameLength);
-
-  void* p = t->m->libraries->resolve
-    (reinterpret_cast<const char*>(&byteArrayBody(t, n, 0)));
-
-  if (p) {
-    uint8_t* (*function)(unsigned*);
-    memcpy(&function, &p, BytesPerWord);
-
-    unsigned size;
-    uint8_t* data = function(&size);
-    if (data) {
-      Finder* f = makeFinder(t->m->system, t->m->heap, data, size);
-      object finder = makeFinder
-        (t, f, n, root(t, Machine::VirtualFileFinders));
-
-      setRoot(t, Machine::VirtualFileFinders, finder);
-
-      return f;
-    }
-  }
-
-  return 0;
-}
-
-bool
-pathEqual(const char* a, const char* b, unsigned length)
-{
-#ifdef PLATFORM_WINDOWS
-  return strncasecmp(a, b, length) == 0;
-#else
-  return strncmp(a, b, length) == 0;
-#endif
-}
-
-bool
-pathEqual(const char* a, const char* b)
-{
-#ifdef PLATFORM_WINDOWS
-  return strcasecmp(a, b) == 0;
-#else
-  return strcmp(a, b) == 0;
-#endif
-}
-
-class EmbeddedFile {
- public:
-  EmbeddedFile(MyClasspath* cp, const char* path, unsigned pathLength) {
-    if (pathEqual(cp->embedPrefix, path, cp->embedPrefixLength)) {
-      const char* p = path + cp->embedPrefixLength;
-      while (*p == '/') ++ p;
-
-      this->jar = p;
-
-      if (*p == 0) {
-        this->jarLength = 0;
-        this->path = 0;
-        this->pathLength = 0;
-        return;
-      }
-
-      while (*p and *p != '/') ++p;
-    
-      this->jarLength = p - this->jar;
-
-      while (*p == '/') ++p;
-
-      this->path = p;
-      this->pathLength = pathLength - (p - path);
-    } else {
-      this->jar = 0;
-      this->jarLength =0;
-      this->path = 0;
-      this->pathLength = 0;
-    }
-  }
-
-  const char* jar;
-  const char* path;
-  unsigned jarLength;
-  unsigned pathLength;
-};
-
-int64_t JNICALL
-getFileAttributes
-(Thread* t, object method, uintptr_t* arguments)
-{
-  const unsigned Exists = 1;
-  const unsigned Regular = 2;
-  const unsigned Directory = 4;
-
-  MyClasspath* cp = static_cast<MyClasspath*>(t->m->classpath);
-
-  object file = reinterpret_cast<object>(arguments[1]);
-  object path = cast<object>(file, cp->filePathField);
-
-  THREAD_RUNTIME_ARRAY(t, char, p, stringLength(t, path) + 1);
-  stringChars(t, path, RUNTIME_ARRAY_BODY(p));
-  replace('\\', '/', RUNTIME_ARRAY_BODY(p));
-
-  EmbeddedFile ef(cp, RUNTIME_ARRAY_BODY(p), stringLength(t, path));
-  if (ef.jar) {
-    if (ef.jarLength == 0) {
-      return Exists | Directory;
-    }
-
-    Finder* finder = getFinder(t, ef.jar, ef.jarLength);
-    if (finder) {
-      if (ef.pathLength == 0) {
-        return Exists | Directory;
-      }
-
-      unsigned length;
-      System::FileType type = finder->stat(ef.path, &length, true);
-      switch (type) {
-      case System::TypeUnknown: return Exists;
-      case System::TypeDoesNotExist: return 0;
-      case System::TypeFile: return Exists | Regular;
-      case System::TypeDirectory: return Exists | Directory;
-      default: abort(t);
-      }
-    } else {
-      return 0;
-    }
-  } else {
-    return intValue
-      (t, t->m->processor->invoke
-       (t, nativeInterceptOriginal
-        (t, methodRuntimeDataNative(t, getMethodRuntimeData(t, method))),
-        reinterpret_cast<object>(arguments[0]), file));
-  }
-}
-
-int64_t JNICALL
-checkFileAccess
-(Thread* t, object method, uintptr_t* arguments)
-{
-  const unsigned Read = 4;
-  
-  MyClasspath* cp = static_cast<MyClasspath*>(t->m->classpath);
-
-  object file = reinterpret_cast<object>(arguments[1]);
-  unsigned mask = arguments[2];
-  object path = cast<object>(file, cp->filePathField);
-
-  THREAD_RUNTIME_ARRAY(t, char, p, stringLength(t, path) + 1);
-  stringChars(t, path, RUNTIME_ARRAY_BODY(p));
-  replace('\\', '/', RUNTIME_ARRAY_BODY(p));
-
-  EmbeddedFile ef(cp, RUNTIME_ARRAY_BODY(p), stringLength(t, path));
-  if (ef.jar) {
-    if (ef.jarLength == 0) {
-      return mask == Read;
-    }
-
-    Finder* finder = getFinder(t, ef.jar, ef.jarLength);
-    if (finder) {
-      if (ef.pathLength == 0) {
-        return mask == Read;
-      }
-
-      unsigned length;
-      System::FileType type = finder->stat(ef.path, &length, true);
-      switch (type) {
-      case System::TypeDoesNotExist: return false;
-      case System::TypeUnknown:
-      case System::TypeFile:
-      case System::TypeDirectory: return mask == Read;
-      default: abort(t);
-      }
-    } else {
-      return 0;
-    }
-  } else {
-    return intValue
-      (t, t->m->processor->invoke
-       (t, nativeInterceptOriginal
-        (t, methodRuntimeDataNative(t, getMethodRuntimeData(t, method))),
-        reinterpret_cast<object>(arguments[0]), file, mask)) != 0;
-  }
-}
-
-int64_t JNICALL
-getFileLength
-(Thread* t, object method, uintptr_t* arguments)
-{
-  MyClasspath* cp = static_cast<MyClasspath*>(t->m->classpath);
-
-  object file = reinterpret_cast<object>(arguments[1]);
-  object path = cast<object>(file, cp->filePathField);
-
-  THREAD_RUNTIME_ARRAY(t, char, p, stringLength(t, path) + 1);
-  stringChars(t, path, RUNTIME_ARRAY_BODY(p));
-  replace('\\', '/', RUNTIME_ARRAY_BODY(p));
-
-  EmbeddedFile ef(cp, RUNTIME_ARRAY_BODY(p), stringLength(t, path));    
-  if (ef.jar) {
-    if (ef.jarLength == 0) {
-      return 0;
-    }
-
-    Finder* finder = getFinder(t, ef.jar, ef.jarLength);
-    if (finder) {
-      if (ef.pathLength == 0) {
-        return 0;
-      }
-
-      unsigned fileLength;
-      finder->stat(ef.path, &fileLength);
-      return fileLength;
-    }
-
-    return 0;
-  } else {
-    return longValue
-      (t, t->m->processor->invoke
-       (t, nativeInterceptOriginal
-        (t, methodRuntimeDataNative(t, getMethodRuntimeData(t, method))),
-        reinterpret_cast<object>(arguments[0]), file));
-  }
-}
-
-void JNICALL
-openFile(Thread* t, object method, uintptr_t* arguments)
-{
-  object this_ = reinterpret_cast<object>(arguments[0]);
-  object path = reinterpret_cast<object>(arguments[1]);
-
-  MyClasspath* cp = static_cast<MyClasspath*>(t->m->classpath);
-
-  THREAD_RUNTIME_ARRAY(t, char, p, stringLength(t, path) + 1);
-  stringChars(t, path, RUNTIME_ARRAY_BODY(p));
-  replace('\\', '/', RUNTIME_ARRAY_BODY(p));
-
-  EmbeddedFile ef(cp, RUNTIME_ARRAY_BODY(p), stringLength(t, path));
-  if (ef.jar) {
-    if (ef.jarLength == 0 or ef.pathLength == 0) {
-      throwNew(t, Machine::FileNotFoundExceptionType);
-    }
-
-    Finder* finder = getFinder(t, ef.jar, ef.jarLength);
-    if (finder == 0) {
-      throwNew(t, Machine::FileNotFoundExceptionType);
-    }
-
-    System::Region* r = finder->find(ef.path);
-    if (r == 0) {
-      throwNew(t, Machine::FileNotFoundExceptionType);
-    }
-
-    PROTECT(t, this_);
-
-    ACQUIRE(t, t->m->referenceLock);
-
-    int index = -1;
-    unsigned oldLength = root(t, Machine::VirtualFiles)
-      ? arrayLength(t, root(t, Machine::VirtualFiles)) : 0;
-
-    for (unsigned i = 0; i < oldLength; ++i) {
-      if (arrayBody(t, root(t, Machine::VirtualFiles), i) == 0) {
-        index = i;
-        break;
-      }
-    }
-
-    if (index == -1) {
-      object newArray = growArray(t, root(t, Machine::VirtualFiles));
-      setRoot(t, Machine::VirtualFiles, newArray);
-      index = oldLength;
-    }
-
-    object region = makeRegion(t, r, 0);
-    set(t, root(t, Machine::VirtualFiles), ArrayBody + (index * BytesPerWord),
-        region);
-
-    cast<int32_t>
-      (cast<object>
-       (this_, cp->fileInputStreamFdField), cp->fileDescriptorFdField)
-      = index + VirtualFileBase;
-  } else {
-    t->m->processor->invoke
-      (t, nativeInterceptOriginal
-       (t, methodRuntimeDataNative(t, getMethodRuntimeData(t, method))),
-       this_, path);
-  }
-}
-
-int64_t JNICALL
-readByteFromFile(Thread* t, object method, uintptr_t* arguments)
-{
-  object this_ = reinterpret_cast<object>(arguments[0]);
-
-  MyClasspath* cp = static_cast<MyClasspath*>(t->m->classpath);
-
-  int fd = cast<int32_t>
-    (cast<object>
-     (this_, cp->fileInputStreamFdField), cp->fileDescriptorFdField);
-
-  if (fd >= VirtualFileBase) {
-    ACQUIRE(t, t->m->referenceLock);
-    
-    object region = arrayBody
-      (t, root(t, Machine::VirtualFiles), fd - VirtualFileBase);
-
-    if (region) {
-      System::Region* r = static_cast<System::Region*>
-        (regionRegion(t, region));
-
-      if (r->length() > regionPosition(t, region)) {
-        return r->start()[regionPosition(t, region)++];
-      } else {
-        return -1;
-      }
-    } else {
-      throwNew(t, Machine::IoExceptionType);
-    }
-  } else {
-    return intValue
-      (t, t->m->processor->invoke
-       (t, nativeInterceptOriginal
-        (t, methodRuntimeDataNative(t, getMethodRuntimeData(t, method))),
-        this_));
-  }
-}
-
-int64_t JNICALL
-readBytesFromFile(Thread* t, object method, uintptr_t* arguments)
-{
-  object this_ = reinterpret_cast<object>(arguments[0]);
-  object dst = reinterpret_cast<object>(arguments[1]);
-  int32_t offset = arguments[2];
-  int32_t length = arguments[3];
-
-  MyClasspath* cp = static_cast<MyClasspath*>(t->m->classpath);
-
-  int fd = cast<int32_t>
-    (cast<object>
-     (this_, cp->fileInputStreamFdField), cp->fileDescriptorFdField);
-
-  if (fd >= VirtualFileBase) {
-    PROTECT(t, dst);
-
-    ACQUIRE(t, t->m->referenceLock);
-    
-    object region = arrayBody
-      (t, root(t, Machine::VirtualFiles), fd - VirtualFileBase);
-
-    if (region) {
-      System::Region* r = static_cast<System::Region*>
-        (regionRegion(t, region));
-
-      int available = r->length() - regionPosition(t, region);
-      if (available == 0) {
-        return -1;
-      }
-
-      if (length > available) {
-        length = available;
-      }
-
-      memcpy(&byteArrayBody(t, dst, offset),
-             r->start() + regionPosition(t, region),
-             length);
-
-      regionPosition(t, region) += length;
-
-      return length;
-    } else {
-      throwNew(t, Machine::IoExceptionType);
-    }
-  } else {
-    return intValue
-      (t, t->m->processor->invoke
-       (t, nativeInterceptOriginal
-        (t, methodRuntimeDataNative(t, getMethodRuntimeData(t, method))),
-        this_, dst, offset, length));
-  }
-}
-
-int64_t JNICALL
-skipBytesInFile(Thread* t, object method, uintptr_t* arguments)
-{
-  object this_ = reinterpret_cast<object>(arguments[0]);
-  int64_t count; memcpy(&count, arguments + 1, 8);
-
-  MyClasspath* cp = static_cast<MyClasspath*>(t->m->classpath);
-
-  int fd = cast<int32_t>
-    (cast<object>
-     (this_, cp->fileInputStreamFdField), cp->fileDescriptorFdField);
-
-  if (fd >= VirtualFileBase) {
-    ACQUIRE(t, t->m->referenceLock);
-    
-    object region = arrayBody
-      (t, root(t, Machine::VirtualFiles), fd - VirtualFileBase);
-
-    if (region) {
-      System::Region* r = static_cast<System::Region*>
-        (regionRegion(t, region));
-
-      int available = r->length() - regionPosition(t, region);
-      if (count > available) {
-        count = available;
-      }
-
-      regionPosition(t, region) += count;
-
-      return count;
-    } else {
-      throwNew(t, Machine::IoExceptionType);
-    }
-  } else {
-    return longValue
-      (t, t->m->processor->invoke
-       (t, nativeInterceptOriginal
-        (t, methodRuntimeDataNative(t, getMethodRuntimeData(t, method))),
-        this_, count));
-  }
-}
-
-int64_t JNICALL
-availableBytesInFile(Thread* t, object method, uintptr_t* arguments)
-{
-  object this_ = reinterpret_cast<object>(arguments[0]);
-
-  MyClasspath* cp = static_cast<MyClasspath*>(t->m->classpath);
-
-  int fd = cast<int32_t>
-    (cast<object>
-     (this_, cp->fileInputStreamFdField), cp->fileDescriptorFdField);
-
-  if (fd >= VirtualFileBase) {
-    ACQUIRE(t, t->m->referenceLock);
-    
-    object region = arrayBody
-      (t, root(t, Machine::VirtualFiles), fd - VirtualFileBase);
-
-    if (region) {
-      return static_cast<System::Region*>(regionRegion(t, region))->length()
-        - regionPosition(t, region);
-    } else {
-      throwNew(t, Machine::IoExceptionType);
-    }
-  } else {
-    object r = t->m->processor->invoke
-      (t, nativeInterceptOriginal
-       (t, methodRuntimeDataNative(t, getMethodRuntimeData(t, method))),
-       this_);
-
-    return r ? intValue(t, r) : 0;
-  }
-}
-
-void JNICALL
-closeFile(Thread* t, object method, uintptr_t* arguments)
-{
-  object this_ = reinterpret_cast<object>(arguments[0]);
-
-  MyClasspath* cp = static_cast<MyClasspath*>(t->m->classpath);
-
-  int fd = cast<int32_t>
-    (cast<object>
-     (this_, cp->fileInputStreamFdField), cp->fileDescriptorFdField);
-
-  if (fd >= VirtualFileBase) {
-    ACQUIRE(t, t->m->referenceLock);
-
-    int index = fd - VirtualFileBase;
-    object region = arrayBody(t, root(t, Machine::VirtualFiles), index);
-
-    if (region) {
-      static_cast<System::Region*>(regionRegion(t, region))->dispose();
-    }
-
-    set(t, root(t, Machine::VirtualFiles), ArrayBody + (index * BytesPerWord),
-        0);
-  } else {
-    t->m->processor->invoke
-      (t, nativeInterceptOriginal
-       (t, methodRuntimeDataNative(t, getMethodRuntimeData(t, method))),
-       this_);
-  }
-}
-
-class ZipFile {
- public:
-  class Entry {
-   public:
-    Entry(unsigned hash, const uint8_t* start, Entry* next):
-      hash(hash), start(start), next(next), entry(0)
-    { }
-
-    Entry(int64_t entry):
-      hash(0), start(0), next(0), entry(entry)
-    { }
-    
-    Entry():
-      hash(0), start(0), next(0), entry(0)
-    { }
-
-    unsigned hash;
-    const uint8_t* start;
-    Entry* next;
-    int64_t entry;
-  };
-
-  ZipFile(Thread* t, System::Region* region, unsigned entryCount):
-    region(region),
-    entryCount(entryCount),
-    indexSize(nextPowerOfTwo(entryCount)),
-    index(reinterpret_cast<ZipFile::Entry**>
-          (t->m->heap->allocate(sizeof(ZipFile::Entry*) * indexSize))),
-    file(0)
-  {
-    memset(index, 0, sizeof(ZipFile::Entry*) * indexSize);
-  }
-
-  ZipFile(int64_t file):
-    region(0), entryCount(0), indexSize(0), index(0), file(file)
-  { }
-
-  System::Region* region;
-  unsigned entryCount;
-  unsigned indexSize;
-  Entry** index;
-  int64_t file;
-  Entry entries[0];
-};
-
-int64_t JNICALL
-openZipFile(Thread* t, object method, uintptr_t* arguments)
-{
-  object path = reinterpret_cast<object>(arguments[0]);
-  int mode = arguments[1];
-  int64_t lastModified; memcpy(&lastModified, arguments + 2, 8);
-
-  MyClasspath* cp = static_cast<MyClasspath*>(t->m->classpath);
-
-  THREAD_RUNTIME_ARRAY(t, char, p, stringLength(t, path) + 1);
-  stringChars(t, path, RUNTIME_ARRAY_BODY(p));
-  replace('\\', '/', RUNTIME_ARRAY_BODY(p));
-
-  EmbeddedFile ef(cp, RUNTIME_ARRAY_BODY(p), stringLength(t, path));
-  if (ef.jar) {
-    if (ef.jarLength == 0 or ef.pathLength == 0) {
-      throwNew(t, Machine::FileNotFoundExceptionType);
-    }
-
-    Finder* finder = getFinder(t, ef.jar, ef.jarLength);
-    if (finder == 0) {
-      throwNew(t, Machine::FileNotFoundExceptionType);
-    }
-
-    System::Region* r = finder->find(ef.path);
-    if (r == 0) {
-      throwNew(t, Machine::FileNotFoundExceptionType);
-    }
-
-    const uint8_t* start = r->start();
-    const uint8_t* end = start + r->length();
-    unsigned entryCount = 0;
-    for (const uint8_t* p = end - CentralDirectorySearchStart; p > start;) {
-      if (get4(p) == CentralDirectorySignature) {
-        p = start + centralDirectoryOffset(p);
-
-        while (p < end) {
-          if (get4(p) == EntrySignature) {
-            ++ entryCount;
-
-            p = endOfEntry(p);
-          } else {
-            goto make;
-          }
-        }
-      } else {
-	-- p;
-      }
-    }
-
-  make:
-    ZipFile* file = new
-      (t->m->heap->allocate
-       (sizeof(ZipFile) + (sizeof(ZipFile::Entry) * entryCount)))
-      ZipFile(t, r, entryCount);
-
-    { unsigned position = 0;
-      for (const uint8_t* p = end - CentralDirectorySearchStart; p > start;) {
-        if (get4(p) == CentralDirectorySignature) {
-          p = start + centralDirectoryOffset(p);
-
-          while (p < end) {
-            if (get4(p) == EntrySignature) {
-              unsigned h = hash(fileName(p), fileNameLength(p));
-              unsigned i = h & (file->indexSize - 1);
-
-              file->index[i] = new (file->entries + (position++))
-                ZipFile::Entry(h, p, file->index[i]);
-
-              p = endOfEntry(p);
-            } else {
-              goto exit;
-            }
-          }
-        } else {
-          -- p;
-        }
-      }
-    }
-
-  exit:
-    return reinterpret_cast<int64_t>(file);
-  } else {
-    return reinterpret_cast<int64_t>
-      (new (t->m->heap->allocate(sizeof(ZipFile))) ZipFile
-       (longValue
-        (t, t->m->processor->invoke
-         (t, nativeInterceptOriginal
-          (t, methodRuntimeDataNative(t, getMethodRuntimeData(t, method))),
-          0, path, mode, lastModified))));
-  }
-}
-
-int64_t JNICALL
-getZipFileEntryCount(Thread* t, object method, uintptr_t* arguments)
-{
-  int64_t peer; memcpy(&peer, arguments, 8);
-
-  ZipFile* file = reinterpret_cast<ZipFile*>(peer);
-  if (file->region) {
-    return file->entryCount;
-  } else {
-    return intValue
-      (t, t->m->processor->invoke
-       (t, nativeInterceptOriginal
-        (t, methodRuntimeDataNative(t, getMethodRuntimeData(t, method))),
-        0, file->file));
-  }
-}
-
-ZipFile::Entry*
-find(ZipFile* file, const char* path, unsigned pathLength)
-{
-  unsigned i = hash(path) & (file->indexSize - 1);
-  for (ZipFile::Entry* e = file->index[i]; e; e = e->next) {
-    const uint8_t* p = e->start;
-    if (equal(path, pathLength, fileName(p), fileNameLength(p))) {
-      return e;
-    }
-  }
-  return 0;
-}
-
-int64_t JNICALL
-getZipFileEntry(Thread* t, object method, uintptr_t* arguments)
-{
-  int64_t peer; memcpy(&peer, arguments, 8);
-  object path = reinterpret_cast<object>(arguments[2]);
-  bool addSlash = arguments[3];
-
-  ZipFile* file = reinterpret_cast<ZipFile*>(peer);
-  if (file->region) {
-    THREAD_RUNTIME_ARRAY(t, char, p, byteArrayLength(t, path) + 2);
-    memcpy(RUNTIME_ARRAY_BODY(p), &byteArrayBody(t, path, 0),
-           byteArrayLength(t, path));
-    RUNTIME_ARRAY_BODY(p)[byteArrayLength(t, path)] = 0;
-    replace('\\', '/', RUNTIME_ARRAY_BODY(p));
-    if (addSlash) {
-      RUNTIME_ARRAY_BODY(p)[byteArrayLength(t, path)] = '/';
-      RUNTIME_ARRAY_BODY(p)[byteArrayLength(t, path) + 1] = 0;
-    }
-
-    return reinterpret_cast<int64_t>(find(file, p, byteArrayLength(t, path)));
-  } else {
-    int64_t entry = longValue
-      (t, t->m->processor->invoke
-       (t, nativeInterceptOriginal
-        (t, methodRuntimeDataNative(t, getMethodRuntimeData(t, method))),
-        0, file->file, path, addSlash));
-
-    return entry ? reinterpret_cast<int64_t>
-      (new (t->m->heap->allocate(sizeof(ZipFile::Entry)))
-       ZipFile::Entry(entry)) : 0;
-  }
-}
-
-int64_t JNICALL
-getZipFileEntryBytes(Thread* t, object method, uintptr_t* arguments)
-{
-  int64_t peer; memcpy(&peer, arguments, 8);
-  int type = arguments[2];
-
-  ZipFile::Entry* entry = reinterpret_cast<ZipFile::Entry*>(peer);
-  if (entry->start) {
-    switch (type) {
-    case 0: { // name
-      unsigned nameLength = fileNameLength(entry->start);
-      object array = makeByteArray(t, nameLength + 1);
-      memcpy(&byteArrayBody(t, array, 0), fileName(entry->start), nameLength);
-      byteArrayBody(t, array, nameLength) = 0;
-      return reinterpret_cast<int64_t>(array);
-    } break;
-
-    case 1: { // extra
-      return 0;
-    } break;
-
-    case 2: { // comment
-      return 0;
-    } break;
-
-    default: abort(t);
-    }
-    return compressedSize(entry->start);
-  } else {
-    return reinterpret_cast<int64_t>
-      (t->m->processor->invoke
-       (t, nativeInterceptOriginal
-        (t, methodRuntimeDataNative(t, getMethodRuntimeData(t, method))),
-        0, entry->entry, type));
-  }
-}
-
-int64_t JNICALL
-getNextZipFileEntry(Thread* t, object method, uintptr_t* arguments)
-{
-  int64_t peer; memcpy(&peer, arguments, 8);
-  int index = arguments[2];
-
-  ZipFile* file = reinterpret_cast<ZipFile*>(peer);
-  if (file->region) {
-    return reinterpret_cast<int64_t>(file->entries + index);
-  } else {
-    int64_t entry = longValue
-      (t, t->m->processor->invoke
-       (t, nativeInterceptOriginal
-        (t, methodRuntimeDataNative(t, getMethodRuntimeData(t, method))),
-        0, file->file, index));
-
-    return entry ? reinterpret_cast<int64_t>
-      (new (t->m->heap->allocate(sizeof(ZipFile::Entry)))
-       ZipFile::Entry(entry)) : 0;
-  }
-}
-
-void JNICALL
-initializeZipEntryFields(Thread* t, object method, uintptr_t* arguments)
-{
-  object this_ = reinterpret_cast<object>(arguments[0]);
-  int64_t peer; memcpy(&peer, arguments + 1, 8);
-
-  ZipFile::Entry* entry = reinterpret_cast<ZipFile::Entry*>(peer);
-  if (entry->start) {
-    PROTECT(t, this_);
-
-    MyClasspath* cp = static_cast<MyClasspath*>(t->m->classpath);
-
-    unsigned nameLength = fileNameLength(entry->start);
-    object array = makeByteArray(t, nameLength + 1);
-    memcpy(&byteArrayBody(t, array, 0), fileName(entry->start), nameLength);
-    byteArrayBody(t, array, nameLength) = 0;
-
-    object name = t->m->classpath->makeString
-      (t, array, 0, byteArrayLength(t, array) - 1);
-
-    set(t, this_, cp->zipEntryNameField, name);
-
-    cast<int64_t>(this_, cp->zipEntryTimeField)
-      = fileTime(entry->start);
-    cast<int64_t>(this_, cp->zipEntryCrcField)
-      = fileCRC(entry->start);
-    cast<int64_t>(this_, cp->zipEntrySizeField)
-      = uncompressedSize(entry->start);
-    cast<int64_t>(this_, cp->zipEntryCsizeField)
-      = compressedSize(entry->start);
-    cast<int64_t>(this_, cp->zipEntryMethodField)
-      = compressionMethod(entry->start);
-  } else {
-    t->m->processor->invoke
-      (t, nativeInterceptOriginal
-       (t, methodRuntimeDataNative(t, getMethodRuntimeData(t, method))),
-       this_, entry->entry);
-  }
-}
-
-int64_t JNICALL
-getZipFileEntryMethod(Thread* t, object method, uintptr_t* arguments)
-{
-  int64_t peer; memcpy(&peer, arguments, 8);
-
-  ZipFile::Entry* entry = reinterpret_cast<ZipFile::Entry*>(peer);
-  if (entry->start) {
-    return compressionMethod(entry->start);
-  } else {
-    return intValue
-      (t, t->m->processor->invoke
-       (t, nativeInterceptOriginal
-        (t, methodRuntimeDataNative(t, getMethodRuntimeData(t, method))),
-        0, entry->entry));
-  }
-}
-
-int64_t JNICALL
-getZipFileEntryCompressedSize(Thread* t, object method, uintptr_t* arguments)
-{
-  int64_t peer; memcpy(&peer, arguments, 8);
-
-  ZipFile::Entry* entry = reinterpret_cast<ZipFile::Entry*>(peer);
-  if (entry->start) {
-    return compressedSize(entry->start);
-  } else {
-    return longValue
-      (t, t->m->processor->invoke
-       (t, nativeInterceptOriginal
-        (t, methodRuntimeDataNative(t, getMethodRuntimeData(t, method))),
-        0, entry->entry));
-  }
-}
-
-int64_t JNICALL
-getZipFileEntryUncompressedSize(Thread* t, object method, uintptr_t* arguments)
-{
-  int64_t peer; memcpy(&peer, arguments, 8);
-
-  ZipFile::Entry* entry = reinterpret_cast<ZipFile::Entry*>(peer);
-  if (entry->start) {
-    return uncompressedSize(entry->start);
-  } else {
-    return longValue
-      (t, t->m->processor->invoke
-       (t, nativeInterceptOriginal
-        (t, methodRuntimeDataNative(t, getMethodRuntimeData(t, method))),
-        0, entry->entry));
-  }
-}
-
-void JNICALL
-freeZipFileEntry(Thread* t, object method, uintptr_t* arguments)
-{
-  int64_t filePeer; memcpy(&filePeer, arguments, 8);
-  int64_t entryPeer; memcpy(&entryPeer, arguments + 2, 8);
-
-  ZipFile* file = reinterpret_cast<ZipFile*>(filePeer);
-  ZipFile::Entry* entry = reinterpret_cast<ZipFile::Entry*>(entryPeer);
-  if (file->region == 0) {
-    t->m->processor->invoke
-      (t, nativeInterceptOriginal
-       (t, methodRuntimeDataNative(t, getMethodRuntimeData(t, method))),
-       0, file->file, entry->entry);
-  }
-
-  t->m->heap->free(entry, sizeof(ZipFile::Entry));
-}
-
-int64_t JNICALL
-readZipFileEntry(Thread* t, object method, uintptr_t* arguments)
-{
-  int64_t filePeer; memcpy(&filePeer, arguments, 8);
-  int64_t entryPeer; memcpy(&entryPeer, arguments + 2, 8);
-  int64_t position; memcpy(&position, arguments + 4, 8);
-  object buffer = reinterpret_cast<object>(arguments[6]);
-  int offset = arguments[7];
-  int length = arguments[8];
-
-  ZipFile* file = reinterpret_cast<ZipFile*>(filePeer);
-  ZipFile::Entry* entry = reinterpret_cast<ZipFile::Entry*>(entryPeer);
-  if (file->region) {
-    unsigned size = uncompressedSize(entry->start);
-    if (position >= size) {
-      return -1;
-    }
-
-    if (position + length > size) {
-      length = size - position;
-    }
-
-    memcpy(&byteArrayBody(t, buffer, offset),
-           fileData(file->region->start() + localHeaderOffset(entry->start))
-           + position,
-           length);
-
-    return length;
-  } else {
-    return intValue
-      (t, t->m->processor->invoke
-       (t, nativeInterceptOriginal
-        (t, methodRuntimeDataNative(t, getMethodRuntimeData(t, method))),
-        0, file->file, entry->entry, position, buffer, offset, length));
-  }
-}
-
-int64_t JNICALL
-getZipMessage(Thread* t, object method, uintptr_t* arguments)
-{
-  int64_t peer; memcpy(&peer, arguments, 8);
-
-  ZipFile* file = reinterpret_cast<ZipFile*>(peer);
-  if (file->region) {
-    return 0;
-  } else {
-    return reinterpret_cast<int64_t>
-      (t->m->processor->invoke
-       (t, nativeInterceptOriginal
-        (t, methodRuntimeDataNative(t, getMethodRuntimeData(t, method))),
-        0, file->file));
-  }
-}
-
-int64_t JNICALL
-getJarFileMetaInfEntryNames(Thread* t, object method, uintptr_t* arguments)
-{
-  object this_ = reinterpret_cast<object>(arguments[0]);
-
-  MyClasspath* cp = static_cast<MyClasspath*>(t->m->classpath);
-
-  int64_t peer = cast<int64_t>(this_, cp->zipFileJzfileField);
-  ZipFile* file = reinterpret_cast<ZipFile*>(peer);
-  if (file->region) {
-    return 0;
-  } else {
-    PROTECT(t, method);
-
-    // OpenJDK's Java_java_util_jar_JarFile_getMetaInfEntryNames
-    // implementation expects to find a pointer to an instance of its
-    // jzfile structure in the ZipFile.jzfile field of the object we
-    // pass in.  However, we can't pass this_ in, because its
-    // ZipFile.jzfile field points to a ZipFile instance, not a
-    // jzfile.  So we pass in a temporary object instead which has the
-    // desired pointer at the same offset.  We assume here that
-    // ZipFile.jzfile is the first field in that class and that
-    // Java_java_util_jar_JarFile_getMetaInfEntryNames will not look
-    // for any other fields in the object.
-    object pseudoThis = makeLong(t, file->file);
-
-    return reinterpret_cast<int64_t>
-      (t->m->processor->invoke
-       (t, nativeInterceptOriginal
-        (t, methodRuntimeDataNative(t, getMethodRuntimeData(t, method))),
-        pseudoThis));
-  }
-}
-
-void JNICALL
-closeZipFile(Thread* t, object method, uintptr_t* arguments)
-{
-  int64_t peer; memcpy(&peer, arguments, 8);
-
-  ZipFile* file = reinterpret_cast<ZipFile*>(peer);
-  if (file->region) {
-    file->region->dispose();
-    t->m->heap->free(file, sizeof(ZipFile)
-                     + (sizeof(ZipFile::Entry) * file->entryCount));
-  } else {
-    t->m->processor->invoke
-      (t, nativeInterceptOriginal
-       (t, methodRuntimeDataNative(t, getMethodRuntimeData(t, method))),
-       0, file->file);
-
-    t->m->heap->free(file, sizeof(ZipFile));
-  }
-}
-
-int64_t JNICALL
-getBootstrapResource(Thread* t, object, uintptr_t* arguments)
-{
-  object name = reinterpret_cast<object>(arguments[0]);
-  PROTECT(t, name);
-
-  object m = findMethodOrNull
-    (t, type(t, Machine::SystemClassLoaderType),
-     "findResource", "(Ljava/lang/String;)Ljava/net/URL;");
-  
-  if (m) {
-    return reinterpret_cast<int64_t>
-      (t->m->processor->invoke(t, m, root(t, Machine::BootLoader), name));
-  } else {
-    return 0;
-  }
-}
-
-int64_t JNICALL
-getBootstrapResources(Thread* t, object, uintptr_t* arguments)
-{
-  object name = reinterpret_cast<object>(arguments[0]);
-  PROTECT(t, name);
-
-  object m = findMethodOrNull
-    (t, type(t, Machine::SystemClassLoaderType),
-     "findResources", "(Ljava/lang/String;)Ljava/util/Enumeration;");
-  
-  if (m) {
-    return reinterpret_cast<int64_t>
-      (t->m->processor->invoke(t, m, root(t, Machine::BootLoader), name));
-  } else {
-    return 0;
-  }
-}
-
-extern "C" JNIEXPORT jint JNICALL
-net_JNI_OnLoad(JavaVM*, void*);
-
-extern "C" JNIEXPORT jint JNICALL
-management_JNI_OnLoad(JavaVM*, void*);
-
-void JNICALL
-loadLibrary(Thread* t, object, uintptr_t* arguments)
-{
-  object name = reinterpret_cast<object>(arguments[1]);
-  THREAD_RUNTIME_ARRAY(t, char, n, stringLength(t, name) + 1);
-  stringChars(t, name, RUNTIME_ARRAY_BODY(n));
-
-  bool absolute = arguments[2];
-
-#ifdef AVIAN_OPENJDK_SRC
-  if (not absolute) {
-    if (strcmp(n, "net") == 0) {
-      bool ran;
-
-      { ACQUIRE(t, t->m->classLock);
-
-        local::MyClasspath* c = static_cast<local::MyClasspath*>
-          (t->m->classpath);
-
-        ran = c->ranNetOnLoad;
-        c->ranNetOnLoad = true;
-      }
-
-      if (not ran) {
-        net_JNI_OnLoad(t->m, 0);
-      }
-
-      return;
-    } else if (strcmp(n, "management") == 0) { 
-      bool ran;
-
-      { ACQUIRE(t, t->m->classLock);
-
-        local::MyClasspath* c = static_cast<local::MyClasspath*>
-          (t->m->classpath);
-
-        ran = c->ranManagementOnLoad;
-        c->ranManagementOnLoad = true;
-      }
-
-      if (not ran) {
-        management_JNI_OnLoad(t->m, 0);
-      }
-
-      return;     
-    } else if (strcmp(n, "zip") == 0
-               or strcmp(n, "nio") == 0)
-    {
-      return;
-    }
-  }
-#endif // AVIAN_OPENJDK_SRC 
- 
-  loadLibrary
-    (t, static_cast<local::MyClasspath*>(t->m->classpath)->libraryPath,
-     RUNTIME_ARRAY_BODY(n), not absolute, true);
-}
-
-// only safe to call during bootstrap when there's only one thread
-// running:
-void
-intercept(Thread* t, object c, const char* name, const char* spec,
-          void* function)
-{
-  object m = findMethodOrNull(t, c, name, spec);
-  if (m) {
-    PROTECT(t, m);
-
-    object clone = methodClone(t, m);
-
-    // make clone private to prevent vtable updates at compilation
-    // time.  Otherwise, our interception might be bypassed by calls
-    // through the vtable.
-    methodFlags(t, clone) |= ACC_PRIVATE;
-
-    methodFlags(t, m) |= ACC_NATIVE;
-
-    object native = makeNativeIntercept(t, function, true, clone);
-
-    PROTECT(t, native);
-
-    object runtimeData = getMethodRuntimeData(t, m);
-
-    set(t, runtimeData, MethodRuntimeDataNative, native);
-  } else {
-    // If we can't find the method, just ignore it, since ProGuard may
-    // have stripped it out as unused.  Otherwise, the code below can
-    // be uncommented for debugging purposes.
-
-    // fprintf(stderr, "unable to find %s%s in %s\n",
-    //         name, spec, &byteArrayBody(t, className(t, c), 0));
-
-    // abort(t);
-  }
-}
-
-void
-interceptFileOperations(Thread* t)
-{
-  MyClasspath* cp = static_cast<MyClasspath*>(t->m->classpath);
-
-  { object fileClass = resolveClass
-      (t, root(t, Machine::BootLoader), "java/io/File", false);
-
-    if (fileClass) {
-      object filePathField = findFieldInClass2
-        (t, fileClass, "path", "Ljava/lang/String;");
-      
-      if (filePathField) {
-        cp->filePathField = fieldOffset(t, filePathField);
-      }
-    }
-  }
-
-  { object fileDescriptorClass = resolveClass
-      (t, root(t, Machine::BootLoader), "java/io/FileDescriptor", false);
-
-    if (fileDescriptorClass) {
-      object fileDescriptorFdField = findFieldInClass2
-        (t, fileDescriptorClass, "fd", "I");
-
-      if (fileDescriptorFdField) {
-        cp->fileDescriptorFdField = fieldOffset(t, fileDescriptorFdField);
-      }
-    }
-  }
-
-  { object fileInputStreamClass = resolveClass
-      (t, root(t, Machine::BootLoader), "java/io/FileInputStream", false);
-
-    if (fileInputStreamClass) {
-      PROTECT(t, fileInputStreamClass);
-
-      object fileInputStreamFdField = findFieldInClass2
-        (t, fileInputStreamClass, "fd", "Ljava/io/FileDescriptor;");
-
-      if (fileInputStreamFdField) {
-        cp->fileInputStreamFdField = fieldOffset(t, fileInputStreamFdField);
-
-        intercept(t, fileInputStreamClass, "open", "(Ljava/lang/String;)V",
-                  voidPointer(openFile));
-  
-        intercept(t, fileInputStreamClass, "read", "()I",
-                  voidPointer(readByteFromFile));
-  
-        intercept(t, fileInputStreamClass, "readBytes", "([BII)I",
-                  voidPointer(readBytesFromFile));
-  
-        intercept(t, fileInputStreamClass, "skip", "(J)J",
-                  voidPointer(skipBytesInFile));
-  
-        intercept(t, fileInputStreamClass, "available", "()I",
-                  voidPointer(availableBytesInFile));
-  
-        intercept(t, fileInputStreamClass, "close0", "()V",
-                  voidPointer(closeFile));
-      }
-    }
-  }
-
-  { object zipFileClass = resolveClass
-      (t, root(t, Machine::BootLoader), "java/util/zip/ZipFile", false);
-
-    if (zipFileClass) {
-      PROTECT(t, zipFileClass);
-
-      object zipFileJzfileField = findFieldInClass2
-        (t, zipFileClass, "jzfile", "J");
-
-      if (zipFileJzfileField) {
-        cp->zipFileJzfileField = fieldOffset(t, zipFileJzfileField);
-
-        intercept(t, zipFileClass, "open", "(Ljava/lang/String;IJZ)J",
-                  voidPointer(openZipFile));
-
-        intercept(t, zipFileClass, "getTotal", "(J)I",
-                  voidPointer(getZipFileEntryCount));
-
-        intercept(t, zipFileClass, "getEntry", "(J[BZ)J",
-                  voidPointer(getZipFileEntry));
-
-        intercept(t, zipFileClass, "getEntryBytes", "(JI)[B",
-                  voidPointer(getZipFileEntryBytes));
-
-        intercept(t, zipFileClass, "getNextEntry", "(JI)J",
-                  voidPointer(getNextZipFileEntry));
-
-        intercept(t, zipFileClass, "getEntryMethod", "(J)I",
-                  voidPointer(getZipFileEntryMethod));
-
-        intercept(t, zipFileClass, "freeEntry", "(JJ)V",
-                  voidPointer(freeZipFileEntry));
-
-        intercept(t, zipFileClass, "read", "(JJJ[BII)I",
-                  voidPointer(readZipFileEntry));
-
-        intercept(t, zipFileClass, "getEntryCSize", "(J)J",
-                  voidPointer(getZipFileEntryCompressedSize));
-
-        intercept(t, zipFileClass, "getEntrySize", "(J)J",
-                  voidPointer(getZipFileEntryUncompressedSize));
-
-        intercept(t, zipFileClass, "getZipMessage", "(J)Ljava/lang/String;",
-                  voidPointer(getZipMessage));
-
-        intercept(t, zipFileClass, "close", "(J)V",
-                  voidPointer(closeZipFile));
-      }
-    }
-  }
-
-  { object jarFileClass = resolveClass
-      (t, root(t, Machine::BootLoader), "java/util/jar/JarFile", false);
-
-    if (jarFileClass) {
-      intercept(t, jarFileClass, "getMetaInfEntryNames",
-                "()[Ljava/lang/String;",
-                voidPointer(getJarFileMetaInfEntryNames));
-    }
-  }
-
-  {
-#ifdef PLATFORM_WINDOWS
-    const char* const fsClassName = "java/io/WinNTFileSystem";
-    const char* const gbaMethodName = "getBooleanAttributes";
-#else
-    const char* const fsClassName = "java/io/UnixFileSystem";
-    const char* const gbaMethodName = "getBooleanAttributes0";
-#endif
-
-    object fsClass = resolveClass
-      (t, root(t, Machine::BootLoader), fsClassName, false);
-
-    if (fsClass) {
-      PROTECT(t, fsClass);
-
-      intercept(t, fsClass, gbaMethodName, "(Ljava/io/File;)I",
-                voidPointer(getFileAttributes));
-
-      intercept(t, fsClass, "checkAccess", "(Ljava/io/File;I)Z",
-                voidPointer(checkFileAccess));
-  
-      intercept(t, fsClass, "getLength", "(Ljava/io/File;)J",
-                voidPointer(getFileLength));
-    }
-  }
-
-  intercept(t, type(t, Machine::ClassLoaderType), "loadLibrary",
-            "(Ljava/lang/Class;Ljava/lang/String;Z)V",
-            voidPointer(loadLibrary));
-
-  intercept(t, type(t, Machine::ClassLoaderType), "getBootstrapResource",
-            "(Ljava/lang/String;)Ljava/net/URL;",
-            voidPointer(getBootstrapResource));
-
-  intercept(t, type(t, Machine::ClassLoaderType), "getBootstrapResources",
-            "(Ljava/lang/String;)Ljava/util/Enumeration;",
-            voidPointer(getBootstrapResources));
-}
-
-object
-getClassMethodTable(Thread* t, object c)
-{
-  object addendum = classAddendum(t, c);
-  if (addendum) {
-    object table = classAddendumMethodTable(t, addendum);
-    if (table) {
-      return table;
-    }
-  }
-  return classMethodTable(t, c);
-}
-
-unsigned
-countMethods(Thread* t, object c, bool publicOnly)
-{
-  object table = getClassMethodTable(t, c);
-  unsigned count = 0;
-  for (unsigned i = 0; i < arrayLength(t, table); ++i) {
-    object vmMethod = arrayBody(t, table, i);
-    if (((not publicOnly) or (methodFlags(t, vmMethod) & ACC_PUBLIC))
-        and byteArrayBody(t, methodName(t, vmMethod), 0) != '<')
-    {
-      ++ count;
-    }
-  }
-  return count;
-}
-
-unsigned
-countFields(Thread* t, object c, bool publicOnly)
-{
-  object table = classFieldTable(t, c);
-  if (publicOnly) {
-    unsigned count = 0;
-    for (unsigned i = 0; i < arrayLength(t, table); ++i) {
-      object vmField = arrayBody(t, table, i);
-      if (fieldFlags(t, vmField) & ACC_PUBLIC) {
-        ++ count;
-      }
-    }
-    return count;
-  } else {
-    return objectArrayLength(t, table);
-  }
-}
-
-unsigned
-countConstructors(Thread* t, object c, bool publicOnly)
-{
-  object table = getClassMethodTable(t, c);
-  unsigned count = 0;
-  for (unsigned i = 0; i < arrayLength(t, table); ++i) {
-    object vmMethod = arrayBody(t, table, i);
-    if (((not publicOnly) or (methodFlags(t, vmMethod) & ACC_PUBLIC))
-        and strcmp(reinterpret_cast<char*>
-                   (&byteArrayBody(t, methodName(t, vmMethod), 0)),
-                   "<init>") == 0)
-    {
-      ++ count;
-    }
-  }
-  return count;
-}
-
-object
-resolveClassBySpec(Thread* t, object loader, const char* spec,
-                   unsigned specLength)
-{
-  switch (*spec) {
-  case 'L': {
-    THREAD_RUNTIME_ARRAY(t, char, s, specLength - 1);
-    memcpy(RUNTIME_ARRAY_BODY(s), spec + 1, specLength - 2);
-    RUNTIME_ARRAY_BODY(s)[specLength - 2] = 0;
-    return resolveClass(t, loader, s);
-  }
-  
-  case '[': {
-    THREAD_RUNTIME_ARRAY(t, char, s, specLength + 1);
-    memcpy(RUNTIME_ARRAY_BODY(s), spec, specLength);
-    RUNTIME_ARRAY_BODY(s)[specLength] = 0;
-    return resolveClass(t, loader, s);
-  }
-
-  default:
-    return primitiveClass(t, *spec);
-  }
-}
-
-object
-resolveJType(Thread* t, object loader, const char* spec, unsigned specLength)
-{
-  return getJClass(t, resolveClassBySpec(t, loader, spec, specLength));
-}
-
-object
-resolveParameterTypes(Thread* t, object loader, object spec,
-                      unsigned* parameterCount, unsigned* returnTypeSpec)
-{
-  PROTECT(t, loader);
-  PROTECT(t, spec);
-
-  object list = 0;
-  PROTECT(t, list);
-
-  unsigned offset = 1;
-  unsigned count = 0;
-  while (byteArrayBody(t, spec, offset) != ')') {
-    switch (byteArrayBody(t, spec, offset)) {
-    case 'L': {
-      unsigned start = offset;
-      ++ offset;
-      while (byteArrayBody(t, spec, offset) != ';') ++ offset;
-      ++ offset;
-
-      object type = resolveClassBySpec
-        (t, loader, reinterpret_cast<char*>(&byteArrayBody(t, spec, start)),
-         offset - start);
-      
-      list = makePair(t, type, list);
-
-      ++ count;
-    } break;
-  
-    case '[': {
-      unsigned start = offset;
-      while (byteArrayBody(t, spec, offset) == '[') ++ offset;
-      switch (byteArrayBody(t, spec, offset)) {
-      case 'L':
-        ++ offset;
-        while (byteArrayBody(t, spec, offset) != ';') ++ offset;
-        ++ offset;
-        break;
-
-      default:
-        ++ offset;
-        break;
-      }
-      
-      object type = resolveClassBySpec
-        (t, loader, reinterpret_cast<char*>(&byteArrayBody(t, spec, start)),
-         offset - start);
-      
-      list = makePair(t, type, list);
-      ++ count;
-    } break;
-
-    default:
-      list = makePair
-        (t, primitiveClass(t, byteArrayBody(t, spec, offset)), list);
-      ++ offset;
-      ++ count;
-      break;
-    }
-  }
-
-  *parameterCount = count;
-  *returnTypeSpec = offset + 1;
-  return list;
-}
-
-object
-resolveParameterJTypes(Thread* t, object loader, object spec,
-                       unsigned* parameterCount, unsigned* returnTypeSpec)
-{
-  object list = resolveParameterTypes
-    (t, loader, spec, parameterCount, returnTypeSpec);
-
-  PROTECT(t, list);
-  
-  object array = makeObjectArray
-    (t, type(t, Machine::JclassType), *parameterCount);
-  PROTECT(t, array);
-
-  for (int i = *parameterCount - 1; i >= 0; --i) {
-    object c = getJClass(t, pairFirst(t, list));
-    set(t, array, ArrayBody + (i * BytesPerWord), c);
-    list = pairSecond(t, list);
-  }
-
-  return array;
-}
-
-object
-resolveExceptionJTypes(Thread* t, object loader, object addendum)
-{
-  if (addendum == 0 or methodAddendumExceptionTable(t, addendum) == 0) {
-    return makeObjectArray(t, type(t, Machine::JclassType), 0);
-  }
-
-  PROTECT(t, loader);
-  PROTECT(t, addendum);
-
-  object array = makeObjectArray
-    (t, type(t, Machine::JclassType),
-     shortArrayLength(t, methodAddendumExceptionTable(t, addendum)));
-  PROTECT(t, array);
-
-  for (unsigned i = 0; i < shortArrayLength
-         (t, methodAddendumExceptionTable(t, addendum)); ++i)
-  {
-    uint16_t index = shortArrayBody
-      (t, methodAddendumExceptionTable(t, addendum), i) - 1;
-
-    object o = singletonObject(t, addendumPool(t, addendum), index);
-
-    if (objectClass(t, o) == type(t, Machine::ReferenceType)) {
-      o = resolveClass(t, loader, referenceName(t, o));
-    
-      set(t, addendumPool(t, addendum), SingletonBody + (index * BytesPerWord),
-          o);
-    }
-
-    o = getJClass(t, o);
-
-    set(t, array, ArrayBody + (i * BytesPerWord), o);
-  }
-
-  return array;
-}
-
-void
-setProperty(Thread* t, object method, object properties,
-            const char* name, const void* value, const char* format = "%s")
-{
-  PROTECT(t, method);
-  PROTECT(t, properties);
-  
-  object n = makeString(t, "%s", name);
-  PROTECT(t, n);
-
-  object v = makeString(t, format, value);
-
-  t->m->processor->invoke(t, method, properties, n, v);
-}
-
-object
-interruptLock(Thread* t, object thread)
-{
-  object lock = threadInterruptLock(t, thread);
-
-  loadMemoryBarrier();
-
-  if (lock == 0) {
-    PROTECT(t, thread);
-    ACQUIRE(t, t->m->referenceLock);
-
-    if (threadInterruptLock(t, thread) == 0) {
-      object head = makeMonitorNode(t, 0, 0);
-      object lock = makeMonitor(t, 0, 0, 0, head, head, 0);
-
-      storeStoreMemoryBarrier();
-
-      set(t, thread, ThreadInterruptLock, lock);
-    }
-  }
-  
-  return threadInterruptLock(t, thread);
-}
-
-void
-clearInterrupted(Thread* t)
-{
-  monitorAcquire(t, local::interruptLock(t, t->javaThread));
-  threadInterrupted(t, t->javaThread) = false;
-  monitorRelease(t, local::interruptLock(t, t->javaThread));
-}
-
-bool
-pipeAvailable(int fd, int* available)
-{
-#ifdef PLATFORM_WINDOWS
-  HANDLE h = reinterpret_cast<HANDLE>(_get_osfhandle(fd));
-  if (h == INVALID_HANDLE_VALUE) {
-    return false;
-  }
-
-  DWORD n;
-  if (PeekNamedPipe(h, 0,0, 0, &n, 0)) {
-    *available = n;
-  } else {
-    if (GetLastError() != ERROR_BROKEN_PIPE) {
-      return false;
-    }
-    *available = 0;
-  }
-
-  return true;
-#else
-  return ioctl(fd, FIONREAD, available) >= 0;
-#endif
-}
-
-object
-fieldForOffsetInClass(Thread* t, object c, unsigned offset)
-{
-  object super = classSuper(t, c);
-  if (super) {
-    object field = fieldForOffsetInClass(t, super, offset);
-    if (field) {
-      return field;
-    }
-  }
-
-  object table = classFieldTable(t, c);
-  if (table) {
-    for (unsigned i = 0; i < objectArrayLength(t, table); ++i) {
-      object field = objectArrayBody(t, table, i);
-      if ((fieldFlags(t, field) & ACC_STATIC) == 0
-          and fieldOffset(t, field) == offset)
-      {
-        return field;
-      }
-    }
-  }
-
-  return 0;
-}
-
-object
-fieldForOffset(Thread* t, object o, unsigned offset)
-{
-  object field = fieldForOffsetInClass(t, objectClass(t, o), offset);
-  if (field) {
-    return field;
-  } else {
-    abort(t);
-  }
-}
-
-} // namespace local
-
-} // namespace
-
-namespace vm {
-
-Classpath*
-makeClasspath(System* s, Allocator* allocator, const char* javaHome,
-              const char* embedPrefix)
-{
-  return new (allocator->allocate(sizeof(local::MyClasspath)))
-    local::MyClasspath(s, allocator, javaHome, embedPrefix);
-}
-
-} // namespace vm
-
-extern "C" JNIEXPORT int64_t JNICALL
-Avian_java_lang_Class_getSuperclass
-(Thread* t, object, uintptr_t* arguments)
-{
-  object super = classSuper
-    (t, jclassVmClass(t, reinterpret_cast<object>(arguments[0])));
-
-  return super ? reinterpret_cast<int64_t>(getJClass(t, super)) : 0;
-}
-
-extern "C" JNIEXPORT void
-Avian_sun_misc_Unsafe_registerNatives
-(Thread*, object, uintptr_t*)
-{
-  // ignore
-}
-
-extern "C" JNIEXPORT void
-Avian_sun_misc_Perf_registerNatives
-(Thread*, object, uintptr_t*)
-{
-  // ignore
-}
-
-extern "C" JNIEXPORT int64_t
-Avian_sun_misc_Perf_createLong
-(Thread* t, object, uintptr_t*)
-{
-  return reinterpret_cast<int64_t>
-    (t->m->processor->invoke
-     (t, resolveMethod
-      (t, root(t, Machine::BootLoader), "java/nio/ByteBuffer", "allocate",
-       "(I)Ljava/nio/ByteBuffer;"), 0, 8));
-}
-
-extern "C" JNIEXPORT int64_t
-Avian_sun_misc_Unsafe_addressSize
-(Thread*, object, uintptr_t*)
-{
-  return BytesPerWord;
-}
-
-extern "C" JNIEXPORT int64_t
-Avian_sun_misc_Unsafe_defineClass__Ljava_lang_String_2_3BIILjava_lang_ClassLoader_2Ljava_security_ProtectionDomain_2
-(Thread* t, object, uintptr_t* arguments)
-{
-  //object name = reinterpret_cast<object>(arguments[1]);
-  object data = reinterpret_cast<object>(arguments[2]);
-  int32_t offset = arguments[3];
-  int32_t length = arguments[4];
-  object loader = reinterpret_cast<object>(arguments[5]);
-  //object domain = reinterpret_cast<object>(arguments[6]);
-
-  uint8_t* buffer = static_cast<uint8_t*>(t->m->heap->allocate(length));
-
-  THREAD_RESOURCE2(t, uint8_t*, buffer, int, length,
-                   t->m->heap->free(buffer, length));
-
-  memcpy(buffer, &byteArrayBody(t, data, offset), length);
-
-  return reinterpret_cast<int64_t>
-    (getJClass(t, defineClass(t, loader, buffer, length)));
-}
-
-extern "C" JNIEXPORT int64_t