[prev in list] [next in list] [prev in thread] [next in thread]
List: openjdk-distro-pkg-dev
Subject: changeset in /hg/icedtea: 2007-09-12 Christan Thalinger <twist...
From: twisti () complang ! tuwien ! ac ! at (Christian Thalinger)
Date: 2007-09-12 21:13:57
Message-ID: hg.8b0be2eafb18.1189631637.-6899778133799504387 () icedtea ! classpath ! org
[Download RAW message or body]
changeset 8b0be2eafb18 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8b0be2eafb18
description:
2007-09-12 Christan Thalinger <twisti at complang.tuwien.ac.at>
* Makefile.am: Added WITH_CACAO stuff.
* Makefile.in: Regenerated.
* acinclude.m4 (AC_CHECK_WITH_CACAO): New function.
* configure.ac (AC_CHECK_WITH_CACAO): Added.
* configure: Regenerated.
* patches/icedtea-cacao-Compiler-gcc-gmk.patch,
patches/icedtea-cacao-Defs-linux-gmk.patch,
patches/icedtea-cacao-Platform-gmk.patch,
patches/icedtea-cacao-Program-gmk.patch,
patches/icedtea-cacao-java-c.patch,
patches/icedtea-cacao-jvm-cfg.patch: New file.
diffstat:
12 files changed, 310 insertions(+), 36 deletions(-)
ChangeLog | 14 +++++
Makefile.am | 25 ++++++++--
Makefile.in | 63 +++++++++++++-------------
acinclude.m4 | 28 +++++++++++
configure | 54 +++++++++++++++++++++-
configure.ac | 1
patches/icedtea-cacao-Compiler-gcc-gmk.patch | 46 ++++++++++++++++++
patches/icedtea-cacao-Defs-linux-gmk.patch | 13 +++++
patches/icedtea-cacao-Platform-gmk.patch | 32 +++++++++++++
patches/icedtea-cacao-Program-gmk.patch | 13 +++++
patches/icedtea-cacao-java-c.patch | 14 +++++
patches/icedtea-cacao-jvm-cfg.patch | 43 +++++++++++++++++
diffs (truncated from 551 to 500 lines):
diff -r 3ce5b4fff04b -r 8b0be2eafb18 ChangeLog
--- a/ChangeLog Wed Sep 12 16:44:45 2007 -0400
+++ b/ChangeLog Wed Sep 12 23:13:50 2007 +0200
@@ -1,3 +1,17 @@ 2007-09-12 Christan Thalinger <twisti@
+2007-09-12 Christan Thalinger <twisti at complang.tuwien.ac.at>
+
+ * Makefile.am: Added WITH_CACAO stuff.
+ * Makefile.in: Regenerated.
+ * acinclude.m4 (AC_CHECK_WITH_CACAO): New function.
+ * configure.ac (AC_CHECK_WITH_CACAO): Added.
+ * configure: Regenerated.
+ * patches/icedtea-cacao-Compiler-gcc-gmk.patch,
+ patches/icedtea-cacao-Defs-linux-gmk.patch,
+ patches/icedtea-cacao-Platform-gmk.patch,
+ patches/icedtea-cacao-Program-gmk.patch,
+ patches/icedtea-cacao-java-c.patch,
+ patches/icedtea-cacao-jvm-cfg.patch: New file.
+
2007-09-12 Christan Thalinger <twisti at complang.tuwien.ac.at>
* README.cacao: New file.
diff -r 3ce5b4fff04b -r 8b0be2eafb18 Makefile.am
--- a/Makefile.am Wed Sep 12 16:44:45 2007 -0400
+++ b/Makefile.am Wed Sep 12 23:13:50 2007 +0200
@@ -93,6 +93,12 @@ ICEDTEA_ENV_ECJ = \
"LD_LIBRARY_PATH=" \
"FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)"
+if WITH_CACAO
+ICEDTEA_ENV_ECJ += \
+ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO)" \
+ "ALT_JDK_IMPORT_PATH=$(CACAO)"
+endif
+
env-ecj:
@echo 'unset JAVA_HOME'
@echo 'export $(ICEDTEA_ENV_ECJ)'
@@ -174,6 +180,17 @@ ICEDTEA_PATCHES = \
patches/icedtea-demos.patch \
$(FAST_BUILD_PATCH)
+if WITH_CACAO
+ICEDTEA_PATCHES += \
+ patches/icedtea-cacao-Compiler-gcc-gmk.patch \
+ patches/icedtea-cacao-Defs-linux-gmk.patch \
+ patches/icedtea-cacao-Platform-gmk.patch \
+ patches/icedtea-cacao-Program-gmk.patch \
+ patches/icedtea-cacao-instrument-Makefile.patch \
+ patches/icedtea-cacao-java-c.patch \
+ patches/icedtea-cacao-jvm-cfg.patch
+endif
+
stamps/patch.stamp: stamps/extract.stamp
for p in $(ICEDTEA_PATCHES) ; \
do \
@@ -345,7 +362,7 @@ icedtea: stamps/tools.stamp stamps/plugs
stamps/patch.stamp gcjwebplugin.so
$(MAKE) \
$(ICEDTEA_ENV) \
- -C openjdk/control/make
+ -C openjdk/control/make j2se_only
cp -af gcjwebplugin.so \
openjdk/control/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
cp -af gcjwebplugin.so \
@@ -358,7 +375,7 @@ icedtea-debug: stamps/bootstrap-director
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/control/make \
- debug_build
+ j2se_fastdebug_only
cp -af gcjwebplugin.so \
openjdk/control/build/$(LINUX_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
cp -af gcjwebplugin.so \
@@ -382,7 +399,7 @@ stamps/icedtea-ecj.stamp: stamps/tools.s
stamps/extract-ecj.stamp stamps/patch-ecj.stamp
$(MAKE) \
$(ICEDTEA_ENV_ECJ) \
- -C openjdk-ecj/control/make
+ -C openjdk-ecj/control/make j2se_only
@echo "ecj-poured IcedTea is served:" \
openjdk-ecj/control/build/$(LINUX_DIR)
mkdir -p stamps
@@ -531,7 +548,7 @@ bootstrap/ecj/lib/tools.jar: stamps/tool
mkdir -p bootstrap/ecj/lib
$(JAR) cf $@ -C lib/tools com -C lib/tools sun \
-C lib/tools org
-
+
# rt-closed.jar class files.
rt-source-files.txt: stamps/extract.stamp stamps/copy-source-files.stamp
find rt -name '*.java' | sort > $@
diff -r 3ce5b4fff04b -r 8b0be2eafb18 Makefile.in
--- a/Makefile.in Wed Sep 12 16:44:45 2007 -0400
+++ b/Makefile.in Wed Sep 12 23:13:50 2007 +0200
@@ -31,6 +31,19 @@ POST_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+ at WITH_CACAO_TRUE@am__append_1 = \
+ at WITH_CACAO_TRUE@ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO)" \
+ at WITH_CACAO_TRUE@ "ALT_JDK_IMPORT_PATH=$(CACAO)"
+
+ at WITH_CACAO_TRUE@am__append_2 = \
+ at WITH_CACAO_TRUE@ patches/icedtea-cacao-Compiler-gcc-gmk.patch \
+ at WITH_CACAO_TRUE@ patches/icedtea-cacao-Defs-linux-gmk.patch \
+ at WITH_CACAO_TRUE@ patches/icedtea-cacao-Platform-gmk.patch \
+ at WITH_CACAO_TRUE@ patches/icedtea-cacao-Program-gmk.patch \
+ at WITH_CACAO_TRUE@ patches/icedtea-cacao-instrument-Makefile.patch \
+ at WITH_CACAO_TRUE@ patches/icedtea-cacao-java-c.patch \
+ at WITH_CACAO_TRUE@ patches/icedtea-cacao-jvm-cfg.patch
+
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/javac.in $(srcdir)/javap.in \
@@ -66,6 +79,7 @@ AUTOMAKE = @AUTOMAKE@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BUILD_ARCH_DIR = @BUILD_ARCH_DIR@
+CACAO = @CACAO@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -237,28 +251,22 @@ ICEDTEA_CLS_DIR_ECJ = \
ICEDTEA_CLS_DIR_ECJ = \
$(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
-ICEDTEA_ENV_ECJ = \
- "BUILD_NUMBER=b19" \
- "LANG=C" \
+ICEDTEA_ENV_ECJ = "BUILD_NUMBER=b19" "LANG=C" \
"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
"ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \
"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
- "BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \
- "LIBGCJ_JAR=$(LIBGCJ_JAR)" \
- "ICEDTEA_JCE=$(ICEDTEA_JCE_ECJ)" \
- "ICEDTEA_RT=$(ICEDTEA_RT)" \
+ "BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "LIBGCJ_JAR=$(LIBGCJ_JAR)" \
+ "ICEDTEA_JCE=$(ICEDTEA_JCE_ECJ)" "ICEDTEA_RT=$(ICEDTEA_RT)" \
"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR_ECJ)" \
"ICEDTEA_CLS_DIR=$(ICEDTEA_CLS_DIR_ECJ)" \
"ICEDTEA_ENDORSED_DIR=$(ICEDTEA_ENDORSED_DIR)" \
"ENDORSED=-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
"BOOTCLASSPATH_CLS_RT=-bootclasspath \
- $(ICEDTEA_CLS_DIR_ECJ):$(ICEDTEA_RT)" \
+ $(ICEDTEA_CLS_DIR_ECJ):$(ICEDTEA_RT)" \
"BOOTCLASSPATH_CLS=-bootclasspath $(ICEDTEA_CLS_DIR_ECJ)" \
- "BOOTCLASSPATH_RT_LIBGCJ=-bootclasspath $(ICEDTEA_RT):$(LIBGCJ_JAR)" \
- "CLASSPATH=" \
- "LD_LIBRARY_PATH=" \
- "FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)"
-
+ "BOOTCLASSPATH_RT_LIBGCJ=-bootclasspath \
+ $(ICEDTEA_RT):$(LIBGCJ_JAR)" "CLASSPATH=" "LD_LIBRARY_PATH=" \
+ "FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)" $(am__append_1)
# OpenJDK Source Preparation Targets
# ==================================
@@ -272,27 +280,20 @@ OPENJDK_SRC_ZIP_BASE = openjdk-7-ea-src-
# Patch OpenJDK sources for plug replacements.
@FAST_BUILD_TRUE at FAST_BUILD_PATCH = patches/icedtea-speed.patch
-ICEDTEA_PATCHES = \
- patches/icedtea-copy-plugs.patch \
+ICEDTEA_PATCHES = patches/icedtea-copy-plugs.patch \
patches/icedtea-version.patch \
patches/icedtea-text-relocations.patch \
- patches/icedtea-graphics.patch \
- patches/icedtea-antialias.patch \
- patches/icedtea-paths.patch \
- patches/icedtea-debuginfo.patch \
- patches/icedtea-java.security.patch \
- patches/icedtea-ssl.patch \
+ patches/icedtea-graphics.patch patches/icedtea-antialias.patch \
+ patches/icedtea-paths.patch patches/icedtea-debuginfo.patch \
+ patches/icedtea-java.security.patch patches/icedtea-ssl.patch \
patches/icedtea-assembler_amd64.patch \
patches/icedtea-license-headers.patch \
- patches/icedtea-libpng.patch \
- patches/icedtea-plugin.patch \
+ patches/icedtea-libpng.patch patches/icedtea-plugin.patch \
patches/icedtea-rmi_amd64.patch \
patches/icedtea-lesstif_amd64.patch \
- patches/icedtea-tools.patch \
- patches/icedtea-certbundle.patch \
- patches/icedtea-demos.patch \
- $(FAST_BUILD_PATCH)
-
+ patches/icedtea-tools.patch patches/icedtea-certbundle.patch \
+ patches/icedtea-demos.patch $(FAST_BUILD_PATCH) \
+ $(am__append_2)
# Patch OpenJDK for plug replacements and ecj.
ICEDTEA_ECJ_PATCH = patches/icedtea-ecj-bootstrap.patch
@@ -831,7 +832,7 @@ icedtea: stamps/tools.stamp stamps/plugs
stamps/patch.stamp gcjwebplugin.so
$(MAKE) \
$(ICEDTEA_ENV) \
- -C openjdk/control/make
+ -C openjdk/control/make j2se_only
cp -af gcjwebplugin.so \
openjdk/control/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
cp -af gcjwebplugin.so \
@@ -844,7 +845,7 @@ icedtea-debug: stamps/bootstrap-director
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/control/make \
- debug_build
+ j2se_fastdebug_only
cp -af gcjwebplugin.so \
openjdk/control/build/$(LINUX_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
cp -af gcjwebplugin.so \
@@ -868,7 +869,7 @@ stamps/icedtea-ecj.stamp: stamps/tools.s
stamps/extract-ecj.stamp stamps/patch-ecj.stamp
$(MAKE) \
$(ICEDTEA_ENV_ECJ) \
- -C openjdk-ecj/control/make
+ -C openjdk-ecj/control/make j2se_only
@echo "ecj-poured IcedTea is served:" \
openjdk-ecj/control/build/$(LINUX_DIR)
mkdir -p stamps
diff -r 3ce5b4fff04b -r 8b0be2eafb18 acinclude.m4
--- a/acinclude.m4 Wed Sep 12 16:44:45 2007 -0400
+++ b/acinclude.m4 Wed Sep 12 23:13:50 2007 +0200
@@ -528,3 +528,31 @@ AC_DEFUN([FIND_TOOL],
fi
AC_SUBST([$1])
])
+
+
+AC_DEFUN([AC_CHECK_WITH_CACAO],
+[
+ AC_MSG_CHECKING(whether to use CACAO as VM)
+ AC_ARG_WITH([cacao],
+ [AS_HELP_STRING(--with-cacao,use CACAO as VM)],
+ [
+ case "${withval}" in
+ yes)
+ CACAO=/usr/local/cacao
+ ;;
+ no)
+ CACAO=no
+ ;;
+ *)
+ CACAO=${withval}
+ ;;
+ esac
+ ],
+ [
+ CACAO=no
+ ])
+
+ AC_MSG_RESULT(${CACAO})
+ AM_CONDITIONAL(WITH_CACAO, test x"${CACAO}" != "xno")
+ AC_SUBST(CACAO)
+])
diff -r 3ce5b4fff04b -r 8b0be2eafb18 configure
--- a/configure Wed Sep 12 16:44:45 2007 -0400
+++ b/configure Wed Sep 12 23:13:50 2007 +0200
@@ -734,6 +734,9 @@ OPENJDK_SRC_DIR
OPENJDK_SRC_DIR
GNU_CLASSLIB_FOUND_TRUE
GNU_CLASSLIB_FOUND_FALSE
+WITH_CACAO_TRUE
+WITH_CACAO_FALSE
+CACAO
FAST_BUILD_TRUE
FAST_BUILD_FALSE
CPP
@@ -1372,6 +1375,7 @@ Optional Packages:
--with-xerces2-jar specify location of the xerces2 jar
--with-openjdk-src-zip specify the location of the openjdk source zip
--with-openjdk-src-dir specify the location of the openjdk sources
+ --with-cacao use CACAO as VM
Some influential environment variables:
CC C compiler command
@@ -6854,6 +6858,44 @@ fi
+ { echo "$as_me:$LINENO: checking whether to use CACAO as VM" >&5
+echo $ECHO_N "checking whether to use CACAO as VM... $ECHO_C" >&6; }
+
+# Check whether --with-cacao was given.
+if test "${with_cacao+set}" = set; then
+ withval=$with_cacao;
+ case "${withval}" in
+ yes)
+ CACAO=/usr/local/cacao
+ ;;
+ no)
+ CACAO=no
+ ;;
+ *)
+ CACAO=${withval}
+ ;;
+ esac
+
+else
+
+ CACAO=no
+
+fi
+
+
+ { echo "$as_me:$LINENO: result: ${CACAO}" >&5
+echo "${ECHO_T}${CACAO}" >&6; }
+ if test x"${CACAO}" != "xno"; then
+ WITH_CACAO_TRUE=
+ WITH_CACAO_FALSE='#'
+else
+ WITH_CACAO_TRUE='#'
+ WITH_CACAO_FALSE=
+fi
+
+
+
+
# Check whether --enable-fast-build was given.
if test "${enable_fast_build+set}" = set; then
enableval=$enable_fast_build;
@@ -9551,6 +9593,13 @@ if test -z "${GNU_CLASSLIB_FOUND_TRUE}"
{ { echo "$as_me:$LINENO: error: conditional \"GNU_CLASSLIB_FOUND\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
echo "$as_me: error: conditional \"GNU_CLASSLIB_FOUND\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${WITH_CACAO_TRUE}" && test -z "${WITH_CACAO_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_CACAO\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_CACAO\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -10245,6 +10294,9 @@ OPENJDK_SRC_DIR!$OPENJDK_SRC_DIR$ac_deli
OPENJDK_SRC_DIR!$OPENJDK_SRC_DIR$ac_delim
GNU_CLASSLIB_FOUND_TRUE!$GNU_CLASSLIB_FOUND_TRUE$ac_delim
GNU_CLASSLIB_FOUND_FALSE!$GNU_CLASSLIB_FOUND_FALSE$ac_delim
+WITH_CACAO_TRUE!$WITH_CACAO_TRUE$ac_delim
+WITH_CACAO_FALSE!$WITH_CACAO_FALSE$ac_delim
+CACAO!$CACAO$ac_delim
FAST_BUILD_TRUE!$FAST_BUILD_TRUE$ac_delim
FAST_BUILD_FALSE!$FAST_BUILD_FALSE$ac_delim
CPP!$CPP$ac_delim
@@ -10261,7 +10313,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 39; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -r 3ce5b4fff04b -r 8b0be2eafb18 configure.ac
--- a/configure.ac Wed Sep 12 16:44:45 2007 -0400
+++ b/configure.ac Wed Sep 12 23:13:50 2007 +0200
@@ -82,6 +82,7 @@ FIND_FREETYPE
FIND_FREETYPE
WITH_OPENJDK_SRC_ZIP
WITH_OPENJDK_SRC_DIR
+AC_CHECK_WITH_CACAO
ENABLE_FAST_BUILD
CHECK_HEADERS
diff -r 3ce5b4fff04b -r 8b0be2eafb18 patches/icedtea-cacao-Compiler-gcc-gmk.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-cacao-Compiler-gcc-gmk.patch Wed Sep 12 23:13:50 2007 +0200
@@ -0,0 +1,46 @@
+Index: j2se/make/common/shared/Compiler-gcc.gmk
+===================================================================
+--- j2se/make/common/shared/Compiler-gcc.gmk (revision 250)
++++ openjdk/j2se/make/common/shared/Compiler-gcc.gmk (working copy)
+@@ -75,22 +75,36 @@ ifeq ($(PLATFORM), linux)
+ REQUIRED_CC_VER = 4.0
+ REQUIRED_GCC_VER = 4.0.*
+ else
+- ifeq ($(ARCH_DATA_MODEL), 32)
+- # i586
++ ifeq ($(ARCH), alpha)
++ # alpha
+ REQUIRED_CC_VER = 3.2
+- REQUIRED_GCC_VER = 3.2.1*
+- REQUIRED_GCC_VER_INT = 3.2.1-7a
+- else
++ REQUIRED_GCC_VER = 3.2
++ endif
+ ifeq ($(ARCH), amd64)
+ # amd64
+ REQUIRED_CC_VER = 3.2
+ REQUIRED_GCC_VER = 3.2.*
+ endif
++ ifeq ($(ARCH), i586)
++ # i586
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 3.2.1*
++ REQUIRED_GCC_VER_INT = 3.2.1-7a
++ endif
+ ifeq ($(ARCH), ia64)
+ # ia64
+ REQUIRED_CC_VER = 3.2
+ REQUIRED_GCC_VER = 2.9[56789].*
+ endif
++ ifeq ($(ARCH), ppc)
++ # ppc
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 3.2
++ endif
++ ifeq ($(ARCH), ppc64)
++ # ppc64
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 3.2
+ endif
+ endif
+ # Option used to create a shared library
diff -r 3ce5b4fff04b -r 8b0be2eafb18 patches/icedtea-cacao-Defs-linux-gmk.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-cacao-Defs-linux-gmk.patch Wed Sep 12 23:13:50 2007 +0200
@@ -0,0 +1,13 @@
+Index: j2se/make/common/Defs-linux.gmk
+===================================================================
+--- j2se/make/common/Defs-linux.gmk (revision 250)
++++ openjdk/j2se/make/common/Defs-linux.gmk (working copy)
+@@ -215,7 +215,7 @@ endif
+
+ EXTRA_LIBS += -lc
+
+-LDFLAGS_DEFS_OPTION = -z defs
++LDFLAGS_DEFS_OPTION = -Xlinker -z -Xlinker defs
+ LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION)
+
+ #
diff -r 3ce5b4fff04b -r 8b0be2eafb18 patches/icedtea-cacao-Platform-gmk.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-cacao-Platform-gmk.patch Wed Sep 12 23:13:50 2007 +0200
@@ -0,0 +1,32 @@
+Index: j2se/make/common/shared/Platform.gmk
+===================================================================
+--- j2se/make/common/shared/Platform.gmk (revision 250)
++++ openjdk/j2se/make/common/shared/Platform.gmk (working copy)
+@@ -225,11 +225,25 @@ ifeq ($(SYSTEM_UNAME), Linux)
+ ARCH=sparcv9
+ endif
+ else
+- # i586 is 32-bit, amd64 is 64-bit
+ ifndef ARCH_DATA_MODEL
++ ifeq ($(ARCH), alpha)
++ # alpha is 64-bit
++ ARCH_DATA_MODEL=64
++ endif
++ ifeq ($(ARCH), amd64)
++ # amd64 is 64-bit
++ ARCH_DATA_MODEL=64
++ endif
+ ifeq ($(ARCH), i586)
++ # i586 is 32-bit
+ ARCH_DATA_MODEL=32
+- else
++ endif
++ ifeq ($(ARCH), ppc)
++ # ppc is 32-bit
++ ARCH_DATA_MODEL=32
++ endif
++ ifeq ($(ARCH), ppc64)
++ # ppc64 is 64-bit
+ ARCH_DATA_MODEL=64
+ endif
+ endif
diff -r 3ce5b4fff04b -r 8b0be2eafb18 patches/icedtea-cacao-Program-gmk.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-cacao-Program-gmk.patch Wed Sep 12 23:13:50 2007 +0200
@@ -0,0 +1,13 @@
+Index: j2se/make/common/Program.gmk
+===================================================================
+--- j2se/make/common/Program.gmk (revision 250)
++++ openjdk/j2se/make/common/Program.gmk (working copy)
+@@ -85,7 +85,7 @@ ifneq (,$(findstring $(PLATFORM), linux
+ endif
+ endif
+ ifeq ($(PLATFORM), linux)
+- LDFLAGS += -z origin
++ LDFLAGS += -Xlinker -z -Xlinker origin
+ LDFLAGS += -Wl,--allow-shlib-undefined
+ LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli
+ LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli
diff -r 3ce5b4fff04b -r 8b0be2eafb18 patches/icedtea-cacao-java-c.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-cacao-java-c.patch Wed Sep 12 23:13:50 2007 +0200
@@ -0,0 +1,14 @@
+Index: j2se/src/share/bin/java.c
+===================================================================
+--- j2se/src/share/bin/java.c (revision 250)
++++ openjdk/j2se/src/share/bin/java.c (working copy)
+@@ -367,7 +367,8 @@ main(int argc, char ** argv)
+ args.classname = classname;
+ args.ifn = ifn;
+
+- return ContinueInNewThread(JavaMain, threadStackSize, (void*)&args, ret);
++/* return ContinueInNewThread(JavaMain, threadStackSize, (void*)&args, ret); */
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic