Attachment #121869 for bug #164941




# New ports collection makefile for:    classpath-initial
# Date created:                         2012-02-08
# Whom:                                 Per Ola Ingvarsson
#
# $FreeBSD: ports/java/classpath/Makefile,v 1.40 2011/09/23 22:23:40 amdmi3 Exp $
#

PORTNAME=	classpath
PORTVERSION=	0.93
CATEGORIES=	java devel
MASTER_SITES=	${MASTER_SITE_GNU} \
		${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR=	classpath
PKGNAMESUFFIX=	-initial

MAINTAINER=	skrabban@gmail.com
COMMENT=	Java libraries to be used with jamvm-initial to build newer classpath

BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
		jikes:${PORTSDIR}/java/jikes

USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes
CXXFLAGS+=	-I${LOCALBASE}/include

CONFIGURE_ARGS=	--enable-jni --disable-alsa --disable-dssi \
		--disable-plugin --disable-gtk-peer --with-jikes \
		--disable-examples --disable-gconf-peer

USE_GMAKE=	yes

.include <bsd.port.mk>

Added Link Here

(-)b/java/classpath-initial/distinfo (+2 lines)
1	SHA256 (classpath-0.93.tar.gz) = df2d093612abd23fe67e9409d89bb2a8e79b1664fe2b2da40e1c8ed693e32945
2	SIZE (classpath-0.93.tar.gz) = 9534222

Added Link Here

(-)b/java/classpath-initial/files/patch-configure (+11 lines)
1	--- configure.orig 2012-01-17 20:50:46.000000000 +0100
2	+++ configure 2012-01-17 20:50:31.000000000 +0100
3	@@ -1998,7 +1998,7 @@ fi
4
5
6	# Define the identity of the package.
7	- PACKAGE='classpath'
8	+ PACKAGE='classpath-initial'
9	VERSION='0.93'
10
11




--- doc/Makefile.in.orig	2012-01-25 20:21:40.000000000 +0100
+++ doc/Makefile.in	2012-01-25 20:22:20.000000000 +0100
@@ -707,11 +707,11 @@ info: info-recursive
 
 info-am: $(INFO_DEPS)
 
-install-data-am: install-info-am
+install-data-am: 
 
 install-exec-am:
 
-install-info: install-info-recursive
+install-info: 
 
 install-info-am: $(INFO_DEPS)
 	@$(NORMAL_INSTALL)

Added Link Here

(-)b/java/classpath-initial/files/patch-include_Makefile.in (+11 lines)
1	--- include/Makefile.in.orig 2012-01-25 20:13:18.000000000 +0100
2	+++ include/Makefile.in 2012-01-25 20:13:37.000000000 +0100
3	@@ -655,7 +655,7 @@ info: info-am
4
5	info-am:
6
7	-install-data-am: install-includeHEADERS
8	+install-data-am:
9
10	install-exec-am:
11

Added Link Here

(-)b/java/classpath-initial/files/patch-native_jni_native-lib_cpnet.h (+10 lines)
1	--- native/jni/native-lib/cpnet.h.orig 2012-01-16 22:34:30.000000000 +0100
2	+++ native/jni/native-lib/cpnet.h 2012-01-16 22:35:05.000000000 +0100
3	@@ -42,6 +42,7 @@ exception statement from your version. *
4	#include <jcl.h>
5	#include <string.h>
6
7	+#include <sys/types.h>
8	#include <sys/socket.h>
9	#include <netinet/in.h>
10	#include <netinet/ip.h>

Added Link Here

(-)b/java/classpath-initial/files/patch-resource_Makefile.in (+11 lines)
1	--- resource/Makefile.in.orig 2012-01-25 20:23:52.000000000 +0100
2	+++ resource/Makefile.in 2012-01-25 20:24:18.000000000 +0100
3	@@ -461,7 +461,7 @@ info: info-am
4
5	info-am:
6
7	-install-data-am: install-loggingDATA install-securityDATA
8	+install-data-am:
9
10	install-exec-am:
11

Added Link Here

(-)b/java/classpath-initial/files/patch-tools_Makefile.in (+11 lines)
1	--- tools/Makefile.in.orig 2012-01-25 11:06:03.000000000 +0100
2	+++ tools/Makefile.in 2012-01-25 11:06:39.000000000 +0100
3	@@ -1043,7 +1043,7 @@ info-am:
4
5	install-data-am: install-TOOLSDATA
6
7	-install-exec-am: install-binPROGRAMS install-binSCRIPTS
8	+install-exec-am:
9
10	install-info: install-info-am
11

Added Link Here

(-)b/java/classpath-initial/pkg-descr (+8 lines)
1	The purpose of this package is to provide a java library for jamvm-initial which
2	is used when building classpath with generics.
3
4	GNU Classpath, Essential Libraries for Java, is a GNU project to create free
5	core class libraries for use with virtual machines and compilers for the Java
6	programming language.
7
8	WWW: http://www.classpath.org/




lib/classpath-initial/libjavaio.la
lib/classpath-initial/libjavaio.so
lib/classpath-initial/libjavaio.so.0
lib/classpath-initial/libjavalang.la
lib/classpath-initial/libjavalang.so
lib/classpath-initial/libjavalang.so.0
lib/classpath-initial/libjavalangreflect.la
lib/classpath-initial/libjavalangreflect.so
lib/classpath-initial/libjavalangreflect.so.0
lib/classpath-initial/libjavanet.la
lib/classpath-initial/libjavanet.so
lib/classpath-initial/libjavanet.so.0
lib/classpath-initial/libjavanio.la
lib/classpath-initial/libjavanio.so
lib/classpath-initial/libjavanio.so.0
lib/classpath-initial/libjavautil.la
lib/classpath-initial/libjavautil.so
lib/classpath-initial/libjavautil.so.0
@dirrm lib/classpath-initial
share/classpath-initial/glibj.zip
share/classpath-initial/tools.zip
@dirrm share/classpath-initial




#

PORTNAME=	classpath
PORTVERSION=	0.98
PORTREVISION=	5
CATEGORIES=	java devel
MASTER_SITES=	${MASTER_SITE_GNU}:s0 \
		${MASTER_SITE_SAVANNAH}:s0 \
		http://archive.eclipse.org/eclipse/downloads/drops/R-3.2.2-200702121330/:s1 \
		http://www.antlr2.org/download/:s2
MASTER_SITE_SUBDIR=	${PORTNAME}/:s0
DISTFILES=	${DISTNAME}.tar.gz:s0 \
		ecj.jar:s1 \
		antlr-2.7.5.jar:s2
DIST_SUBDIR=	${PORTNAME}
EXTRACT_ONLY=	${DISTNAME}.tar.gz

MAINTAINER=	bkoenig@alpha-tierchen.de
COMMENT=	A GNU project to create a free Java class library

BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
		jamvm-initial:${PORTSDIR}/java/jamvm-initial \
		fastjar:${PORTSDIR}/archivers/fastjar

USE_JAVA=	yes
JAVA_VERSION=	1.5+
USE_XORG=	x11 ice xtst xaw xproto xext
WANT_GNOME=	yes
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes
CXXFLAGS+=	-I${LOCALBASE}/include
CONFIGURE_ENV=	JAVA=jamvm-initial PATH=${PATH}:${WRKDIR}/bin
CONFIGURE_ARGS=	--enable-jni --disable-alsa --disable-dssi --disable-plugin \
		--with-antlr-jar=${DISTDIR}/${DIST_SUBDIR}/antlr-2.7.5.jar

USE_GMAKE=	yes
MAKE_ENV+=	PATH=${PATH}:${WRKDIR}/bin

MAN1=		gappletviewer.1 \
		gjar.1 \


INFO=		cp-hacking cp-tools cp-vmintegration

CONFLICTS=	sablevm-classpath-[0-9]*

OPTIONS=	GCONF "Use GConf based preferences backend" OFF \
		GTK2 "Enable Gtk+ AWT peer" ON \
		CAIRO "Use Gtk+ Cairo based Graphics2D" OFF \
		QT4 "Enable Qt AWT peer" OFF

pre-patch:
	@${MKDIR} ${WRKDIR}/bin
	@${SED} -e 's,%%DISTDIR%%,${DISTDIR}/${DIST_SUBDIR},' \
		< ${FILESDIR}/ecj.in \
		> ${WRKDIR}/bin/ecj
	@${CHMOD} +x ${WRKDIR}/bin/ecj

.include <bsd.port.pre.mk>

.if defined(WITH_GCONF)

Lines 1-2 Link Here

(-)b/java/classpath/distinfo (-2 / +6 lines)
1	SHA256 (classpath-0.97.2.tar.gz) = 001fee5ad3ddd043783d59593153510f09064b0d9b5aea82f535266f62f02db4	1	SHA256 (classpath/classpath-0.98.tar.gz) = 501b5acd4dff79b6100da22cef15080f31071821ce3cea6f1b739bc1b56fac3f
2	SIZE (classpath-0.97.2.tar.gz) = 10318014	2	SIZE (classpath/classpath-0.98.tar.gz) = 11021342
		3	SHA256 (classpath/ecj.jar) = 3b26627f4c998c67f147392dc3355f38b05769e400925a7c4f9ff68819f1c303
		4	SIZE (classpath/ecj.jar) = 1323277
		5	SHA256 (classpath/antlr-2.7.5.jar) = 2433e7e36ebbebe72390036ec555f4c6771eaed33d507b3d5d65497804093a0d
		6	SIZE (classpath/antlr-2.7.5.jar) = 435563

Added Link Here

(-)b/java/classpath/files/ecj.in (+4 lines)
1	#!/bin/sh
2
3	CLASSPATH=%%DISTDIR%%/ecj.jar${CLASSPATH:+:}$CLASSPATH \
4	exec jamvm-initial -Xmx768m org.eclipse.jdt.internal.compiler.batch.Main -nowarn "$@"




# New ports collection makefile for:	jamvm-initial
# Date created:				2012-02-08
# Whom:					Per Ola Ingvarsson
#
# $FreeBSD: ports/java/jamvm/Makefile,v 1.8 2011/09/23 22:23:40 amdmi3 Exp $

PORTNAME=	jamvm
PORTVERSION=	1.5.1
CATEGORIES=	java devel
MASTER_SITES=	SF/jamvm/jamvm/JamVM%20${PORTVERSION}
PKGNAMESUFFIX=	-initial

MAINTAINER=	skrabban@gmail.com
COMMENT=	Bootstrap jamvm to compile classpath with ecj

RUN_DEPENDS=	${LOCALBASE}/share/classpath-initial/glibj.zip:${PORTSDIR}/java/classpath-initial

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-classpath-install-dir=${LOCALBASE}
USE_GMAKE=	yes

.include <bsd.port.pre.mk>

LIB_DEPENDS+=		ffi:${PORTSDIR}/devel/libffi
CONFIGURE_ARGS+=	--enable-ffi
LDFLAGS+=	-L${LOCALBASE}/lib
CFLAGS+=	`pkg-config libffi --cflags`

BUILD_DEPENDS+=		zip:${PORTSDIR}/archivers/zip
PLIST_SUB+=		WITH_ZIP="" WITHOUT_ZIP="@comment "

do-install:
	${INSTALL_PROGRAM} -s ${WRKSRC}/src/jamvm-initial ${PREFIX}/bin
	${MKDIR} ${PREFIX}/share/jamvm-initial
	${INSTALL_DATA} ${WRKSRC}/lib/classes.zip \
		${PREFIX}/share/jamvm-initial

.include <bsd.port.post.mk>

Added Link Here

(-)b/java/jamvm-initial/distinfo (+2 lines)
1	SHA256 (jamvm-1.5.1.tar.gz) = 663895bd69caf3a1fda6af5eea8263d90a5fd35ca8f4c32e2210ac410788901a
2	SIZE (jamvm-1.5.1.tar.gz) = 599084




--- configure.orig	2008-03-02 05:16:07.000000000 +0100
+++ configure	2012-01-27 15:03:21.000000000 +0100
@@ -2552,8 +2552,10 @@ i386-*-freebsd*) host_os=bsd libdl_neede
 x86_64-*-linux*) host_os=linux ;;
 hppa*-*-linux*) host_cpu=parisc host_os=linux ;;
 mipsel-*-linux*) host_cpu=mips host_os=linux ;;
