View | Details | Raw Unified | Return to bug 164941 | Differences between
and this patch

Collapse All | Expand All

(-)java/Makefile (+2 lines)
Lines 11-16 Link Here
11
    SUBDIR += cacao
11
    SUBDIR += cacao
12
    SUBDIR += castor
12
    SUBDIR += castor
13
    SUBDIR += classpath
13
    SUBDIR += classpath
14
    SUBDIR += classpath-initial
14
    SUBDIR += commonclipse
15
    SUBDIR += commonclipse
15
    SUBDIR += cos
16
    SUBDIR += cos
16
    SUBDIR += cryptix-jce
17
    SUBDIR += cryptix-jce
Lines 76-81 Link Here
76
    SUBDIR += jakarta-regexp
77
    SUBDIR += jakarta-regexp
77
    SUBDIR += jakarta-struts
78
    SUBDIR += jakarta-struts
78
    SUBDIR += jamvm
79
    SUBDIR += jamvm
80
    SUBDIR += jamvm-initial
79
    SUBDIR += jasmin
81
    SUBDIR += jasmin
80
    SUBDIR += java-checkstyle
82
    SUBDIR += java-checkstyle
81
    SUBDIR += java-cup
83
    SUBDIR += java-cup
(-)java/classpath/Makefile (-17 / +32 lines)
Lines 1-9 Link Here
1
# Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
1
# Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
2
# $FreeBSD$
2
# $FreeBSD: head/java/classpath/Makefile 312134 2013-02-12 22:21:32Z jkim $
3
3
4
PORTNAME=	classpath
4
PORTNAME=	classpath
5
PORTVERSION=	0.99
5
PORTVERSION=	0.99
6
PORTREVISION=	1
6
PORTREVISION=	3
7
CATEGORIES=	java devel
7
CATEGORIES=	java devel
8
MASTER_SITES=	${MASTER_SITE_GNU} \
8
MASTER_SITES=	${MASTER_SITE_GNU} \
9
		${MASTER_SITE_SAVANNAH}
9
		${MASTER_SITE_SAVANNAH}
