/hg/icedtea6: 2009-12-08 Gary Benson <gbenson at redhat.com>
gbenson at icedtea.classpath.org
gbenson at icedtea.classpath.org
Tue Dec 8 01:37:45 PST 2009
changeset e7ca0bef8351 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e7ca0bef8351
author: Gary Benson <gbenson at redhat.com>
date: Tue Dec 08 09:42:47 2009 +0000
2009-12-08 Gary Benson <gbenson at redhat.com>
* Makefile.am (ICEDTEA_CORE_BUILD): Removed.
(ICEDTEA_ZERO_BUILD): Set to "yes" instead of "true".
(ICEDTEA_ENV): Removed ICEDTEA_CORE_BUILD, replaced
ICEDTEA_ZERO_BUILD with ZERO_BUILD, and replaced ZERO_BITSPERWORD
with ARCH_DATA_MODEL. (ICEDTEA_ENV_ECJ): Likewise.
(stamps/ports.stamp): Updated paths, and don't make jvm.cfg or
ergo_$arch.c for Zero. (ICEDTEA_PATCHES): Added new patches
and removed old ones.
* acinclude.m4 (ENABLE_ZERO_BUILD): Removed old
CORE_BUILD stuff. (SET_CORE_OR_SHARK_BUILD): Replaced
with... (SET_SHARK_BUILD): New macro.
* configure.ac: Use SET_SHARK_BUILD before ENABLE_ZERO_BUILD
in place of SET_CORE_OR_SHARK_BUILD after it.
* patches/zero/6890308.patch: New file.
* patches/zero/6891677.patch: Likewise.
* patches/icedtea-core-build.patch: Removed.
* patches/icedtea-core-build-hotspot.patch: Likewise.
* patches/icedtea-linker-options.patch: Likewise.
* patches/icedtea-signature-iterator.patch: Likewise.
* patches/icedtea-static-libstdc++.patch: Likewise.
* patches/icedtea-zero.patch: Likewise.
* patches/icedtea-zero-build.patch: Likewise.
* patches/icedtea-zero-build-hotspot.patch: Likewise.
* patches/ecj/icedtea-hotspot.patch: Updated.
* patches/icedtea-shark-build.patch: Likewise.
* patches/icedtea-shark-build-hotspot.patch: Likewise.
* patches/icedtea-arch.patch: Fixed up.
* patches/icedtea-libraries.patch: Likewise.
* patches/icedtea-shark.patch: Likewise.
* ports/hotspot/build/linux/makefiles/shark.make: Moved
to...
* ports/hotspot/make/linux/makefiles/shark.make: New file.
* ports/hotspot/build/linux/makefiles/zero.make: Moved to...
* ports/hotspot/make/linux/makefiles/zeroshark.make: New file.
* ports/hotspot/make/linux/makefiles/zero.make: New file.
* ports/hotspot/src/share/vm/includeDB_zero: Likewise.
* ports/hotspot/make/linux/platform_zero.in: Removed.
* ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp: Sync
with upstream.
* ports/hotspot/src/cpu/zero/vm/frame_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/globals_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/stack_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S: Fixed
up.
diffstat:
34 files changed, 1711 insertions(+), 1261 deletions(-)
ChangeLog | 60 +
Makefile.am | 36
acinclude.m4 | 132 +--
configure.ac | 2
generated/sun/misc/Version.java | 4
patches/ecj/icedtea-hotspot.patch | 16
patches/icedtea-arch.patch | 10
patches/icedtea-core-build-hotspot.patch | 108 --
patches/icedtea-core-build.patch | 46 -
patches/icedtea-libraries.patch | 4
patches/icedtea-linker-options.patch | 48 -
patches/icedtea-shark-build-hotspot.patch | 207 +++--
patches/icedtea-shark-build.patch | 49 -
patches/icedtea-shark.patch | 20
patches/icedtea-signature-iterator.patch | 44 -
patches/icedtea-static-libstdc++.patch | 16
patches/icedtea-zero-build-hotspot.patch | 129 ---
patches/icedtea-zero-build.patch | 205 -----
patches/icedtea-zero.patch | 229 -----
patches/zero/6890308.patch | 760 +++++++++++++++++++
patches/zero/6891677.patch | 418 ++++++++++
platform_zero.in | 17
ports/hotspot/build/linux/makefiles/shark.make | 32
ports/hotspot/build/linux/makefiles/zero.make | 74 -
ports/hotspot/make/linux/makefiles/shark.make | 32
ports/hotspot/make/linux/makefiles/zero.make | 32
ports/hotspot/make/linux/makefiles/zeroshark.make | 76 +
ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp | 5
ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 93 +-
ports/hotspot/src/cpu/zero/vm/frame_zero.cpp | 4
ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp | 5
ports/hotspot/src/cpu/zero/vm/globals_zero.hpp | 2
ports/hotspot/src/cpu/zero/vm/stack_zero.hpp | 2
ports/hotspot/src/share/vm/includeDB_zero | 55 +
diffs (truncated from 3535 to 500 lines):
diff -r c18ada9920f7 -r e7ca0bef8351 ChangeLog
--- a/ChangeLog Mon Dec 07 11:11:29 2009 -0500
+++ b/ChangeLog Tue Dec 08 09:42:47 2009 +0000
@@ -1,3 +1,63 @@ 2009-12-07 Gary Benson <gbenson at redhat
+2009-12-08 Gary Benson <gbenson at redhat.com>
+
+ * Makefile.am
+ (ICEDTEA_CORE_BUILD): Removed.
+ (ICEDTEA_ZERO_BUILD): Set to "yes" instead of "true".
+ (ICEDTEA_ENV): Removed ICEDTEA_CORE_BUILD, replaced
+ ICEDTEA_ZERO_BUILD with ZERO_BUILD, and replaced ZERO_BITSPERWORD
+ with ARCH_DATA_MODEL.
+ (ICEDTEA_ENV_ECJ): Likewise.
+ (stamps/ports.stamp): Updated paths, and don't make jvm.cfg or
+ ergo_$arch.c for Zero.
+ (ICEDTEA_PATCHES): Added new patches and removed old ones.
+
+ * acinclude.m4
+ (ENABLE_ZERO_BUILD): Removed old CORE_BUILD stuff.
+ (SET_CORE_OR_SHARK_BUILD): Replaced with...
+ (SET_SHARK_BUILD): New macro.
+
+ * configure.ac: Use SET_SHARK_BUILD before ENABLE_ZERO_BUILD in
+ place of SET_CORE_OR_SHARK_BUILD after it.
+
+ * patches/zero/6890308.patch: New file.
+ * patches/zero/6891677.patch: Likewise.
+
+ * patches/icedtea-core-build.patch: Removed.
+ * patches/icedtea-core-build-hotspot.patch: Likewise.
+ * patches/icedtea-linker-options.patch: Likewise.
+ * patches/icedtea-signature-iterator.patch: Likewise.
+ * patches/icedtea-static-libstdc++.patch: Likewise.
+ * patches/icedtea-zero.patch: Likewise.
+ * patches/icedtea-zero-build.patch: Likewise.
+ * patches/icedtea-zero-build-hotspot.patch: Likewise.
+
+ * patches/ecj/icedtea-hotspot.patch: Updated.
+ * patches/icedtea-shark-build.patch: Likewise.
+ * patches/icedtea-shark-build-hotspot.patch: Likewise.
+
+ * patches/icedtea-arch.patch: Fixed up.
+ * patches/icedtea-libraries.patch: Likewise.
+ * patches/icedtea-shark.patch: Likewise.
+
+ * ports/hotspot/build/linux/makefiles/shark.make: Moved to...
+ * ports/hotspot/make/linux/makefiles/shark.make: New file.
+
+ * ports/hotspot/build/linux/makefiles/zero.make: Moved to...
+ * ports/hotspot/make/linux/makefiles/zeroshark.make: New file.
+
+ * ports/hotspot/make/linux/makefiles/zero.make: New file.
+ * ports/hotspot/src/share/vm/includeDB_zero: Likewise.
+
+ * ports/hotspot/make/linux/platform_zero.in: Removed.
+
+ * ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp: Sync with upstream.
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/globals_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/stack_zero.hpp: Likewise.
+
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S: Fixed up.
+
2009-12-07 Gary Benson <gbenson at redhat.com>
PR icedtea/416:
diff -r c18ada9920f7 -r e7ca0bef8351 Makefile.am
--- a/Makefile.am Mon Dec 07 11:11:29 2009 -0500
+++ b/Makefile.am Tue Dec 08 09:42:47 2009 +0000
@@ -145,13 +145,8 @@ ICEDTEA_ENDORSED_DIR = \
$(ICEDTEA_BOOT_DIR)/lib/endorsed
JDK_UPDATE_VERSION = 0
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
-if CORE_BUILD
- ICEDTEA_CORE_BUILD = yes
-else
- ICEDTEA_CORE_BUILD =
-endif
if ZERO_BUILD
- ICEDTEA_ZERO_BUILD = yes
+ ICEDTEA_ZERO_BUILD = true
else
ICEDTEA_ZERO_BUILD =
endif
@@ -180,11 +175,10 @@ ICEDTEA_ENV = \
ENDORSED="-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
CLASSPATH="" \
LD_LIBRARY_PATH="" \
- ICEDTEA_CORE_BUILD="$(ICEDTEA_CORE_BUILD)" \
- ICEDTEA_ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
+ ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
ICEDTEA_SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \
ZERO_LIBARCH="$(ZERO_LIBARCH)" \
- ZERO_BITSPERWORD="$(ZERO_BITSPERWORD)" \
+ ARCH_DATA_MODEL="$(ZERO_BITSPERWORD)" \
ZERO_ENDIANNESS="$(ZERO_ENDIANNESS)" \
ZERO_ARCHDEF="$(ZERO_ARCHDEF)" \
ZERO_ARCHFLAG="$(ZERO_ARCHFLAG)" \
@@ -265,11 +259,10 @@ ICEDTEA_ENV_ECJ = \
CLASSPATH="" \
LD_LIBRARY_PATH="" \
GENSRCDIR="$(abs_top_builddir)/generated" \
- ICEDTEA_CORE_BUILD="$(ICEDTEA_CORE_BUILD)" \
- ICEDTEA_ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
+ ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
ICEDTEA_SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \
ZERO_LIBARCH="$(ZERO_LIBARCH)" \
- ZERO_BITSPERWORD="$(ZERO_BITSPERWORD)" \
+ ARCH_DATA_MODEL="$(ZERO_BITSPERWORD)" \
ZERO_ENDIANNESS="$(ZERO_ENDIANNESS)" \
ZERO_ARCHDEF="$(ZERO_ARCHDEF)" \
ZERO_ARCHFLAG="$(ZERO_ARCHFLAG)" \
@@ -491,21 +484,20 @@ endif
# Copy ports sources into tree
stamps/ports.stamp: stamps/replace-hotspot.stamp
- for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+ for target in $(abs_top_srcdir)/ports/hotspot/make/*/platform_zero.in \
+ $(abs_top_srcdir)/ports/hotspot/make/*/makefiles/* \
$(abs_top_srcdir)/ports/hotspot/tools \
$(abs_top_srcdir)/ports/hotspot/src/*cpu/* \
$(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \
link=$$(dirname $$target | sed 's/^.*ports/openjdk/'|sed "s#hotspot/build#hotspot/$(HOTSPOT_MAKE_DIR)#"); \
cp -rv $$target $$link; \
done
- ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/$(HOTSPOT_MAKE_DIR)/linux
- if ! test "x$(ICEDTEA_CORE_BUILD)$(ICEDTEA_SHARK_BUILD)$(WITH_CACAO)" \
- = "xno" ; then \
+ if ! test "x$(WITH_CACAO)" = "xno" ; then \
mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR) ; \
ln -sf $(abs_top_builddir)/jvm.cfg \
openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg ; \
fi
- if ! test "x$(ICEDTEA_ZERO_BUILD)$(WITH_CACAO)" = "xno"; then \
+ if ! test "x$(WITH_CACAO)" = "xno"; then \
ln -sf $(abs_top_builddir)/ergo.c \
openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
fi
@@ -515,10 +507,10 @@ ICEDTEA_FSG_PATCHES =
ICEDTEA_FSG_PATCHES =
ICEDTEA_PATCHES = \
+ patches/zero/6890308.patch \
+ patches/zero/6891677.patch \
patches/icedtea-notice-safepoints.patch \
- patches/icedtea-signature-iterator.patch \
patches/icedtea-test-atomic-operations.patch \
- patches/icedtea-zero.patch \
patches/icedtea-ia64-bugfix.patch \
patches/icedtea-parisc-opt.patch \
patches/icedtea-lucene-crash.patch \
@@ -544,15 +536,9 @@ ICEDTEA_PATCHES = \
patches/icedtea-sunsrc.patch \
patches/icedtea-libraries.patch \
patches/icedtea-javafiles.patch \
- patches/icedtea-core-build.patch \
patches/icedtea-jvmtiEnv.patch \
patches/icedtea-lcms.patch \
- patches/icedtea-core-build-hotspot.patch \
- patches/icedtea-linker-options.patch \
- patches/icedtea-static-libstdc++.patch \
patches/icedtea-timerqueue.patch \
- patches/icedtea-zero-build.patch \
- patches/icedtea-zero-build-hotspot.patch \
patches/icedtea-print-lsb-release.patch \
patches/icedtea-jpegclasses.patch \
patches/icedtea-uname.patch \
diff -r c18ada9920f7 -r e7ca0bef8351 acinclude.m4
--- a/acinclude.m4 Mon Dec 07 11:11:29 2009 -0500
+++ b/acinclude.m4 Tue Dec 08 09:42:47 2009 +0000
@@ -691,82 +691,78 @@ AC_DEFUN([ENABLE_ZERO_BUILD],
esac
],
[
- case "${host}" in
- i?86-*-*) ;;
- sparc*-*-*) ;;
- x86_64-*-*) ;;
- *)
- if test "x${WITH_CACAO}" != xno; then
- use_zero=no
- else
- use_zero=yes
- fi
- ;;
- esac
+ if test "x${use_shark}" = "xyes"; then
+ use_zero=yes;
+ else
+ case "${host}" in
+ i?86-*-*) ;;
+ sparc*-*-*) ;;
+ x86_64-*-*) ;;
+ *)
+ if test "x${WITH_CACAO}" != xno; then
+ use_zero=no
+ else
+ use_zero=yes
+ fi
+ ;;
+ esac
+ fi
])
AC_MSG_RESULT($use_zero)
AM_CONDITIONAL(ZERO_BUILD, test "x${use_zero}" = xyes)
- ZERO_LIBARCH=
- ZERO_BITSPERWORD=
- ZERO_ENDIANNESS=
- ZERO_ARCHDEF=
- ZERO_ARCHFLAG=
- if test "x${use_zero}" = xyes; then
- ZERO_LIBARCH="${INSTALL_ARCH_DIR}"
- dnl can't use AC_CHECK_SIZEOF on multilib
- case "${ZERO_LIBARCH}" in
- i386|ppc|s390|sparc)
- ZERO_BITSPERWORD=32
- ;;
- amd64|ppc64|s390x|sparc64)
- ZERO_BITSPERWORD=64
- ;;
- *)
- AC_CHECK_SIZEOF(void *)
- ZERO_BITSPERWORD=`expr "${ac_cv_sizeof_void_p}" "*" 8`
- esac
- AC_C_BIGENDIAN([ZERO_ENDIANNESS="big"], [ZERO_ENDIANNESS="little"])
- case "${ZERO_LIBARCH}" in
- i386)
- ZERO_ARCHDEF="IA32"
- ;;
- ppc*)
- ZERO_ARCHDEF="PPC"
- ;;
- s390*)
- ZERO_ARCHDEF="S390"
- ;;
- sparc*)
- ZERO_ARCHDEF="SPARC"
- ;;
- *)
- ZERO_ARCHDEF=`echo ${ZERO_LIBARCH} | tr a-z A-Z`
- esac
- dnl multilib machines need telling which mode to build for
- case "${ZERO_LIBARCH}" in
- i386|ppc|sparc)
- ZERO_ARCHFLAG="-m32"
- ;;
- s390)
- ZERO_ARCHFLAG="-m31"
- ;;
- amd64|ppc64|s390x|sparc64)
- ZERO_ARCHFLAG="-m64"
- ;;
- esac
- fi
+ ZERO_LIBARCH="${INSTALL_ARCH_DIR}"
+ dnl can't use AC_CHECK_SIZEOF on multilib
+ case "${ZERO_LIBARCH}" in
+ i386|ppc|s390|sparc)
+ ZERO_BITSPERWORD=32
+ ;;
+ amd64|ppc64|s390x|sparc64)
+ ZERO_BITSPERWORD=64
+ ;;
+ *)
+ AC_CHECK_SIZEOF(void *)
+ ZERO_BITSPERWORD=`expr "${ac_cv_sizeof_void_p}" "*" 8`
+ esac
+ AC_C_BIGENDIAN([ZERO_ENDIANNESS="big"], [ZERO_ENDIANNESS="little"])
+ case "${ZERO_LIBARCH}" in
+ i386)
+ ZERO_ARCHDEF="IA32"
+ ;;
+ ppc*)
+ ZERO_ARCHDEF="PPC"
+ ;;
+ s390*)
+ ZERO_ARCHDEF="S390"
+ ;;
+ sparc*)
+ ZERO_ARCHDEF="SPARC"
+ ;;
+ *)
+ ZERO_ARCHDEF=`echo ${ZERO_LIBARCH} | tr a-z A-Z`
+ esac
+ dnl multilib machines need telling which mode to build for
+ case "${ZERO_LIBARCH}" in
+ i386|ppc|sparc)
+ ZERO_ARCHFLAG="-m32"
+ ;;
+ s390)
+ ZERO_ARCHFLAG="-m31"
+ ;;
+ amd64|ppc64|s390x|sparc64)
+ ZERO_ARCHFLAG="-m64"
+ ;;
+ esac
AC_SUBST(ZERO_LIBARCH)
AC_SUBST(ZERO_BITSPERWORD)
AC_SUBST(ZERO_ENDIANNESS)
AC_SUBST(ZERO_ARCHDEF)
AC_SUBST(ZERO_ARCHFLAG)
- AC_CONFIG_FILES([platform_zero])
AC_CONFIG_FILES([jvm.cfg])
AC_CONFIG_FILES([ergo.c])
])
-AC_DEFUN([SET_CORE_OR_SHARK_BUILD],
+AC_DEFUN([SET_SHARK_BUILD],
[
AC_MSG_CHECKING(whether to use the Shark JIT)
shark_selected=no
@@ -781,20 +777,12 @@ AC_DEFUN([SET_CORE_OR_SHARK_BUILD],
esac
])
- use_core=no
use_shark=no
- if test "x${WITH_CACAO}" != "xno"; then
- use_core=yes
- elif test "x${use_zero}" = "xyes"; then
- if test "x${shark_selected}" = "xyes"; then
+ if test "x${shark_selected}" = "xyes"; then
use_shark=yes
- else
- use_core=yes
- fi
fi
AC_MSG_RESULT($use_shark)
- AM_CONDITIONAL(CORE_BUILD, test "x${use_core}" = xyes)
AM_CONDITIONAL(SHARK_BUILD, test "x${use_shark}" = xyes)
])
diff -r c18ada9920f7 -r e7ca0bef8351 configure.ac
--- a/configure.ac Mon Dec 07 11:11:29 2009 -0500
+++ b/configure.ac Tue Dec 08 09:42:47 2009 +0000
@@ -245,8 +245,8 @@ AC_CHECK_WITH_CACAO_SRC_ZIP
AC_CHECK_WITH_CACAO_SRC_ZIP
AC_CHECK_WITH_CACAO_SRC_DIR
ENABLE_OPTIMIZATIONS
+SET_SHARK_BUILD
ENABLE_ZERO_BUILD
-SET_CORE_OR_SHARK_BUILD
ENABLE_HG
AC_CHECK_WITH_HG_REVISION
diff -r c18ada9920f7 -r e7ca0bef8351 generated/sun/misc/Version.java
--- a/generated/sun/misc/Version.java Mon Dec 07 11:11:29 2009 -0500
+++ b/generated/sun/misc/Version.java Tue Dec 08 09:42:47 2009 +0000
@@ -39,10 +39,10 @@ public class Version {
"OpenJDK Runtime Environment";
private static final String java_runtime_version =
- "1.6.0_0-b16";
+ "1.6.0_0-b17";
private static final String jdk_derivative_name =
- "IcedTea6 1.5-r84a527d1a06c";
+ "IcedTea6 1.7pre-r046c77dadfb3";
private static final String distro_package_version =
"";
diff -r c18ada9920f7 -r e7ca0bef8351 patches/ecj/icedtea-hotspot.patch
--- a/patches/ecj/icedtea-hotspot.patch Mon Dec 07 11:11:29 2009 -0500
+++ b/patches/ecj/icedtea-hotspot.patch Tue Dec 08 09:42:47 2009 +0000
@@ -1,7 +1,7 @@ diff -Nru openjdk-ecj.orig/hotspot/make/
diff -Nru openjdk-ecj.orig/hotspot/make/linux/Makefile openjdk-ecj/hotspot/make/linux/Makefile
--- openjdk-ecj.orig/hotspot/make/linux/Makefile 2008-10-24 10:16:06.000000000 +0100
+++ openjdk-ecj/hotspot/make/linux/Makefile 2008-10-24 13:32:48.000000000 +0100
-@@ -263,28 +263,24 @@
+@@ -287,42 +287,36 @@
$(TARGETS_C2): $(SUBDIRS_C2)
cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
@@ -30,6 +30,20 @@ diff -Nru openjdk-ecj.orig/hotspot/make/
ifdef INSTALL
cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
endif
+
+ $(TARGETS_ZERO): $(SUBDIRS_ZERO)
+ cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+
+ $(TARGETS_SHARK): $(SUBDIRS_SHARK)
+ cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
diff -Nru openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make openjdk-ecj/hotspot/make/linux/makefiles/sa.make
--- openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make 2008-10-24 10:16:06.000000000 +0100
+++ openjdk-ecj/hotspot/make/linux/makefiles/sa.make 2008-10-24 13:32:48.000000000 +0100
diff -r c18ada9920f7 -r e7ca0bef8351 patches/icedtea-arch.patch
--- a/patches/icedtea-arch.patch Mon Dec 07 11:11:29 2009 -0500
+++ b/patches/icedtea-arch.patch Tue Dec 08 09:42:47 2009 +0000
@@ -90,10 +90,10 @@
CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
--- openjdk/jdk/make/common/shared/Compiler-gcc.gmk.orig 2008-10-15 17:04:19.000000000 +0200
+++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2008-10-15 17:11:28.000000000 +0200
-@@ -75,28 +75,56 @@
- REQUIRED_CC_VER = 3.2
- REQUIRED_GCC_VER = 3.2.*
- else
+@@ -70,28 +70,56 @@
+ else
+ CXX = $(COMPILER_PATH)g++$(GCC_SUFFIX)
+ endif
- ifneq ("$(findstring sparc,$(ARCH))", "")
- # sparc or sparcv9
- REQUIRED_CC_VER = 4.0
@@ -155,8 +155,8 @@
+ REQUIRED_CC_VER = 4.0
+ REQUIRED_GCC_VER = 4.0.*
endif
- endif
# Option used to create a shared library
+ SHARED_LIBRARY_FLAG = -shared -mimpure-text
--- openjdk/jdk/make/common/shared/Platform.gmk.orig 2008-10-15 17:04:19.000000000 +0200
+++ openjdk/jdk/make/common/shared/Platform.gmk 2008-10-15 17:13:49.000000000 +0200
@@ -237,9 +237,40 @@
diff -r c18ada9920f7 -r e7ca0bef8351 patches/icedtea-core-build-hotspot.patch
--- a/patches/icedtea-core-build-hotspot.patch Mon Dec 07 11:11:29 2009 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make
---- openjdk.orig/hotspot/make/linux/makefiles/defs.make 2008-05-27 22:28:29.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/defs.make 2008-06-22 03:10:05.000000000 +0100
-@@ -97,6 +97,7 @@
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
-+ifndef ICEDTEA_CORE_BUILD
- ifeq ($(ARCH_DATA_MODEL), 32)
- EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
-@@ -111,3 +112,4 @@
- EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
- endif
- endif
-+endif
-diff -Nru openjdk.orig/hotspot/make/Makefile openjdk/hotspot/make/Makefile
---- openjdk.orig/hotspot/make/Makefile 2008-05-27 22:28:29.000000000 +0100
-+++ openjdk/hotspot/make/Makefile 2008-06-22 03:10:05.000000000 +0100
-@@ -91,6 +91,15 @@
- all_debug: jvmg jvmg1 jvmgkernel docs export_debug
- all_optimized: optimized optimized1 optimizedkernel docs export_optimized
-
-+# Core (non-compiler) targets made available with this Makefile
-+CORE_VM_TARGETS=productcore fastdebugcore optimizedcore jvmgcore
-+
-+allcore: all_productcore all_fastdebugcore
-+all_productcore: productcore docs export_product
-+all_fastdebugcore: fastdebugcore docs export_fastdebug
-+all_debugcore: jvmgcore docs export_debug
-+all_optimizedcore: optimizedcore docs export_optimized
-+
- # Do everything
- world: all create_jdk
-
-@@ -113,6 +122,10 @@
- $(CD) $(GAMMADIR)/make; \
- $(MAKE) VM_TARGET=$@ generic_build2 $(ALT_OUT)
-
-+$(CORE_VM_TARGETS):
-+ $(CD) $(GAMMADIR)/make; \
-+ $(MAKE) VM_TARGET=$@ generic_buildcore $(ALT_OUT)
-+
- $(KERNEL_VM_TARGETS):
- $(CD) $(GAMMADIR)/make; \
- $(MAKE) VM_TARGET=$@ generic_buildkernel $(ALT_OUT)
-@@ -159,6 +172,12 @@
- $(MAKE_ARGS) $(VM_TARGET)
- endif
-
-+generic_buildcore:
-+ $(MKDIR) -p $(OUTPUTDIR)
-+ $(CD) $(OUTPUTDIR); \
-+ $(MAKE) -f $(ABS_OS_MAKEFILE) \
-+ $(MAKE_ARGS) $(VM_TARGET)
-+
- generic_buildkernel:
- $(MKDIR) -p $(OUTPUTDIR)
- ifeq ($(OSNAME),windows)
-@@ -205,13 +224,21 @@
- XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
- DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
- C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
-+ifdef ICEDTEA_CORE_BUILD
-+C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_core
-+else
- C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
-+endif
- KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
- C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
- C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
More information about the distro-pkg-dev
mailing list