-amd64-*-openbsd*) host_os=bsd libdl_needed=no ;;
-amd64-*-freebsd*) host_os=bsd libdl_needed=no ;;
+amd64-*-openbsd*) host_os=bsd host_cpu=x86_64 libdl_needed=no ;;
+amd64-*-freebsd*) host_os=bsd host_cpu=x86_64 libdl_needed=no ;;
+sparc64*-*-openbsd*) host_cpu=sparc64 host_os=bsd libdl_needed=no ;;
+sparc64*-*-freebsd*) host_cpu=sparc64 host_os=bsd libdl_needed=no ;;
 arm*-*-linux*) host_cpu=arm host_os=linux ;;
 arm*-*-openbsd*) host_cpu=arm host_os=bsd libdl_needed=no ;;
 arm*-*-freebsd*) host_cpu=arm host_os=bsd libdl_needed=no ;;
@@ -22839,7 +22841,7 @@ fi
 ac_config_links="$ac_config_links src/arch.h:src/arch/$arch.h"
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile src/interp/Makefile src/interp/engine/Makefile src/arch/Makefile src/os/Makefile src/os/linux/Makefile src/os/darwin/Makefile src/os/bsd/Makefile src/os/linux/powerpc/Makefile src/os/linux/arm/Makefile src/os/linux/i386/Makefile src/os/linux/x86_64/Makefile src/os/linux/parisc/Makefile src/os/linux/mips/Makefile src/os/darwin/i386/Makefile src/os/darwin/arm/Makefile src/os/darwin/powerpc/Makefile src/os/bsd/powerpc/Makefile src/os/bsd/arm/Makefile src/os/bsd/i386/Makefile src/os/bsd/x86_64/Makefile lib/Makefile lib/java/Makefile lib/java/lang/Makefile lib/jamvm/Makefile lib/jamvm/java/Makefile lib/jamvm/java/lang/Makefile lib/java/lang/reflect/Makefile lib/java/security/Makefile lib/gnu/Makefile lib/sun/reflect/annotation/Makefile lib/sun/reflect/Makefile lib/sun/Makefile lib/gnu/classpath/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile src/interp/Makefile src/interp/engine/Makefile src/arch/Makefile src/os/Makefile src/os/linux/Makefile src/os/darwin/Makefile src/os/bsd/Makefile src/os/linux/powerpc/Makefile src/os/linux/arm/Makefile src/os/linux/i386/Makefile src/os/linux/x86_64/Makefile src/os/linux/parisc/Makefile src/os/linux/mips/Makefile src/os/darwin/i386/Makefile src/os/darwin/arm/Makefile src/os/darwin/powerpc/Makefile src/os/bsd/powerpc/Makefile src/os/bsd/arm/Makefile src/os/bsd/i386/Makefile src/os/bsd/x86_64/Makefile src/os/bsd/sparc64/Makefile lib/Makefile lib/java/Makefile lib/java/lang/Makefile lib/jamvm/Makefile lib/jamvm/java/Makefile lib/jamvm/java/lang/Makefile lib/java/lang/reflect/Makefile lib/java/security/Makefile lib/gnu/Makefile lib/sun/reflect/annotation/Makefile lib/sun/reflect/Makefile lib/sun/Makefile lib/gnu/classpath/Makefile"
 
 
 cat >confcache <<\_ACEOF
@@ -23483,6 +23485,7 @@ do
     "src/os/bsd/arm/Makefile") CONFIG_FILES="$CONFIG_FILES src/os/bsd/arm/Makefile" ;;
     "src/os/bsd/i386/Makefile") CONFIG_FILES="$CONFIG_FILES src/os/bsd/i386/Makefile" ;;
     "src/os/bsd/x86_64/Makefile") CONFIG_FILES="$CONFIG_FILES src/os/bsd/x86_64/Makefile" ;;
+    "src/os/bsd/sparc64/Makefile") CONFIG_FILES="$CONFIG_FILES src/os/bsd/x86_64/Makefile" ;;
     "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
     "lib/java/Makefile") CONFIG_FILES="$CONFIG_FILES lib/java/Makefile" ;;
     "lib/java/lang/Makefile") CONFIG_FILES="$CONFIG_FILES lib/java/lang/Makefile" ;;

Added Link Here

(-)b/java/jamvm-initial/files/patch-lib_Makefile.in (+11 lines)
1	--- lib/Makefile.in.orig 2012-01-17 21:05:26.000000000 +0100
2	+++ lib/Makefile.in 2012-01-17 21:06:18.000000000 +0100
3	@@ -176,7 +176,7 @@ top_srcdir = @top_srcdir@
4	use_zip_no = @use_zip_no@
5	use_zip_yes = @use_zip_yes@
6	with_classpath_install_dir = @with_classpath_install_dir@
7	-CP_LIB_DIR = ${with_classpath_install_dir}/share/classpath
8	+CP_LIB_DIR = ${with_classpath_install_dir}/share/classpath-initial
9	GLIBJ_ZIP = ${CP_LIB_DIR}/glibj.zip
10	SUBDIRS = jamvm java gnu sun
11	EXTRA_DIST = classes.zip README




--- src/Makefile.in.orig	2012-01-17 21:53:44.000000000 +0100
+++ src/Makefile.in	2012-01-17 21:50:39.000000000 +0100
@@ -34,7 +34,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-bin_PROGRAMS = jamvm$(EXEEXT)
+bin_PROGRAMS = jamvm$(EXEEXT) jamvm-initial$(EXEEXT)
 subdir = src
 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in