Lines 62-67 Link Here
62
62
63
.include <bsd.port.options.mk>
63
.include <bsd.port.options.mk>
64
64
65
# ecj to include as com.sun.tools.javac
65
.if ${PORT_OPTIONS:MECJ}
66
.if ${PORT_OPTIONS:MECJ}
66
MASTER_SITES+=		${MASTER_SITE_ECLIPSE:S|$|:ecj|}
67
MASTER_SITES+=		${MASTER_SITE_ECLIPSE:S|$|:ecj|}
67
MASTER_SITE_SUBDIR+=	R-${ECJ_VERSION}-${ECJ_DROPDATE}/:ecj
68
MASTER_SITE_SUBDIR+=	R-${ECJ_VERSION}-${ECJ_DROPDATE}/:ecj
Lines 69-74 Link Here
69
ECJ_VERSION=		3.8.1
70
ECJ_VERSION=		3.8.1
70
ECJ_DROPDATE=		201209141540
71
ECJ_DROPDATE=		201209141540
71
ECJ_JAR=		ecj-${ECJ_VERSION}.jar
72
ECJ_JAR=		ecj-${ECJ_VERSION}.jar
73
.endif
74
75
# jamvm-initial works with this version of ecj
76
MASTER_SITES+=		http://www.df.lth.se/~pi/eclipse_archive/drops/%SUBDIR%/:ecjc
77
MASTER_SITES+=		http://archive.eclipse.org/eclipse/downloads/drops/%SUBDIR%/:ecjc
78
MASTER_SITE_SUBDIR+=	R-${ECJ_COMPILE_VERSION}-${ECJ_COMPILE_DROPDATE}/:ecjc
79
DISTFILES+=		${ECJ_COMPILE_JAR}:ecjc
80
ECJ_COMPILE_VERSION=	3.2.2
81
ECJ_COMPILE_DROPDATE=	200702121330
82
ECJ_COMPILE_JAR=	ecj.jar
83
84
BUILD_DEPENDS+=		jamvm-initial:${PORTSDIR}/java/jamvm-initial
85
BUILD_DEPENDS+=		zip:${PORTSDIR}/archivers/zip
86
JAR=			no
87
88
.if ${PORT_OPTIONS:MECJ}
72
CONFIGURE_ARGS+=	--with-ecj-jar=${DISTDIR}/${ECJ_JAR}
89
CONFIGURE_ARGS+=	--with-ecj-jar=${DISTDIR}/${ECJ_JAR}
73
.endif
90
.endif
74
91
Lines 123-128 Link Here
123
.endif
140
.endif
124
.endif
141
.endif
125
142
143
JAVA=			${LOCALBASE}/bin/jamvm-initial
144
JAVAC=			${WRKDIR}/ecj.sh
145
126
.if ${PORT_OPTIONS:MQT4}
146
.if ${PORT_OPTIONS:MQT4}
127
CONFIGURE_ARGS+=	--enable-qt-peer
147
CONFIGURE_ARGS+=	--enable-qt-peer
128
.if empty(PORT_OPTIONS:MGTK2)
148
.if empty(PORT_OPTIONS:MGTK2)
Lines 135-157 Link Here
135
PLIST_SUB+=		QT4="@comment "
155
PLIST_SUB+=		QT4="@comment "
136
.endif
156
.endif
137
157
138
.if !defined(WITH_GCJ) && (${ARCH} == "amd64" || ${ARCH} == "i386")
139
BUILD_DEPENDS+=		${LOCALBASE}/bootstrap-openjdk/bin/javac:${PORTSDIR}/java/bootstrap-openjdk
140
JAR?=			${LOCALBASE}/bootstrap-openjdk/bin/jar
141
JAVA?=			${LOCALBASE}/bootstrap-openjdk/bin/java
142
JAVAC?=			${LOCALBASE}/bootstrap-openjdk/bin/javac
143
.else
144
USE_BINUTILS=		yes
145
USE_GCC=		4.6+
146
GCC_SUFX=		${_USE_GCC:S/.//}
147
JAR?=			${LOCALBASE}/bin/gjar${GCC_SUFX}
148
JAVA?=			${LOCALBASE}/bin/gij${GCC_SUFX}
149
JAVAC?=			${LOCALBASE}/bin/gcj${GCC_SUFX}
150
JAVACFLAGS?=		-C
151
.endif
152
153
post-patch:
158
post-patch:
154
	@${REINPLACE_CMD} -i.bak -e 's|@JAVA@|$${JAVACMD:-java}|g' \
159
	@${REINPLACE_CMD} -i.bak -e 's|@JAVA@|$${JAVACMD:-java}|g' \
155
	    ${WRKSRC}/tools/g*.in
160
	    ${WRKSRC}/tools/g*.in
156
161
162
pre-configure:
163
	@if [ ! -x ${JAVAC} ]; then \
164
		${PRINTF} "%s\n%s\n%s\n%s\n" \
165
		    '#!/bin/sh' \
166
		    '"${JAVA}" -Xmx768M -classpath "${DISTDIR}/${ECJ_COMPILE_JAR}" \' \
167
		    '    org.eclipse.jdt.internal.compiler.batch.Main -nowarn \' \
168
		    '    "$${@:--help}"' > ${JAVAC}; \
169
		${CHMOD} 755 ${JAVAC}; \
170
	fi
171
157
.include <bsd.port.mk>
172
.include <bsd.port.mk>
(-)java/classpath/distinfo (-2 / +4 lines)
Lines 1-6 Link Here
1
SHA256 (classpath-0.99.tar.gz) = f929297f8ae9b613a1a167e231566861893260651d913ad9b6c11933895fecc8
1
SHA256 (classpath-0.99.tar.gz) = f929297f8ae9b613a1a167e231566861893260651d913ad9b6c11933895fecc8
2
SIZE (classpath-0.99.tar.gz) = 11078232
2
SIZE (classpath-0.99.tar.gz) = 11078232
3
SHA256 (ecj.jar) = 3b26627f4c998c67f147392dc3355f38b05769e400925a7c4f9ff68819f1c303
4
SIZE (ecj.jar) = 1323277
5
SHA256 (antlr-2.7.7.jar) = 88fbda4b912596b9f56e8e12e580cc954bacfb51776ecfddd3e18fc1cf56dc4c
6
SIZE (antlr-2.7.7.jar) = 445288
3
SHA256 (ecj-3.8.1.jar) = f59808845afaf1aaa5ee35bcf4ec70d465073320fe768f71c1b9fbb3a220ceef
7
SHA256 (ecj-3.8.1.jar) = f59808845afaf1aaa5ee35bcf4ec70d465073320fe768f71c1b9fbb3a220ceef
4
SIZE (ecj-3.8.1.jar) = 1796325
8
SIZE (ecj-3.8.1.jar) = 1796325
5
SHA256 (antlr-2.7.7.jar) = 88fbda4b912596b9f56e8e12e580cc954bacfb51776ecfddd3e18fc1cf56dc4c
6
SIZE (antlr-2.7.7.jar) = 445288
(-)java/classpath-initial/Makefile (+28 lines)
Line 0 Link Here
1
# Created by: Per Ola Ingvarsson <skrabban@gmail.com>
2
# $FreeBSD$
3
4
PORTNAME=	classpath
5
PORTVERSION=	0.93
6
CATEGORIES=	java devel
7
MASTER_SITES=	${MASTER_SITE_GNU} \
8
		${MASTER_SITE_SAVANNAH}
9
MASTER_SITE_SUBDIR=	classpath
10
PKGNAMESUFFIX=	-initial
11
12
MAINTAINER=	skrabban@gmail.com
13
COMMENT=	Classpath to be used with jamvm-initial to build newer classpath
14
15
BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
16
		jikes:${PORTSDIR}/java/jikes
17
18
USE_LDCONFIG=	yes
19
GNU_CONFIGURE=	yes
20
CXXFLAGS+=	-I${LOCALBASE}/include
21
22
CONFIGURE_ARGS=	--enable-jni --disable-alsa --disable-dssi \
23
		--disable-plugin --disable-gtk-peer --with-jikes \
24
		--disable-examples --disable-gconf-peer
25
26
USE_GMAKE=	yes
27
28
.include <bsd.port.mk>
(-)java/classpath-initial/distinfo (+2 lines)
Line 0 Link Here
1
SHA256 (classpath-0.93.tar.gz) = df2d093612abd23fe67e9409d89bb2a8e79b1664fe2b2da40e1c8ed693e32945
2
SIZE (classpath-0.93.tar.gz) = 9534222
(-)java/classpath-initial/files/patch-configure (+11 lines)
Line 0 Link Here
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
 
(-)java/classpath-initial/files/patch-doc_Makefile.in (+16 lines)
Line 0 Link Here
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)
(-)java/classpath-initial/files/patch-include_Makefile.in (+11 lines)
Line 0 Link Here
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
 