@@ -360,6 +360,9 @@ jamvm$(EXEEXT): $(jamvm_OBJECTS) $(jamvm
 	@rm -f jamvm$(EXEEXT)
 	$(LINK) $(jamvm_OBJECTS) $(jamvm_LDADD) $(LIBS)
 
+jamvm-initial$(EXEEXT): jamvm$(EXEEXT)
+	@cp jamvm$(EXEEXT) jamvm-initial$(EXEEXT)
+
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 




--- src/alloc.c.orig	2008-02-22 02:57:42.000000000 +0100
+++ src/alloc.c	2012-01-26 19:32:40.000000000 +0100
@@ -2134,8 +2134,8 @@ unsigned long maxHeapMem() {
     suspended while holding the malloc lock */
 
 void *gcMemMalloc(int n) {
-    int size = n + sizeof(int);
-    int *mem = mmap(0, size, PROT_READ|PROT_WRITE,
+    uintptr_t size = n + sizeof(uintptr_t);
+    uintptr_t *mem = mmap(0, size, PROT_READ|PROT_WRITE,
                              MAP_PRIVATE|MAP_ANON, -1, 0);
 
     if(mem == MAP_FAILED) {
@@ -2151,9 +2151,9 @@ void *gcMemRealloc(void *addr, int size)
     if(addr == NULL)
         return gcMemMalloc(size);
     else {
-        int *mem = addr;
-        int old_size = *--mem;
-        int new_size = size + sizeof(int);
+        uintptr_t *mem = addr;
+        uintptr_t old_size = *--mem;
+        uintptr_t new_size = size + sizeof(uintptr_t);
 
         if(old_size/sys_page_size == new_size/sys_page_size) {
             *mem = new_size;
@@ -2162,7 +2162,7 @@ void *gcMemRealloc(void *addr, int size)
             int copy_size = new_size > old_size ? old_size : new_size;
             void *new_mem = gcMemMalloc(size);
 
-            memcpy(new_mem, addr, copy_size - sizeof(int));
+            memcpy(new_mem, addr, copy_size - sizeof(uintptr_t));
             munmap(mem, old_size);
 
             return new_mem;
@@ -2172,8 +2172,8 @@ void *gcMemRealloc(void *addr, int size)
 
 void gcMemFree(void *addr) {
     if(addr != NULL) {
-        int *mem = addr;
-        int size = *--mem;
+        uintptr_t *mem = addr;
+        uintptr_t size = *--mem;
         munmap(mem, size);
     }
 }




--- src/arch/sparc64.h.orig	2012-01-26 19:32:40.000000000 +0100
+++ src/arch/sparc64.h	2012-01-26 19:32:40.000000000 +0100
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
+ * Robert Lougher <rob@lougher.org.uk>.
+ *
+ * This file is part of JamVM.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2,
+ * or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#define OS_ARCH "sparc64"
+
+#define HANDLER_TABLE_T static const void
+#define DOUBLE_1_BITS 0x3ff0000000000000LL
+
+#define READ_DBL(v,p,l)	v = ((u8)p[0]<<56)|((u8)p[1]<<48)|((u8)p[2]<<40)  \
+                            |((u8)p[3]<<32)|((u8)p[4]<<24)|((u8)p[5]<<16) \
+                            |((u8)p[6]<<8)|(u8)p[7]; p+=8
+
+#define FPU_HACK
+
+static inline uint32_t
+compare_and_swap_32(volatile uint32_t *addr, uint32_t oldval, uint32_t newval)
+{
+   uint32_t result;
+   __asm__ __volatile__ ("cas [%4], %2, %0"
+   			: "=r" (result), "=m" (*addr)
+			: "r" (oldval), "m" (*addr), "r" (addr),
+			"0" (newval));
+  return result == oldval;
+}
+
+#define COMPARE_AND_SWAP32 compare_and_swap_32
+
+static inline uint64_t
+compare_and_swap_64( volatile uint64_t *addr, 
+                     volatile uint64_t oldval, 
+                     volatile uint64_t newval )
+{
+#if 1
+   uint64_t result;
+   __asm__ __volatile__ ("casx [%4], %2, %0"
+   			: "=r" (result), "=m" (*addr)
+			: "r" (oldval), "m" (*addr), "r" (addr),
+			"0" (newval));
+  return result == oldval;
+#else
+  if(*addr == oldval) {                       
+        *addr = newval;                        
+        return 1;
+    } else {
+        return 0;
+    }
+  
+#endif
+}
+
+#define COMPARE_AND_SWAP64 compare_and_swap_64    
+#ifdef __arch64__
+#  define COMPARE_AND_SWAP COMPARE_AND_SWAP64
+#else
+#  define COMPARE_AND_SWAP COMPARE_AND_SWAP32
+#endif
+
+#define STORE_LOAD __asm__ __volatile__ ("membar #StoreLoad" : : : "memory")
+
+
+#define LOCKWORD_READ(addr) ({ STORE_LOAD; *addr; })
+#define LOCKWORD_WRITE(addr, value) ({ STORE_LOAD; *addr = value; })
+#define LOCKWORD_COMPARE_AND_SWAP COMPARE_AND_SWAP
+
+#define __GEN_REL_JMP(target_addr, patch_addr, opcode,       \
+                      type, patch_size)                      \
+({                                                           \
+    int patched = FALSE;                                     \
+                                                             \
+    if(patch_size >= 1 + sizeof(type)) {                     \
+        char *nxt_ins_ptr = (patch_addr) + 1 + sizeof(type); \
+        uintptr_t limit = 1ULL<<((sizeof(type) * 8) - 1);    \
+                                                             \
+        /* The check is done in two parts to ensure the      \
+           result is always positive, to guard against       \
+           the pointer difference being larger than the      \
+           signed range */                                   \
+        if(target_addr > nxt_ins_ptr) {                      \
+            uintptr_t disp = (target_addr) - (nxt_ins_ptr);  \
+                                                             \
+            if(disp < limit) {                               \
+                *(patch_addr) = opcode;                      \
+                *(type*)&(patch_addr)[1] = disp;             \
+                patched = TRUE;                              \
+            }                                                \
+        } else {                                             \
+            uintptr_t disp = (nxt_ins_ptr) - (target_addr);  \
+                                                             \
+            if(disp <= limit) {                              \
+                *(patch_addr) = opcode;                      \
+                *(type*)&(patch_addr)[1] = -disp;            \
+                patched = TRUE;                              \
+            }                                                \
+        }                                                    \
+    }                                                        \
+    patched;                                                 \
+})
+
+#define GEN_REL_JMP(target_addr, patch_addr, patch_size) \
+({                                                       \
+    __GEN_REL_JMP(target_addr, patch_addr, 0xeb,         \
+                  signed char, patch_size) ||            \
+    __GEN_REL_JMP(target_addr, patch_addr, 0xe9,         \
+                  signed int, patch_size);               \
+})
+
+#ifdef INLINING
+#error "I don't know how to flush"
+#define FLUSH_CACHE(addr, length)
+#endif
+#define MBARRIER() __asm__ __volatile__ ("membar #LoadLoad | #LoadStore"\
+                        " | #StoreLoad | #StoreStore" : : : "memory")
+#define UNLOCK_MBARRIER() MBARRIER()
+#define JMM_LOCK_MBARRIER() MBARRIER()
+#define JMM_UNLOCK_MBARRIER() MBARRIER()
+




--- src/class.h.orig	2012-01-17 22:03:07.000000000 +0100
+++ src/class.h	2012-01-17 22:04:12.000000000 +0100
@@ -39,11 +39,11 @@
    separate class files in a directory structure */
 
 #ifdef USE_ZIP
-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes.zip"
-#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath/glibj.zip"
+#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm-initial/classes.zip"
+#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath-initial/glibj.zip"
 #else
-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes"
-#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath"
+#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm-initial/classes"
+#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath-initial"
 #endif
 
 #define DFLT_BCP JAMVM_CLASSES":"CLASSPATH_CLASSES

Added Link Here

(-)b/java/jamvm-initial/files/patch-src_dll.c (+11 lines)
1	--- src/dll.c.orig 2012-01-17 22:28:27.000000000 +0100
2	+++ src/dll.c 2012-01-17 22:28:40.000000000 +0100
3	@@ -306,7 +306,7 @@ char *getDllPath() {
4	}
5
6	char *getBootDllPath() {
7	- return CLASSPATH_INSTALL_DIR"/lib/classpath";
8	+ return CLASSPATH_INSTALL_DIR"/lib/classpath-initial";
9	}
10
11	char getDllName(char name) {




--- src/dll_ffi.c.orig	2007-11-12 05:04:37.000000000 +0100
+++ src/dll_ffi.c	2012-01-26 19:32:40.000000000 +0100
@@ -72,8 +72,8 @@ int nativeExtraArg(MethodBlock *mb) {
 uintptr_t *callJNIMethod(void *env, Class *class, char *sig, int num_args, uintptr_t *ostack,
                          unsigned char *func) {
     ffi_cif cif;
-    void *values[num_args];
-    ffi_type *types[num_args];
+    void *values[num_args + 1];
+    ffi_type *types[num_args + 1];
     uintptr_t *opntr = ostack;
     void **values_pntr = &values[2];
     ffi_type **types_pntr = &types[2];




--- src/frame.h.orig	2008-01-26 02:15:41.000000000 +0100
+++ src/frame.h	2012-01-26 19:32:40.000000000 +0100
@@ -19,6 +19,10 @@
  * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Ensure operand stack is double-word aligned.  This leads to
+   better double floating-point performance */
+#define ALIGN_OSTACK(pntr) (uintptr_t*)(((uintptr_t)(pntr) + 7) & ~7)
+
 #define CREATE_TOP_FRAME(ee, class, mb, sp, ret)                \
 {                                                               \
     Frame *last = ee->last_frame;                               \
@@ -28,7 +32,7 @@
                                                                 \
     ret = (void*) (sp = (uintptr_t*)(dummy+1));                 \
     new_frame = (Frame *)(sp + mb->max_locals);                 \
-    new_ostack = (uintptr_t *)(new_frame + 1);                  \
+    new_ostack = ALIGN_OSTACK(new_frame + 1);                  \
                                                                 \
     if((char*)(new_ostack + mb->max_stack) > ee->stack_end) {   \
         if(ee->overflow++) {                                    \

Added Link Here

(-)b/java/jamvm-initial/files/patch-src_os_bsd_os.c (+11 lines)
1	--- src/os/bsd/os.c.orig 2007-02-24 17:13:12.000000000 +0100
2	+++ src/os/bsd/os.c 2012-01-26 19:32:40.000000000 +0100
3	@@ -48,7 +48,7 @@ void *nativeStackBase() {
4	void *nativeStackBase() {
5	pthread_attr_t attr;
6	void *addr;
7	- int size;
8	+ size_t size;
9
10	pthread_attr_init(&attr);
11	pthread_attr_get_np(pthread_self(), &attr);




--- src/os/bsd/sparc64/Makefile.in.orig	2012-01-27 21:36:14.000000000 +0100
+++ src/os/bsd/sparc64/Makefile.in	2012-01-27 21:39:14.000000000 +0100
@@ -0,0 +1,446 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = src/os/bsd/sparc64
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/src/config.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libnative_la_LIBADD =
+am_libnative_la_OBJECTS = init.lo
+libnative_la_OBJECTS = $(am_libnative_la_OBJECTS)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libnative_la_SOURCES)
+DIST_SOURCES = $(libnative_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+JAVAC = @JAVAC@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+arch = @arch@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+interp_cflags = @interp_cflags@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+os = @os@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+use_zip_no = @use_zip_no@
+use_zip_yes = @use_zip_yes@
+with_classpath_install_dir = @with_classpath_install_dir@
+noinst_LTLIBRARIES = libnative.la
+libnative_la_SOURCES = init.c
+AM_CPPFLAGS = -I$(top_builddir)/src
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/os/bsd/spar64/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/os/bsd/sparc64/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libnative.la: $(libnative_la_OBJECTS) $(libnative_la_DEPENDENCIES) 
+	$(LINK)  $(libnative_la_OBJECTS) $(libnative_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:




--- src/os/bsd/sparc64/init.c.orig	2012-01-26 19:32:40.000000000 +0100
+++ src/os/bsd/sparc64/init.c	2012-01-26 19:32:40.000000000 +0100
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2003, 2004, 2006, 2007
+ * Robert Lougher <rob@lougher.org.uk>.
+ *
+ * This file is part of JamVM.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2,
+ * or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+void setDoublePrecision() {
+}
+
+void initialisePlatform() {
+}

Added Link Here

(-)b/java/jamvm-initial/files/patch-src_thread.c (+11 lines)
1	--- src/thread.c.orig 2008-02-22 02:58:43.000000000 +0100
2	+++ src/thread.c 2012-01-26 19:32:40.000000000 +0100
3	@@ -283,7 +283,7 @@ void resetPeakThreadsCount() {
4	void initialiseJavaStack(ExecEnv *ee) {
5	int stack_size = ee->stack_size ?
6	(ee->stack_size > MIN_STACK ? ee->stack_size : MIN_STACK) : dflt_stack_size;
7	- char *stack = sysMalloc(stack_size);
8	+ void *stack = sysMalloc(stack_size);
9	MethodBlock mb = (MethodBlock ) stack;
10	Frame top = (Frame ) (mb+1);
11

Added Link Here

(-)b/java/jamvm-initial/pkg-descr (+11 lines)
1	This package is for bootstrapping classpath > 0.93 which cannot be
2	compiled with jikes.
3
4	JamVM is an extremely small Java Virtual Machine which conforms to the
5	JVM specification version 2 (blue book).
6
7	It is designed to support the full specification, and includes support
8	for object finalisation, Soft/Weak/Phantom References, class-unloading,
9	the Java Native Interface (JNI) and the Reflection API.
10
11	WWW: http://jamvm.sourceforge.net/

Added Link Here

(-)b/java/jamvm-initial/pkg-plist (+3 lines)
1	bin/jamvm-initial
2	share/jamvm-initial/classes.zip
3	@dirrm share/jamvm-initial

Lines 5-11 Link Here

(-)b/java/jamvm/Makefile (-11 / +11 lines)
5	# $FreeBSD: ports/java/jamvm/Makefile,v 1.8 2011/09/23 22:23:40 amdmi3 Exp $	5	# $FreeBSD: ports/java/jamvm/Makefile,v 1.8 2011/09/23 22:23:40 amdmi3 Exp $
6		6
7	PORTNAME= jamvm	7	PORTNAME= jamvm
8	PORTVERSION= 1.5.1	8	PORTVERSION= 1.5.4
9	PORTREVISION= 4	9	PORTREVISION= 4
10	CATEGORIES= java devel	10	CATEGORIES= java devel
11	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/JamVM%20${PORTVERSION}	11	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/JamVM%20${PORTVERSION}
Lines 19-26 GNU_CONFIGURE= yes Link Here
19	CONFIGURE_ARGS= --with-classpath-install-dir=${LOCALBASE}	19	CONFIGURE_ARGS= --with-classpath-install-dir=${LOCALBASE}
20	USE_GMAKE= yes	20	USE_GMAKE= yes
21		21
22	OPTIONS= FFI "use libffi to call native methods" ON \	22	OPTIONS= ZIP "turn-on zip support in the bootstrap loader" ON
23	ZIP "turn-on zip support in the bootstrap loader" ON	23
		24	.include <bsd.port.options.mk>
		25
		26	# sparc64 always needs libffi
		27	.if (${ARCH} == sparc64)
		28	WITH_FFI= 1
		29	.else
		30	OPTIONS+= FFI "use libffi to call native methods" ON
		31	.endif
24		32
25	.include <bsd.port.pre.mk>	33	.include <bsd.port.pre.mk>
26		34
Lines 39-53 CONFIGURE_ARGS+= --disable-zip Link Here
39	PLIST_SUB+= WITH_ZIP="@comment " WITHOUT_ZIP=""	47	PLIST_SUB+= WITH_ZIP="@comment " WITHOUT_ZIP=""
40	.endif	48	.endif
41		49
42	.if ${ARCH} == "sparc64"
43	BROKEN= Does not configure on sparc64
44	.endif
45
46	post-extract:	50	post-extract:
47	@${MV} ${WRKSRC}/src/arch/x86_64.h ${WRKSRC}/src/arch/amd64.h
48	@${REINPLACE_CMD} -e "s,$^include_HEADERS = .$jni.h$.$,\1\2," ${WRKSRC}/src/Makefile.in	51	@${REINPLACE_CMD} -e "s,$^include_HEADERS = .$jni.h$.$,\1\2," ${WRKSRC}/src/Makefile.in
49		52
50	post-configure:
51	@${MV} ${WRKSRC}/src/os/bsd/x86_64 ${WRKSRC}/src/os/bsd/amd64
52
53	.include <bsd.port.post.mk>	53	.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)b/java/jamvm/distinfo (-2 / +2 lines)
1	SHA256 (jamvm-1.5.1.tar.gz) = 663895bd69caf3a1fda6af5eea8263d90a5fd35ca8f4c32e2210ac410788901a	1	SHA256 (jamvm-1.5.4.tar.gz) = 7865693698bc4322cabe1014a4b7ebdec1bc1daf45f1a4457b6e908a4446b124
2	SIZE (jamvm-1.5.1.tar.gz) = 599084	2	SIZE (jamvm-1.5.4.tar.gz) = 656283

Added Link Here

(-)b/java/jamvm/files/patch-configure (+11 lines)
1	--- configure.orig 2012-01-27 13:55:49.000000000 +0100
2	+++ configure 2012-01-27 13:56:43.000000000 +0100
3	@@ -2689,7 +2689,7 @@ x86_64--linux) host_os=linux ;;
4	hppa--linux*) host_cpu=parisc host_os=linux ;;
5	mipsel--linux) host_cpu=mips host_os=linux ;;
6	x86_64--openbsd) host_os=bsd libdl_needed=no ;;
7	-x86_64--freebsd) host_os=bsd libdl_needed=no ;;
8	+amd64--freebsd) host_os=bsd host_cpu=x86_64 libdl_needed=no ;;
9	arm--linux*) host_cpu=arm host_os=linux ;;
10	arm--openbsd*) host_cpu=arm host_os=bsd libdl_needed=no ;;
11	arm--freebsd*) host_cpu=arm host_os=bsd libdl_needed=no ;;

Return to bug 164941

Added Link Here

(-)b/java/classpath-initial/Makefile (+32 lines)
1	# New ports collection makefile for: classpath-initial
2	# Date created: 2012-02-08
3	# Whom: Per Ola Ingvarsson
4	#
5	# $FreeBSD: ports/java/classpath/Makefile,v 1.40 2011/09/23 22:23:40 amdmi3 Exp $
6	#
7
8	PORTNAME= classpath
9	PORTVERSION= 0.93
10	CATEGORIES= java devel
11	MASTER_SITES= ${MASTER_SITE_GNU} \
12	${MASTER_SITE_SAVANNAH}
13	MASTER_SITE_SUBDIR= classpath
14	PKGNAMESUFFIX= -initial
15
16	MAINTAINER= skrabban@gmail.com
17	COMMENT= Java libraries to be used with jamvm-initial to build newer classpath
18
19	BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \
20	jikes:${PORTSDIR}/java/jikes
21
22	USE_LDCONFIG= yes
23	GNU_CONFIGURE= yes
24	CXXFLAGS+= -I${LOCALBASE}/include
25
26	CONFIGURE_ARGS= --enable-jni --disable-alsa --disable-dssi \
27	--disable-plugin --disable-gtk-peer --with-jikes \
28	--disable-examples --disable-gconf-peer
29
30	USE_GMAKE= yes
31
32	.include <bsd.port.mk>

Added Link Here

(-)b/java/classpath-initial/files/patch-doc_Makefile.in (+16 lines)
1	--- doc/Makefile.in.orig 2012-01-25 20:21:40.000000000 +0100
2	+++ doc/Makefile.in 2012-01-25 20:22:20.000000000 +0100
3	@@ -707,11 +707,11 @@ info: info-recursive
4
5	info-am: $(INFO_DEPS)
6
7	-install-data-am: install-info-am
8	+install-data-am:
9
10	install-exec-am:
11
12	-install-info: install-info-recursive
13	+install-info:
14
15	install-info-am: $(INFO_DEPS)
16	@$(NORMAL_INSTALL)

Added Link Here

(-)b/java/classpath-initial/pkg-plist (+22 lines)
1	lib/classpath-initial/libjavaio.la
2	lib/classpath-initial/libjavaio.so
3	lib/classpath-initial/libjavaio.so.0
4	lib/classpath-initial/libjavalang.la
5	lib/classpath-initial/libjavalang.so
6	lib/classpath-initial/libjavalang.so.0
7	lib/classpath-initial/libjavalangreflect.la
8	lib/classpath-initial/libjavalangreflect.so
9	lib/classpath-initial/libjavalangreflect.so.0
10	lib/classpath-initial/libjavanet.la
11	lib/classpath-initial/libjavanet.so
12	lib/classpath-initial/libjavanet.so.0
13	lib/classpath-initial/libjavanio.la
14	lib/classpath-initial/libjavanio.so
15	lib/classpath-initial/libjavanio.so.0
16	lib/classpath-initial/libjavautil.la
17	lib/classpath-initial/libjavautil.so
18	lib/classpath-initial/libjavautil.so.0
19	@dirrm lib/classpath-initial
20	share/classpath-initial/glibj.zip
21	share/classpath-initial/tools.zip
22	@dirrm share/classpath-initial

Lines 7-33 Link Here

(-)b/java/classpath/Makefile (-10 / +28 lines)
7	#	7	#
8		8
9	PORTNAME= classpath	9	PORTNAME= classpath
10	PORTVERSION= 0.97.2	10	PORTVERSION= 0.98
11	PORTREVISION= 4	11	PORTREVISION= 5
12	CATEGORIES= java devel	12	CATEGORIES= java devel
13	MASTER_SITES= ${MASTER_SITE_GNU} \	13	MASTER_SITES= ${MASTER_SITE_GNU}:s0 \
14	${MASTER_SITE_SAVANNAH}	14	${MASTER_SITE_SAVANNAH}:s0 \
15	MASTER_SITE_SUBDIR= ${PORTNAME}	15	http://archive.eclipse.org/eclipse/downloads/drops/R-3.2.2-200702121330/:s1 \
		16	http://www.antlr2.org/download/:s2
		17	MASTER_SITE_SUBDIR= ${PORTNAME}/:s0
		18	DISTFILES= ${DISTNAME}.tar.gz:s0 \
		19	ecj.jar:s1 \
		20	antlr-2.7.5.jar:s2
		21	DIST_SUBDIR= ${PORTNAME}
		22	EXTRACT_ONLY= ${DISTNAME}.tar.gz
16		23
17	MAINTAINER= bkoenig@alpha-tierchen.de	24	MAINTAINER= bkoenig@alpha-tierchen.de
18	COMMENT= A GNU project to create a free Java class library	25	COMMENT= A GNU project to create a free Java class library
19		26
20	BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip	27	BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \
		28	jamvm-initial:${PORTSDIR}/java/jamvm-initial \
		29	fastjar:${PORTSDIR}/archivers/fastjar
21		30
22	USE_JAVA= yes
23	JAVA_VERSION= 1.5+
24	USE_XORG= x11 ice xtst xaw xproto xext	31	USE_XORG= x11 ice xtst xaw xproto xext
25	WANT_GNOME= yes	32	WANT_GNOME= yes
26	USE_LDCONFIG= yes	33	USE_LDCONFIG= yes
27	GNU_CONFIGURE= yes	34	GNU_CONFIGURE= yes
28	CXXFLAGS+= -I${LOCALBASE}/include	35	CXXFLAGS+= -I${LOCALBASE}/include
29	CONFIGURE_ARGS= --enable-jni --disable-alsa --disable-dssi --disable-plugin	36	CONFIGURE_ENV= JAVA=jamvm-initial PATH=${PATH}:${WRKDIR}/bin
		37	CONFIGURE_ARGS= --enable-jni --disable-alsa --disable-dssi --disable-plugin \
		38	--with-antlr-jar=${DISTDIR}/${DIST_SUBDIR}/antlr-2.7.5.jar
		39
30	USE_GMAKE= yes	40	USE_GMAKE= yes
		41	MAKE_ENV+= PATH=${PATH}:${WRKDIR}/bin
31		42
32	MAN1= gappletviewer.1 \	43	MAN1= gappletviewer.1 \
33	gjar.1 \	44	gjar.1 \
Lines 44-56 MAN1= gappletviewer.1 \ Link Here
44		55
45	INFO= cp-hacking cp-tools cp-vmintegration	56	INFO= cp-hacking cp-tools cp-vmintegration
46		57
47	CONFLICTS= sablevm-classpath-*	58	CONFLICTS= sablevm-classpath-[0-9]*
48		59
49	OPTIONS= GCONF "Use GConf based preferences backend" OFF \	60	OPTIONS= GCONF "Use GConf based preferences backend" OFF \
50	GTK2 "Enable Gtk+ AWT peer" ON \	61	GTK2 "Enable Gtk+ AWT peer" ON \
51	CAIRO "Use Gtk+ Cairo based Graphics2D" OFF \	62	CAIRO "Use Gtk+ Cairo based Graphics2D" OFF \
52	QT4 "Enable Qt AWT peer" OFF	63	QT4 "Enable Qt AWT peer" OFF
53		64
		65	pre-patch:
		66	@${MKDIR} ${WRKDIR}/bin
		67	@${SED} -e 's,%%DISTDIR%%,${DISTDIR}/${DIST_SUBDIR},' \
		68	< ${FILESDIR}/ecj.in \
		69	> ${WRKDIR}/bin/ecj
		70	@${CHMOD} +x ${WRKDIR}/bin/ecj
		71
54	.include <bsd.port.pre.mk>	72	.include <bsd.port.pre.mk>
55		73
56	.if defined(WITH_GCONF)	74	.if defined(WITH_GCONF)

Added Link Here

(-)b/java/jamvm-initial/Makefile (+38 lines)
1	# New ports collection makefile for: jamvm-initial
2	# Date created: 2012-02-08
3	# Whom: Per Ola Ingvarsson
4	#
5	# $FreeBSD: ports/java/jamvm/Makefile,v 1.8 2011/09/23 22:23:40 amdmi3 Exp $
6
7	PORTNAME= jamvm
8	PORTVERSION= 1.5.1
9	CATEGORIES= java devel
10	MASTER_SITES= SF/jamvm/jamvm/JamVM%20${PORTVERSION}
11	PKGNAMESUFFIX= -initial
12
13	MAINTAINER= skrabban@gmail.com
14	COMMENT= Bootstrap jamvm to compile classpath with ecj
15
16	RUN_DEPENDS= ${LOCALBASE}/share/classpath-initial/glibj.zip:${PORTSDIR}/java/classpath-initial
17
18	GNU_CONFIGURE= yes
19	CONFIGURE_ARGS= --with-classpath-install-dir=${LOCALBASE}
20	USE_GMAKE= yes
21
22	.include <bsd.port.pre.mk>
23
24	LIB_DEPENDS+= ffi:${PORTSDIR}/devel/libffi
25	CONFIGURE_ARGS+= --enable-ffi
26	LDFLAGS+= -L${LOCALBASE}/lib
27	CFLAGS+= `pkg-config libffi --cflags`
28
29	BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
30	PLIST_SUB+= WITH_ZIP="" WITHOUT_ZIP="@comment "
31
32	do-install:
33	${INSTALL_PROGRAM} -s ${WRKSRC}/src/jamvm-initial ${PREFIX}/bin
34	${MKDIR} ${PREFIX}/share/jamvm-initial
35	${INSTALL_DATA} ${WRKSRC}/lib/classes.zip \
36	${PREFIX}/share/jamvm-initial
37
38	.include <bsd.port.post.mk>

Added Link Here

(-)b/java/jamvm-initial/files/patch-configure (+32 lines)
1	--- configure.orig 2008-03-02 05:16:07.000000000 +0100
2	+++ configure 2012-01-27 15:03:21.000000000 +0100
3	@@ -2552,8 +2552,10 @@ i386--freebsd) host_os=bsd libdl_neede
4	x86_64--linux) host_os=linux ;;
5	hppa--linux*) host_cpu=parisc host_os=linux ;;
6	mipsel--linux) host_cpu=mips host_os=linux ;;
7	-amd64--openbsd) host_os=bsd libdl_needed=no ;;
8	-amd64--freebsd) host_os=bsd libdl_needed=no ;;
9	+amd64--openbsd) host_os=bsd host_cpu=x86_64 libdl_needed=no ;;
10	+amd64--freebsd) host_os=bsd host_cpu=x86_64 libdl_needed=no ;;
11	+sparc64--openbsd*) host_cpu=sparc64 host_os=bsd libdl_needed=no ;;
12	+sparc64--freebsd*) host_cpu=sparc64 host_os=bsd libdl_needed=no ;;
13	arm--linux*) host_cpu=arm host_os=linux ;;
14	arm--openbsd*) host_cpu=arm host_os=bsd libdl_needed=no ;;
15	arm--freebsd*) host_cpu=arm host_os=bsd libdl_needed=no ;;
16	@@ -22839,7 +22841,7 @@ fi
17	ac_config_links="$ac_config_links src/arch.h:src/arch/$arch.h"
18
19
20	-ac_config_files="$ac_config_files Makefile src/Makefile src/interp/Makefile src/interp/engine/Makefile src/arch/Makefile src/os/Makefile src/os/linux/Makefile src/os/darwin/Makefile src/os/bsd/Makefile src/os/linux/powerpc/Makefile src/os/linux/arm/Makefile src/os/linux/i386/Makefile src/os/linux/x86_64/Makefile src/os/linux/parisc/Makefile src/os/linux/mips/Makefile src/os/darwin/i386/Makefile src/os/darwin/arm/Makefile src/os/darwin/powerpc/Makefile src/os/bsd/powerpc/Makefile src/os/bsd/arm/Makefile src/os/bsd/i386/Makefile src/os/bsd/x86_64/Makefile lib/Makefile lib/java/Makefile lib/java/lang/Makefile lib/jamvm/Makefile lib/jamvm/java/Makefile lib/jamvm/java/lang/Makefile lib/java/lang/reflect/Makefile lib/java/security/Makefile lib/gnu/Makefile lib/sun/reflect/annotation/Makefile lib/sun/reflect/Makefile lib/sun/Makefile lib/gnu/classpath/Makefile"
21	+ac_config_files="$ac_config_files Makefile src/Makefile src/interp/Makefile src/interp/engine/Makefile src/arch/Makefile src/os/Makefile src/os/linux/Makefile src/os/darwin/Makefile src/os/bsd/Makefile src/os/linux/powerpc/Makefile src/os/linux/arm/Makefile src/os/linux/i386/Makefile src/os/linux/x86_64/Makefile src/os/linux/parisc/Makefile src/os/linux/mips/Makefile src/os/darwin/i386/Makefile src/os/darwin/arm/Makefile src/os/darwin/powerpc/Makefile src/os/bsd/powerpc/Makefile src/os/bsd/arm/Makefile src/os/bsd/i386/Makefile src/os/bsd/x86_64/Makefile src/os/bsd/sparc64/Makefile lib/Makefile lib/java/Makefile lib/java/lang/Makefile lib/jamvm/Makefile lib/jamvm/java/Makefile lib/jamvm/java/lang/Makefile lib/java/lang/reflect/Makefile lib/java/security/Makefile lib/gnu/Makefile lib/sun/reflect/annotation/Makefile lib/sun/reflect/Makefile lib/sun/Makefile lib/gnu/classpath/Makefile"
22
23
24	cat >confcache <<\_ACEOF
25	@@ -23483,6 +23485,7 @@ do
26	"src/os/bsd/arm/Makefile") CONFIG_FILES="$CONFIG_FILES src/os/bsd/arm/Makefile" ;;
27	"src/os/bsd/i386/Makefile") CONFIG_FILES="$CONFIG_FILES src/os/bsd/i386/Makefile" ;;
28	"src/os/bsd/x86_64/Makefile") CONFIG_FILES="$CONFIG_FILES src/os/bsd/x86_64/Makefile" ;;
29	+ "src/os/bsd/sparc64/Makefile") CONFIG_FILES="$CONFIG_FILES src/os/bsd/x86_64/Makefile" ;;
30	"lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
31	"lib/java/Makefile") CONFIG_FILES="$CONFIG_FILES lib/java/Makefile" ;;
32	"lib/java/lang/Makefile") CONFIG_FILES="$CONFIG_FILES lib/java/lang/Makefile" ;;