(-)java/classpath-initial/files/patch-native_jni_native-lib_cpnet.h (+10 lines)
Line 0 Link Here
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>
(-)java/classpath-initial/files/patch-resource_Makefile.in (+11 lines)
Line 0 Link Here
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
 
(-)java/classpath-initial/files/patch-tools_Makefile.in (+11 lines)
Line 0 Link Here
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
 
(-)java/classpath-initial/pkg-descr (+9 lines)
Line 0 Link Here
1
The purpose of this package is to provide a java library for jamvm-initial 
2
which is turn is used to build the newer version of classpath which in turn
3
can be used together with a newer version of jamvm.
4
5
GNU Classpath, Essential Libraries for Java, is a GNU project to create free
6
core class libraries for use with virtual machines and compilers for the Java
7
programming language.
8
9
WWW: http://www.classpath.org/
(-)java/classpath-initial/pkg-plist (+22 lines)
Line 0 Link Here
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
(-)java/jamvm-initial/Makefile (+36 lines)
Line 0 Link Here
1
# Created by: Per Ola Ingvarsson <skrabban@gmail.com>
2
# $FreeBSD$
3
4
PORTNAME=	jamvm
5
PORTVERSION=	1.5.1
6
CATEGORIES=	java devel
7
MASTER_SITES=	SF/jamvm/jamvm/JamVM%20${PORTVERSION}
8
PKGNAMESUFFIX=	-initial
9
10
MAINTAINER=	skrabban@gmail.com
11
COMMENT=	Bootstrap jamvm to compile classpath with ecj
12
13
RUN_DEPENDS=	${LOCALBASE}/share/classpath-initial/glibj.zip:${PORTSDIR}/java/classpath-initial
14
15
GNU_CONFIGURE=	yes
16
CONFIGURE_ARGS=	--with-classpath-install-dir=${LOCALBASE}
17
USE_GMAKE=	yes
18
USE_PKGCONFIG=	build
19
20
.include <bsd.port.pre.mk>
21
22
LIB_DEPENDS+=		ffi:${PORTSDIR}/devel/libffi
23
CONFIGURE_ARGS+=	--enable-ffi
24
LDFLAGS+=	-L${LOCALBASE}/lib
25
CFLAGS+=	`pkg-config libffi --cflags`
26
27
BUILD_DEPENDS+=		zip:${PORTSDIR}/archivers/zip
28
PLIST_SUB+=		WITH_ZIP="" WITHOUT_ZIP="@comment "
29
30
do-install:
31
	${INSTALL_PROGRAM} -s ${WRKSRC}/src/jamvm-initial ${PREFIX}/bin