Added Link Here

(-)b/java/jamvm-initial/files/patch-src_Makefile.in (+21 lines)
1	--- src/Makefile.in.orig 2012-01-17 21:53:44.000000000 +0100
2	+++ src/Makefile.in 2012-01-17 21:50:39.000000000 +0100
3	@@ -34,7 +34,7 @@ PRE_UNINSTALL = :
4	POST_UNINSTALL = :
5	build_triplet = @build@
6	host_triplet = @host@
7	-bin_PROGRAMS = jamvm$(EXEEXT)
8	+bin_PROGRAMS = jamvm$(EXEEXT) jamvm-initial$(EXEEXT)
9	subdir = src
10	DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
11	$(srcdir)/Makefile.in $(srcdir)/config.h.in
12	@@ -360,6 +360,9 @@ jamvm$(EXEEXT): $(jamvm_OBJECTS) $(jamvm
13	@rm -f jamvm$(EXEEXT)
14	$(LINK) $(jamvm_OBJECTS) $(jamvm_LDADD) $(LIBS)
15
16	+jamvm-initial$(EXEEXT): jamvm$(EXEEXT)
17	+ @cp jamvm$(EXEEXT) jamvm-initial$(EXEEXT)
18	+
19	mostlyclean-compile:
20	-rm -f *.$(OBJEXT)
21

Added Link Here

(-)b/java/jamvm-initial/files/patch-src_alloc.c (+46 lines)
1	--- src/alloc.c.orig 2008-02-22 02:57:42.000000000 +0100
2	+++ src/alloc.c 2012-01-26 19:32:40.000000000 +0100
3	@@ -2134,8 +2134,8 @@ unsigned long maxHeapMem() {
4	suspended while holding the malloc lock */
5
6	void *gcMemMalloc(int n) {
7	- int size = n + sizeof(int);
8	- int *mem = mmap(0, size, PROT_READ\|PROT_WRITE,
9	+ uintptr_t size = n + sizeof(uintptr_t);
10	+ uintptr_t *mem = mmap(0, size, PROT_READ\|PROT_WRITE,
11	MAP_PRIVATE\|MAP_ANON, -1, 0);
12
13	if(mem == MAP_FAILED) {
14	@@ -2151,9 +2151,9 @@ void gcMemRealloc(void addr, int size)
15	if(addr == NULL)
16	return gcMemMalloc(size);
17	else {
18	- int *mem = addr;
19	- int old_size = *--mem;
20	- int new_size = size + sizeof(int);
21	+ uintptr_t *mem = addr;
22	+ uintptr_t old_size = *--mem;
23	+ uintptr_t new_size = size + sizeof(uintptr_t);
24
25	if(old_size/sys_page_size == new_size/sys_page_size) {
26	*mem = new_size;
27	@@ -2162,7 +2162,7 @@ void gcMemRealloc(void addr, int size)
28	int copy_size = new_size > old_size ? old_size : new_size;
29	void *new_mem = gcMemMalloc(size);
30
31	- memcpy(new_mem, addr, copy_size - sizeof(int));
32	+ memcpy(new_mem, addr, copy_size - sizeof(uintptr_t));
33	munmap(mem, old_size);
34
35	return new_mem;
36	@@ -2172,8 +2172,8 @@ void gcMemRealloc(void addr, int size)
37
38	void gcMemFree(void *addr) {
39	if(addr != NULL) {
40	- int *mem = addr;
41	- int size = *--mem;
42	+ uintptr_t *mem = addr;
43	+ uintptr_t size = *--mem;
44	munmap(mem, size);
45	}
46	}

Added Link Here

(-)b/java/jamvm-initial/files/patch-src_arch_sparc64.h (+137 lines)
1	--- src/arch/sparc64.h.orig 2012-01-26 19:32:40.000000000 +0100
2	+++ src/arch/sparc64.h 2012-01-26 19:32:40.000000000 +0100
3	@@ -0,0 +1,134 @@
4	+/*
5	+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
6	+ * Robert Lougher <rob@lougher.org.uk>.
7	+ *
8	+ * This file is part of JamVM.
9	+ *
10	+ * This program is free software; you can redistribute it and/or
11	+ * modify it under the terms of the GNU General Public License
12	+ * as published by the Free Software Foundation; either version 2,
13	+ * or (at your option) any later version.
14	+ *
15	+ * This program is distributed in the hope that it will be useful,
16	+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
17	+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18	+ * GNU General Public License for more details.
19	+ *
20	+ * You should have received a copy of the GNU General Public License
21	+ * along with this program; if not, write to the Free Software
22	+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
23	+ */
24	+
25	+#define OS_ARCH "sparc64"
26	+
27	+#define HANDLER_TABLE_T static const void
28	+#define DOUBLE_1_BITS 0x3ff0000000000000LL
29	+
30	+#define READ_DBL(v,p,l) v = ((u8)p[0]<<56)\|((u8)p[1]<<48)\|((u8)p[2]<<40) \
31	+ \|((u8)p[3]<<32)\|((u8)p[4]<<24)\|((u8)p[5]<<16) \
32	+ \|((u8)p[6]<<8)\|(u8)p[7]; p+=8
33	+
34	+#define FPU_HACK
35	+
36	+static inline uint32_t
37	+compare_and_swap_32(volatile uint32_t *addr, uint32_t oldval, uint32_t newval)
38	+{
39	+ uint32_t result;
40	+ __asm__ __volatile__ ("cas [%4], %2, %0"
41	+ : "=r" (result), "=m" (*addr)
42	+ : "r" (oldval), "m" (*addr), "r" (addr),
43	+ "0" (newval));
44	+ return result == oldval;
45	+}
46	+
47	+#define COMPARE_AND_SWAP32 compare_and_swap_32
48	+
49	+static inline uint64_t
50	+compare_and_swap_64( volatile uint64_t *addr,
51	+ volatile uint64_t oldval,
52	+ volatile uint64_t newval )
53	+{
54	+#if 1
55	+ uint64_t result;
56	+ __asm__ __volatile__ ("casx [%4], %2, %0"
57	+ : "=r" (result), "=m" (*addr)
58	+ : "r" (oldval), "m" (*addr), "r" (addr),
59	+ "0" (newval));
60	+ return result == oldval;
61	+#else
62	+ if(*addr == oldval) {
63	+ *addr = newval;
64	+ return 1;
65	+ } else {
66	+ return 0;
67	+ }
68	+
69	+#endif
70	+}
71	+
72	+#define COMPARE_AND_SWAP64 compare_and_swap_64
73	+#ifdef __arch64__
74	+# define COMPARE_AND_SWAP COMPARE_AND_SWAP64
75	+#else
76	+# define COMPARE_AND_SWAP COMPARE_AND_SWAP32
77	+#endif
78	+
79	+#define STORE_LOAD __asm__ __volatile__ ("membar #StoreLoad" : : : "memory")
80	+
81	+
82	+#define LOCKWORD_READ(addr) ({ STORE_LOAD; *addr; })
83	+#define LOCKWORD_WRITE(addr, value) ({ STORE_LOAD; *addr = value; })
84	+#define LOCKWORD_COMPARE_AND_SWAP COMPARE_AND_SWAP
85	+
86	+#define __GEN_REL_JMP(target_addr, patch_addr, opcode, \
87	+ type, patch_size) \
88	+({ \
89	+ int patched = FALSE; \
90	+ \
91	+ if(patch_size >= 1 + sizeof(type)) { \
92	+ char *nxt_ins_ptr = (patch_addr) + 1 + sizeof(type); \
93	+ uintptr_t limit = 1ULL<<((sizeof(type) * 8) - 1); \
94	+ \
95	+ /* The check is done in two parts to ensure the \
96	+ result is always positive, to guard against \
97	+ the pointer difference being larger than the \
98	+ signed range */ \
99	+ if(target_addr > nxt_ins_ptr) { \
100	+ uintptr_t disp = (target_addr) - (nxt_ins_ptr); \
101	+ \
102	+ if(disp < limit) { \
103	+ *(patch_addr) = opcode; \
104	+ (type)&(patch_addr)[1] = disp; \
105	+ patched = TRUE; \
106	+ } \
107	+ } else { \
108	+ uintptr_t disp = (nxt_ins_ptr) - (target_addr); \
109	+ \
110	+ if(disp <= limit) { \
111	+ *(patch_addr) = opcode; \
112	+ (type)&(patch_addr)[1] = -disp; \
113	+ patched = TRUE; \
114	+ } \
115	+ } \
116	+ } \
117	+ patched; \
118	+})
119	+
120	+#define GEN_REL_JMP(target_addr, patch_addr, patch_size) \
121	+({ \
122	+ __GEN_REL_JMP(target_addr, patch_addr, 0xeb, \
123	+ signed char, patch_size) \|\| \
124	+ __GEN_REL_JMP(target_addr, patch_addr, 0xe9, \
125	+ signed int, patch_size); \
126	+})
127	+
128	+#ifdef INLINING
129	+#error "I don't know how to flush"
130	+#define FLUSH_CACHE(addr, length)
131	+#endif
132	+#define MBARRIER() __asm__ __volatile__ ("membar #LoadLoad \| #LoadStore"\
133	+ " \| #StoreLoad \| #StoreStore" : : : "memory")
134	+#define UNLOCK_MBARRIER() MBARRIER()
135	+#define JMM_LOCK_MBARRIER() MBARRIER()
136	+#define JMM_UNLOCK_MBARRIER() MBARRIER()
137	+

Added Link Here

(-)b/java/jamvm-initial/files/patch-src_class.h (+18 lines)
1	--- src/class.h.orig 2012-01-17 22:03:07.000000000 +0100
2	+++ src/class.h 2012-01-17 22:04:12.000000000 +0100
3	@@ -39,11 +39,11 @@
4	separate class files in a directory structure */
5
6	#ifdef USE_ZIP
7	-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes.zip"
8	-#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath/glibj.zip"
9	+#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm-initial/classes.zip"
10	+#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath-initial/glibj.zip"
11	#else
12	-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes"
13	-#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath"
14	+#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm-initial/classes"
15	+#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath-initial"
16	#endif
17
18	#define DFLT_BCP JAMVM_CLASSES":"CLASSPATH_CLASSES

Added Link Here

(-)b/java/jamvm-initial/files/patch-src_dll_ffi.c (+13 lines)
1	--- src/dll_ffi.c.orig 2007-11-12 05:04:37.000000000 +0100
2	+++ src/dll_ffi.c 2012-01-26 19:32:40.000000000 +0100
3	@@ -72,8 +72,8 @@ int nativeExtraArg(MethodBlock *mb) {
4	uintptr_t callJNIMethod(void env, Class class, char sig, int num_args, uintptr_t *ostack,
5	unsigned char *func) {
6	ffi_cif cif;
7	- void *values[num_args];
8	- ffi_type *types[num_args];
9	+ void *values[num_args + 1];
10	+ ffi_type *types[num_args + 1];
11	uintptr_t *opntr = ostack;
12	void **values_pntr = &values[2];
13	ffi_type **types_pntr = &types[2];

Added Link Here

(-)b/java/jamvm-initial/files/patch-src_frame.h (+22 lines)
1	--- src/frame.h.orig 2008-01-26 02:15:41.000000000 +0100
2	+++ src/frame.h 2012-01-26 19:32:40.000000000 +0100
3	@@ -19,6 +19,10 @@
4	* Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
5	*/
6
7	+/* Ensure operand stack is double-word aligned. This leads to
8	+ better double floating-point performance */
9	+#define ALIGN_OSTACK(pntr) (uintptr_t*)(((uintptr_t)(pntr) + 7) & ~7)
10	+
11	#define CREATE_TOP_FRAME(ee, class, mb, sp, ret) \
12	{ \
13	Frame *last = ee->last_frame; \
14	@@ -28,7 +32,7 @@
15	\
16	ret = (void) (sp = (uintptr_t)(dummy+1)); \
17	new_frame = (Frame *)(sp + mb->max_locals); \
18	- new_ostack = (uintptr_t *)(new_frame + 1); \
19	+ new_ostack = ALIGN_OSTACK(new_frame + 1); \
20	\
21	if((char*)(new_ostack + mb->max_stack) > ee->stack_end) { \
22	if(ee->overflow++) { \

Added Link Here

(-)b/java/jamvm-initial/files/patch-src_os_bsd_sparc64_Makefile.in (+449 lines)
1	--- src/os/bsd/sparc64/Makefile.in.orig 2012-01-27 21:36:14.000000000 +0100
2	+++ src/os/bsd/sparc64/Makefile.in 2012-01-27 21:39:14.000000000 +0100
3	@@ -0,0 +1,446 @@
4	+# Makefile.in generated by automake 1.10.1 from Makefile.am.
5	+# @configure_input@
6	+
7	+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
8	+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
9	+# This Makefile.in is free software; the Free Software Foundation
10	+# gives unlimited permission to copy and/or distribute it,
11	+# with or without modifications, as long as this notice is preserved.
12	+
13	+# This program is distributed in the hope that it will be useful,
14	+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
15	+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
16	+# PARTICULAR PURPOSE.
17	+
18	+@SET_MAKE@
19	+
20	+VPATH = @srcdir@
21	+pkgdatadir = $(datadir)/@PACKAGE@
22	+pkglibdir = $(libdir)/@PACKAGE@
23	+pkgincludedir = $(includedir)/@PACKAGE@
24	+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
25	+install_sh_DATA = $(install_sh) -c -m 644
26	+install_sh_PROGRAM = $(install_sh) -c
27	+install_sh_SCRIPT = $(install_sh) -c
28	+INSTALL_HEADER = $(INSTALL_DATA)
29	+transform = $(program_transform_name)
30	+NORMAL_INSTALL = :
31	+PRE_INSTALL = :
32	+POST_INSTALL = :
33	+NORMAL_UNINSTALL = :
34	+PRE_UNINSTALL = :
35	+POST_UNINSTALL = :
36	+build_triplet = @build@
37	+host_triplet = @host@
38	+subdir = src/os/bsd/sparc64
39	+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
40	+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
41	+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
42	+ $(top_srcdir)/configure.ac
43	+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
44	+ $(ACLOCAL_M4)
45	+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
46	+CONFIG_HEADER = $(top_builddir)/src/config.h
47	+CONFIG_CLEAN_FILES =
48	+LTLIBRARIES = $(noinst_LTLIBRARIES)
49	+libnative_la_LIBADD =
50	+am_libnative_la_OBJECTS = init.lo
51	+libnative_la_OBJECTS = $(am_libnative_la_OBJECTS)
52	+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
53	+depcomp = $(SHELL) $(top_srcdir)/depcomp
54	+am__depfiles_maybe = depfiles
55	+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
56	+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
57	+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
58	+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
59	+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
60	+CCLD = $(CC)
61	+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
62	+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
63	+ $(LDFLAGS) -o $@
64	+SOURCES = $(libnative_la_SOURCES)
65	+DIST_SOURCES = $(libnative_la_SOURCES)
66	+ETAGS = etags
67	+CTAGS = ctags
68	+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
69	+ACLOCAL = @ACLOCAL@
70	+ALLOCA = @ALLOCA@
71	+AMTAR = @AMTAR@
72	+AR = @AR@
73	+AUTOCONF = @AUTOCONF@
74	+AUTOHEADER = @AUTOHEADER@
75	+AUTOMAKE = @AUTOMAKE@
76	+AWK = @AWK@
77	+CC = @CC@
78	+CCAS = @CCAS@
79	+CCASDEPMODE = @CCASDEPMODE@
80	+CCASFLAGS = @CCASFLAGS@
81	+CCDEPMODE = @CCDEPMODE@
82	+CFLAGS = @CFLAGS@
83	+CPP = @CPP@
84	+CPPFLAGS = @CPPFLAGS@
85	+CXX = @CXX@
86	+CXXCPP = @CXXCPP@
87	+CXXDEPMODE = @CXXDEPMODE@
88	+CXXFLAGS = @CXXFLAGS@
89	+CYGPATH_W = @CYGPATH_W@
90	+DEFS = @DEFS@
91	+DEPDIR = @DEPDIR@
92	+DSYMUTIL = @DSYMUTIL@
93	+ECHO = @ECHO@
94	+ECHO_C = @ECHO_C@
95	+ECHO_N = @ECHO_N@
96	+ECHO_T = @ECHO_T@
97	+EGREP = @EGREP@
98	+EXEEXT = @EXEEXT@
99	+F77 = @F77@
100	+FFLAGS = @FFLAGS@
101	+GREP = @GREP@
102	+INSTALL = @INSTALL@
103	+INSTALL_DATA = @INSTALL_DATA@
104	+INSTALL_PROGRAM = @INSTALL_PROGRAM@
105	+INSTALL_SCRIPT = @INSTALL_SCRIPT@
106	+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
107	+JAVAC = @JAVAC@
108	+LDFLAGS = @LDFLAGS@
109	+LIBOBJS = @LIBOBJS@
110	+LIBS = @LIBS@
111	+LIBTOOL = @LIBTOOL@
112	+LN_S = @LN_S@
113	+LTLIBOBJS = @LTLIBOBJS@
114	+MAINT = @MAINT@
115	+MAKEINFO = @MAKEINFO@
116	+MKDIR_P = @MKDIR_P@
117	+NMEDIT = @NMEDIT@
118	+OBJEXT = @OBJEXT@
119	+PACKAGE = @PACKAGE@
120	+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
121	+PACKAGE_NAME = @PACKAGE_NAME@
122	+PACKAGE_STRING = @PACKAGE_STRING@
123	+PACKAGE_TARNAME = @PACKAGE_TARNAME@
124	+PACKAGE_VERSION = @PACKAGE_VERSION@
125	+PATH_SEPARATOR = @PATH_SEPARATOR@
126	+RANLIB = @RANLIB@
127	+SED = @SED@
128	+SET_MAKE = @SET_MAKE@
129	+SHELL = @SHELL@
130	+STRIP = @STRIP@
131	+VERSION = @VERSION@
132	+abs_builddir = @abs_builddir@
133	+abs_srcdir = @abs_srcdir@
134	+abs_top_builddir = @abs_top_builddir@
135	+abs_top_srcdir = @abs_top_srcdir@
136	+ac_ct_CC = @ac_ct_CC@
137	+ac_ct_CXX = @ac_ct_CXX@
138	+ac_ct_F77 = @ac_ct_F77@
139	+am__include = @am__include@
140	+am__leading_dot = @am__leading_dot@
141	+am__quote = @am__quote@
142	+am__tar = @am__tar@
143	+am__untar = @am__untar@
144	+arch = @arch@
145	+bindir = @bindir@
146	+build = @build@
147	+build_alias = @build_alias@
148	+build_cpu = @build_cpu@
149	+build_os = @build_os@
150	+build_vendor = @build_vendor@
151	+builddir = @builddir@
152	+datadir = @datadir@
153	+datarootdir = @datarootdir@
154	+docdir = @docdir@
155	+dvidir = @dvidir@
156	+exec_prefix = @exec_prefix@
157	+host = @host@
158	+host_alias = @host_alias@
159	+host_cpu = @host_cpu@
160	+host_os = @host_os@
161	+host_vendor = @host_vendor@
162	+htmldir = @htmldir@
163	+includedir = @includedir@
164	+infodir = @infodir@
165	+install_sh = @install_sh@
166	+interp_cflags = @interp_cflags@
167	+libdir = @libdir@
168	+libexecdir = @libexecdir@
169	+localedir = @localedir@
170	+localstatedir = @localstatedir@
171	+mandir = @mandir@
172	+mkdir_p = @mkdir_p@
173	+oldincludedir = @oldincludedir@
174	+os = @os@
175	+pdfdir = @pdfdir@
176	+prefix = @prefix@
177	+program_transform_name = @program_transform_name@
178	+psdir = @psdir@
179	+sbindir = @sbindir@
180	+sharedstatedir = @sharedstatedir@
181	+srcdir = @srcdir@
182	+sysconfdir = @sysconfdir@
183	+target_alias = @target_alias@
184	+top_builddir = @top_builddir@
185	+top_srcdir = @top_srcdir@
186	+use_zip_no = @use_zip_no@
187	+use_zip_yes = @use_zip_yes@
188	+with_classpath_install_dir = @with_classpath_install_dir@
189	+noinst_LTLIBRARIES = libnative.la
190	+libnative_la_SOURCES = init.c
191	+AM_CPPFLAGS = -I$(top_builddir)/src
192	+all: all-am
193	+
194	+.SUFFIXES:
195	+.SUFFIXES: .c .lo .o .obj
196	+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
197	+ @for dep in $?; do \
198	+ case '$(am__configure_deps)' in \
199	+ $$dep) \
200	+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
201	+ && exit 0; \
202	+ exit 1;; \
203	+ esac; \
204	+ done; \
205	+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/os/bsd/spar64/Makefile'; \
206	+ cd $(top_srcdir) && \
207	+ $(AUTOMAKE) --gnu src/os/bsd/sparc64/Makefile
208	+.PRECIOUS: Makefile
209	+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
210	+ @case '$?' in \
211	+ config.status) \
212	+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
213	+ *) \
214	+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
215	+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
216	+ esac;
217	+
218	+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
219	+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
220	+
221	+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
222	+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
223	+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
224	+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
225	+
226	+clean-noinstLTLIBRARIES:
227	+ -test -z "$(noinst_LTLIBRARIES)" \|\| rm -f $(noinst_LTLIBRARIES)
228	+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
229	+ dir="`echo $$p \| sed -e 's\|/[^/]*$$\|\|'`"; \
230	+ test "$$dir" != "$$p" \|\| dir=.; \
231	+ echo "rm -f \"$${dir}/so_locations\""; \
232	+ rm -f "$${dir}/so_locations"; \
233	+ done
234	+libnative.la: $(libnative_la_OBJECTS) $(libnative_la_DEPENDENCIES)
235	+ $(LINK) $(libnative_la_OBJECTS) $(libnative_la_LIBADD) $(LIBS)
236	+
237	+mostlyclean-compile:
238	+ -rm -f *.$(OBJEXT)
239	+
240	+distclean-compile:
241	+ -rm -f *.tab.c
242	+
243	+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init.Plo@am__quote@
244	+
245	+.c.o:
246	+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
247	+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$.Tpo $(DEPDIR)/$.Po
248	+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
249	+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
250	+@am__fastdepCC_FALSE@ $(COMPILE) -c $<
251	+
252	+.c.obj:
253	+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
254	+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$.Tpo $(DEPDIR)/$.Po
255	+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
256	+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
257	+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
258	+
259	+.c.lo:
260	+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
261	+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$.Tpo $(DEPDIR)/$.Plo
262	+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
263	+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
264	+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
265	+
266	+mostlyclean-libtool:
267	+ -rm -f *.lo
268	+
269	+clean-libtool:
270	+ -rm -rf .libs _libs
271	+
272	+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
273	+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
274	+ unique=`for i in $$list; do \
275	+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
276	+ done \| \
277	+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
278	+ END { if (nonempty) { for (i in files) print i; }; }'`; \
279	+ mkid -fID $$unique
280	+tags: TAGS
281	+
282	+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
283	+ $(TAGS_FILES) $(LISP)
284	+ tags=; \
285	+ here=`pwd`; \
286	+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
287	+ unique=`for i in $$list; do \
288	+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
289	+ done \| \
290	+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
291	+ END { if (nonempty) { for (i in files) print i; }; }'`; \
292	+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
293	+ test -n "$$unique" \|\| unique=$$empty_fix; \
294	+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
295	+ $$tags $$unique; \
296	+ fi
297	+ctags: CTAGS
298	+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
299	+ $(TAGS_FILES) $(LISP)
300	+ tags=; \
301	+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
302	+ unique=`for i in $$list; do \
303	+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
304	+ done \| \
305	+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
306	+ END { if (nonempty) { for (i in files) print i; }; }'`; \
307	+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
308	+ \|\| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
309	+ $$tags $$unique
310	+
311	+GTAGS:
312	+ here=`$(am__cd) $(top_builddir) && pwd` \
313	+ && cd $(top_srcdir) \
314	+ && gtags -i $(GTAGS_ARGS) $$here
315	+
316	+distclean-tags:
317	+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
318	+
319	+distdir: $(DISTFILES)
320	+ @srcdirstrip=`echo "$(srcdir)" \| sed 's/[].[^$$\\*]/\\\\&/g'`; \
321	+ topsrcdirstrip=`echo "$(top_srcdir)" \| sed 's/[].[^$$\\*]/\\\\&/g'`; \
322	+ list='$(DISTFILES)'; \
323	+ dist_files=`for file in $$list; do echo $$file; done \| \
324	+ sed -e "s\|^$$srcdirstrip/\|\|;t" \
325	+ -e "s\|^$$topsrcdirstrip/\|$(top_builddir)/\|;t"`; \
326	+ case $$dist_files in \
327	+ /) $(MKDIR_P) `echo "$$dist_files" \| \
328	+ sed '/\//!d;s\|^\|$(distdir)/\|;s,/[^/]*$$,,' \| \
329	+ sort -u` ;; \
330	+ esac; \
331	+ for file in $$dist_files; do \
332	+ if test -f $$file \|\| test -d $$file; then d=.; else d=$(srcdir); fi; \
333	+ if test -d $$d/$$file; then \
334	+ dir=`echo "/$$file" \| sed -e 's,/[^/]*$$,,'`; \
335	+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
336	+ cp -pR $(srcdir)/$$file $(distdir)$$dir \|\| exit 1; \
337	+ fi; \
338	+ cp -pR $$d/$$file $(distdir)$$dir \|\| exit 1; \
339	+ else \
340	+ test -f $(distdir)/$$file \
341	+ \|\| cp -p $$d/$$file $(distdir)/$$file \
342	+ \|\| exit 1; \
343	+ fi; \
344	+ done
345	+check-am: all-am
346	+check: check-am
347	+all-am: Makefile $(LTLIBRARIES)
348	+installdirs:
349	+install: install-am
350	+install-exec: install-exec-am
351	+install-data: install-data-am
352	+uninstall: uninstall-am
353	+
354	+install-am: all-am
355	+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
356	+
357	+installcheck: installcheck-am
358	+install-strip:
359	+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
360	+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
361	+ `test -z '$(STRIP)' \|\| \
362	+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
363	+mostlyclean-generic:
364	+
365	+clean-generic:
366	+
367	+distclean-generic:
368	+ -test -z "$(CONFIG_CLEAN_FILES)" \|\| rm -f $(CONFIG_CLEAN_FILES)
369	+
370	+maintainer-clean-generic:
371	+ @echo "This command is intended for maintainers to use"
372	+ @echo "it deletes files that may require special tools to rebuild."
373	+clean: clean-am
374	+
375	+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
376	+ mostlyclean-am
377	+
378	+distclean: distclean-am
379	+ -rm -rf ./$(DEPDIR)
380	+ -rm -f Makefile
381	+distclean-am: clean-am distclean-compile distclean-generic \
382	+ distclean-tags
383	+
384	+dvi: dvi-am
385	+
386	+dvi-am:
387	+
388	+html: html-am
389	+
390	+info: info-am
391	+
392	+info-am:
393	+
394	+install-data-am:
395	+
396	+install-dvi: install-dvi-am
397	+
398	+install-exec-am:
399	+
400	+install-html: install-html-am
401	+
402	+install-info: install-info-am
403	+
404	+install-man:
405	+
406	+install-pdf: install-pdf-am
407	+
408	+install-ps: install-ps-am
409	+
410	+installcheck-am:
411	+
412	+maintainer-clean: maintainer-clean-am
413	+ -rm -rf ./$(DEPDIR)
414	+ -rm -f Makefile
415	+maintainer-clean-am: distclean-am maintainer-clean-generic
416	+
417	+mostlyclean: mostlyclean-am
418	+
419	+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
420	+ mostlyclean-libtool
421	+
422	+pdf: pdf-am
423	+
424	+pdf-am:
425	+
426	+ps: ps-am
427	+
428	+ps-am:
429	+
430	+uninstall-am:
431	+
432	+.MAKE: install-am install-strip
433	+
434	+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
435	+ clean-libtool clean-noinstLTLIBRARIES ctags distclean \
436	+ distclean-compile distclean-generic distclean-libtool \
437	+ distclean-tags distdir dvi dvi-am html html-am info info-am \
438	+ install install-am install-data install-data-am install-dvi \
439	+ install-dvi-am install-exec install-exec-am install-html \
440	+ install-html-am install-info install-info-am install-man \
441	+ install-pdf install-pdf-am install-ps install-ps-am \
442	+ install-strip installcheck installcheck-am installdirs \
443	+ maintainer-clean maintainer-clean-generic mostlyclean \
444	+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
445	+ pdf pdf-am ps ps-am tags uninstall uninstall-am
446	+
447	+# Tell versions [3.59,3.63) of GNU make to not export all variables.
448	+# Otherwise a system limit (for SysV at least) may be exceeded.
449	+.NOEXPORT:

Added Link Here

(-)b/java/jamvm-initial/files/patch-src_os_bsd_sparc64_init.c (+29 lines)
1	--- src/os/bsd/sparc64/init.c.orig 2012-01-26 19:32:40.000000000 +0100
2	+++ src/os/bsd/sparc64/init.c 2012-01-26 19:32:40.000000000 +0100
3	@@ -0,0 +1,26 @@
4	+/*
5	+ * Copyright (C) 2003, 2004, 2006, 2007
6	+ * Robert Lougher <rob@lougher.org.uk>.
7	+ *
8	+ * This file is part of JamVM.
9	+ *
10	+ * This program is free software; you can redistribute it and/or
11	+ * modify it under the terms of the GNU General Public License
12	+ * as published by the Free Software Foundation; either version 2,
13	+ * or (at your option) any later version.
14	+ *
15	+ * This program is distributed in the hope that it will be useful,
16	+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
17	+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18	+ * GNU General Public License for more details.
19	+ *
20	+ * You should have received a copy of the GNU General Public License
21	+ * along with this program; if not, write to the Free Software
22	+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
23	+ */
24	+
25	+void setDoublePrecision() {
26	+}
27	+
28	+void initialisePlatform() {
29	+}