32
	${MKDIR} ${PREFIX}/share/jamvm-initial
33
	${INSTALL_DATA} ${WRKSRC}/lib/classes.zip \
34
		${PREFIX}/share/jamvm-initial
35
36
.include <bsd.port.post.mk>
(-)java/jamvm-initial/distinfo (+2 lines)
Line 0 Link Here
1
SHA256 (jamvm-1.5.1.tar.gz) = 663895bd69caf3a1fda6af5eea8263d90a5fd35ca8f4c32e2210ac410788901a
2
SIZE (jamvm-1.5.1.tar.gz) = 599084
(-)java/jamvm-initial/files/patch-configure (+32 lines)
Line 0 Link Here
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" ;;
(-)java/jamvm-initial/files/patch-lib_Makefile.in (+11 lines)
Line 0 Link Here
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
(-)java/jamvm-initial/files/patch-src_Makefile.in (+21 lines)
Line 0 Link Here
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
 
(-)java/jamvm-initial/files/patch-src_alloc.c (+46 lines)
Line 0 Link Here
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
 }
(-)java/jamvm-initial/files/patch-src_arch_sparc64.h (+137 lines)
Line 0 Link Here
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
+
(-)java/jamvm-initial/files/patch-src_class.h (+18 lines)
Line 0 Link Here
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
(-)java/jamvm-initial/files/patch-src_dll.c (+11 lines)
Line 0 Link Here
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) {
(-)java/jamvm-initial/files/patch-src_dll_ffi.c (+13 lines)
Line 0 Link Here
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];
(-)java/jamvm-initial/files/patch-src_frame.h (+22 lines)
Line 0 Link Here
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++) {                                    \
(-)java/jamvm-initial/files/patch-src_os_bsd_os.c (+11 lines)
Line 0 Link Here
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);
(-)java/jamvm-initial/files/patch-src_os_bsd_sparc64_Makefile.in (+449 lines)
Line 0 Link Here
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:
(-)java/jamvm-initial/files/patch-src_os_bsd_sparc64_init.c (+29 lines)
Line 0 Link Here
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
+}
(-)java/jamvm-initial/files/patch-src_thread.c (+11 lines)
Line 0 Link Here
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
 
(-)java/jamvm-initial/pkg-descr (+11 lines)
Line 0 Link Here
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/
(-)java/jamvm-initial/pkg-plist (+3 lines)
Line 0 Link Here
1
bin/jamvm-initial
2
share/jamvm-initial/classes.zip
3
@dirrm share/jamvm-initial

Return to bug 164941