/hg/icedtea: 6 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jun 1 08:13:26 PDT 2010
changeset 898c5cdf9448 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=898c5cdf9448
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Jun 01 15:43:47 2010 +0100
Make jtreg depend on completed stage 2, not just icedtea.stamp
2010-03-01 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (stamps/jtreg.stamp): Depend on
stamps/icedtea-stage2.stamp
changeset 104a9313e4d8 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=104a9313e4d8
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Jun 01 15:47:49 2010 +0100
Use rt.jar for CACAO builds rather than the contents of lib/rt.
2010-03-01 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (stamps/cacao.stamp): Depend on
rt.stamp and use updated rt.jar to build against rather
than the contents of lib/rt, so that --with-openjdk builds
work.
changeset 3c79ac98c366 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3c79ac98c366
author: Xerxes R?nby <xerxes at zafena.se>
date: Thu Mar 04 13:34:40 2010 +0100
Fix Shark sharkCompiler mattr memory corruption bug.
2010-03-04 Xerxes R?nby <xerxes at zafena.se>
* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
(sharkCompiler::sharkCompiler): Move mattr define to make its memory
valid in the scope where it are used by the args vector.
changeset bb1c7e372811 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=bb1c7e372811
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Jun 01 15:56:25 2010 +0100
PR441: Fix hotspot target on --disable-bootstrapping.
2010-03-04 Andrew John Hughes <ahughes at redhat.com>
PR 441:
* Makefile.am: Don't unset ICEDTEA_BUILD_TARGET if unused.
(hotspot): Support the configuration where BOOTSTRAPPING is
not set. Pass ICEDTEA_BUILD_TARGET=hotspot to make rather
than having an additional hotspot-helper target. Don't
remove bootstrap-directory-symlink-ecj.stamp as this just
forces the bootstrap classes to be rebuilt. (hotspot-
helper): Removed.
changeset ee7e745aa094 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ee7e745aa094
author: Matthias Klose <doko at ubuntu.com>
date: Tue Jun 01 16:04:53 2010 +0100
Support DISTRIBUTION_BOOT_PATCHES extension to ICEDTEA_BOOT_PATCHES.
2010-03-08 Matthias Klose <doko at ubuntu.com>
* Makefile.am: (ICEDTEA_BOOT_PATCHES): Add
DISTRIBUTION_BOOT_PATCHES.
changeset d9f8a98810eb in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d9f8a98810eb
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Jun 01 16:12:06 2010 +0100
Generalise ZERO_ARCHFLAG to ARCHFLAG and use in PulseAudio native
build.
2010-03-08 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (IT_CFLAGS): General CFLAGS for all
IcedTea C builds, which includes ARCHFLAG.
(ICEDTEA_ENV): Set ZERO_ARCHFLAG from ARCHFLAG. (stamps
/native-ecj.stamp): Use IT_CFLAGS.
($(PULSE_JAVA_NATIVE_BUILDDIR)/%.o): Use IT_CFLAGS.
* acinclude.m4: (IT_SET_ARCH_SETTINGS): Renamed from
SET_ARCH_DIRS. Use host_cpu rather than host. Add sections
for sparc and s390x. Set ARCHFLAG to m64 for x86_64,
sparc64, powerpc64 and s390x, m31 for s390 and m32 for i?86,
powerpc and sparc. (ENABLE_ZERO_BUILD): Remove setting of
ZERO_ARCHFLAG, generalised to ARCHFLAG.
* configure.ac: Call renamed IT_SET_ARCH_SETTINGS.
diffstat:
5 files changed, 114 insertions(+), 44 deletions(-)
ChangeLog | 54 ++++++++++++++++++
Makefile.am | 40 ++++++++-----
acinclude.m4 | 60 +++++++++++---------
configure.ac | 2
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | 2
diffs (333 lines):
diff -r efb52113d74b -r d9f8a98810eb ChangeLog
--- a/ChangeLog Tue Jun 01 15:35:38 2010 +0100
+++ b/ChangeLog Tue Jun 01 16:12:06 2010 +0100
@@ -1,3 +1,57 @@ 2010-06-01 Andrew John Hughes <ahughes@
+2010-03-08 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (IT_CFLAGS): General CFLAGS for all IcedTea
+ C builds, which includes ARCHFLAG.
+ (ICEDTEA_ENV): Set ZERO_ARCHFLAG from ARCHFLAG.
+ (stamps/native-ecj.stamp): Use IT_CFLAGS.
+ ($(PULSE_JAVA_NATIVE_BUILDDIR)/%.o): Use IT_CFLAGS.
+ * acinclude.m4:
+ (IT_SET_ARCH_SETTINGS): Renamed from SET_ARCH_DIRS.
+ Use host_cpu rather than host. Add sections for
+ sparc and s390x. Set ARCHFLAG to m64 for x86_64,
+ sparc64, powerpc64 and s390x, m31 for s390 and m32
+ for i?86, powerpc and sparc.
+ (ENABLE_ZERO_BUILD): Remove setting of ZERO_ARCHFLAG,
+ generalised to ARCHFLAG.
+ * configure.ac: Call renamed IT_SET_ARCH_SETTINGS.
+
+2010-03-08 Matthias Klose <doko at ubuntu.com>
+
+ * Makefile.am:
+ (ICEDTEA_BOOT_PATCHES): Add DISTRIBUTION_BOOT_PATCHES.
+
+2010-03-04 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Don't unset ICEDTEA_BUILD_TARGET if unused.
+ (hotspot): Support the configuration where BOOTSTRAPPING
+ is not set. Pass ICEDTEA_BUILD_TARGET=hotspot to make rather
+ than having an additional hotspot-helper target.
+ Don't remove bootstrap-directory-symlink-ecj.stamp
+ as this just forces the bootstrap classes to be rebuilt.
+ (hotspot-helper): Removed.
+
+2010-03-04 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+ (sharkCompiler::sharkCompiler): Move mattr define to make its memory
+ valid in the scope where it are used by the args vector.
+
+2010-03-01 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (stamps/cacao.stamp): Depend on rt.stamp
+ and use updated rt.jar to build against rather
+ than the contents of lib/rt, so that --with-openjdk
+ builds work.
+
+2010-03-01 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (stamps/jtreg.stamp): Depend on
+ stamps/icedtea-stage2.stamp
+
2010-06-01 Andrew John Hughes <ahughes at redhat.com>
* patches/icedtea-jaxws-getdtdtype.patch:
diff -r efb52113d74b -r d9f8a98810eb Makefile.am
--- a/Makefile.am Tue Jun 01 15:35:38 2010 +0100
+++ b/Makefile.am Tue Jun 01 16:12:06 2010 +0100
@@ -145,6 +145,9 @@ IT_JAVAC_SETTINGS=-g -encoding utf-8 $(J
IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE)
IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
+# Flags
+IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
+
# Conditional defintions
if USE_HG
@@ -230,7 +233,6 @@ if WITH_CACAO
ICEDTEA_BUILD_TARGET=jdk_only
ICEDTEA_DEBUG_BUILD_TARGET=jdk_fastdebug_only
else
- ICEDTEA_BUILD_TARGET=
ICEDTEA_DEBUG_BUILD_TARGET=debug_build
endif
@@ -442,6 +444,8 @@ ICEDTEA_BOOT_PATCHES += patches/boot/ecj
ICEDTEA_BOOT_PATCHES += patches/boot/ecj-diamond.patch
endif
+ICEDTEA_BOOT_PATCHES += $(DISTRIBUTION_BOOT_PATCHES)
+
# Patches for JAXWS
JAXWS_PATCHES = patches/boot/jaxws-getdtdtype.patch
@@ -493,7 +497,7 @@ ICEDTEA_ENV = \
ARCH_DATA_MODEL="$(ZERO_BITSPERWORD)" \
ZERO_ENDIANNESS="$(ZERO_ENDIANNESS)" \
ZERO_ARCHDEF="$(ZERO_ARCHDEF)" \
- ZERO_ARCHFLAG="$(ZERO_ARCHFLAG)" \
+ ZERO_ARCHFLAG="$(ARCHFLAG)" \
LIBFFI_CFLAGS="$(LIBFFI_CFLAGS)" \
LIBFFI_LIBS="$(LIBFFI_LIBS)" \
LLVM_CFLAGS="$(LLVM_CFLAGS)" \
@@ -1688,7 +1692,7 @@ stamps/native-ecj.stamp:
stamps/native-ecj.stamp:
mkdir -p stamps
if BUILD_NATIVE_ECJ
- ${GCJ} ${CFLAGS} -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
+ ${GCJ} $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
--main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR}
endif
touch $@
@@ -1997,21 +2001,25 @@ stamps/icedtea-boot.stamp: stamps/bootst
touch $@
hotspot:
- rm -f stamps/bootstrap-directory-symlink-stage1.stamp
+if BOOTSTRAPPING
rm -f stamps/icedtea-boot.stamp
rm -f stamps/icedtea-stage1.stamp
- $(ARCH_PREFIX) $(MAKE) hotspot-helper
+ $(ARCH_PREFIX) $(MAKE) ICEDTEA_BUILD_TARGET=hotspot icedtea-stage1
mkdir -p \
$(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
cp $(BOOT_BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \
$(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
- @echo "Hotspot is served:" $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image
-
-hotspot-helper: stamps/bootstrap-directory-symlink-stage1.stamp \
- stamps/plugs.stamp stamps/ports.stamp stamps/patch-boot.stamp
- $(ARCH_PREFIX) $(MAKE) \
- $(ICEDTEA_ENV_BOOT) \
- -C openjdk-boot hotspot
+ @echo "HotSpot is served:" $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image
+else
+ rm -f stamps/icedtea.stamp
+ rm -f stamps/icedtea-stage2.stamp
+ $(ARCH_PREFIX) $(MAKE) ICEDTEA_BUILD_TARGET=hotspot icedtea-stage2
+ mkdir -p \
+ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
+ cp $(BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \
+ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
+ @echo "HotSpot is served:" $(BUILD_OUTPUT_DIR)/j2sdk-image
+endif
clean-icedtea-boot:
if [ -e $(abs_top_builddir)/openjdk-boot ]; then \
@@ -2247,7 +2255,7 @@ stamps/pulse-java-headers.stamp: stamps/
touch $@
$(PULSE_JAVA_NATIVE_BUILDDIR)/%.o: $(PULSE_JAVA_NATIVE_SRCDIR)/%.c stamps/pulse-java-headers.stamp
- $(CC) $(CFLAGS) -fPIC -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include \
+ $(CC) $(IT_CFLAGS) -fPIC -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include \
-I$(PULSE_JAVA_NATIVE_BUILDDIR) -o $@ -c $<
$(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so: $(PULSE_JAVA_NATIVE_OBJECTS)
@@ -2375,7 +2383,7 @@ clean-visualvm:
# CACAO
-stamps/cacao.stamp: stamps/rt-class-files.stamp
+stamps/cacao.stamp: stamps/rt.stamp
if BUILD_CACAO
if !USE_SYSTEM_CACAO
cd cacao/cacao && \
@@ -2386,7 +2394,7 @@ if !USE_SYSTEM_CACAO
--prefix=$(abs_top_builddir)/cacao/install \
--with-java-runtime-library=openjdk \
--with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
- --with-java-runtime-library-classes=$(abs_top_builddir)/lib/rt \
+ --with-java-runtime-library-classes=$(ICEDTEA_RT) \
--enable-jre-layout $(CACAO_CONFIGURE_ARGS); \
$(ARCH_PREFIX) $(MAKE) -j$(PARALLEL_JOBS) install
ln -s server $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/client
@@ -2574,7 +2582,7 @@ stamps/plugin-tests.stamp: $(PLUGIN_TEST
# jtreg
-stamps/jtreg.stamp: stamps/icedtea.stamp
+stamps/jtreg.stamp: stamps/icedtea-stage2.stamp
rm -rf test/jtreg/classes
mkdir -p test/jtreg/classes
$(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d test/jtreg/classes \
diff -r efb52113d74b -r d9f8a98810eb acinclude.m4
--- a/acinclude.m4 Tue Jun 01 15:35:38 2010 +0100
+++ b/acinclude.m4 Tue Jun 01 16:12:06 2010 +0100
@@ -1,59 +1,79 @@
- AC_DEFUN([SET_ARCH_DIRS],
+ AC_DEFUN([IT_SET_ARCH_SETTINGS],
[
- case "${host}" in
- x86_64-*-*)
+ case "${host_cpu}" in
+ x86_64)
BUILD_ARCH_DIR=amd64
INSTALL_ARCH_DIR=amd64
JRE_ARCH_DIR=amd64
+ ARCHFLAG="-m64"
;;
- i?86-*-*)
+ i?86)
BUILD_ARCH_DIR=i586
INSTALL_ARCH_DIR=i386
JRE_ARCH_DIR=i386
ARCH_PREFIX=${LINUX32}
+ ARCHFLAG="-m32"
;;
- alpha*-*-*)
+ alpha*)
BUILD_ARCH_DIR=alpha
INSTALL_ARCH_DIR=alpha
JRE_ARCH_DIR=alpha
;;
- arm*-*-*)
+ arm*)
BUILD_ARCH_DIR=arm
INSTALL_ARCH_DIR=arm
JRE_ARCH_DIR=arm
;;
- mips-*-*)
+ mips)
BUILD_ARCH_DIR=mips
INSTALL_ARCH_DIR=mips
JRE_ARCH_DIR=mips
;;
- mipsel-*-*)
+ mipsel)
BUILD_ARCH_DIR=mipsel
INSTALL_ARCH_DIR=mipsel
JRE_ARCH_DIR=mipsel
;;
- powerpc-*-*)
+ powerpc)
BUILD_ARCH_DIR=ppc
INSTALL_ARCH_DIR=ppc
JRE_ARCH_DIR=ppc
ARCH_PREFIX=${LINUX32}
- ;;
- powerpc64-*-*)
+ ARCHFLAG="-m32"
+ ;;
+ powerpc64)
BUILD_ARCH_DIR=ppc64
INSTALL_ARCH_DIR=ppc64
JRE_ARCH_DIR=ppc64
+ ARCHFLAG="-m64"
;;
- sparc64-*-*)
+ sparc)
+ BUILD_ARCH_DIR=sparc
+ INSTALL_ARCH_DIR=sparc
+ JRE_ARCH_DIR=sparc
+ CROSS_TARGET_ARCH=sparc
+ ARCH_PREFIX=${LINUX32}
+ ARCHFLAG="-m32"
+ ;;
+ sparc64)
BUILD_ARCH_DIR=sparcv9
INSTALL_ARCH_DIR=sparcv9
JRE_ARCH_DIR=sparc64
+ ARCHFLAG="-m64"
;;
- s390-*-*)
+ s390)
BUILD_ARCH_DIR=s390
INSTALL_ARCH_DIR=s390
JRE_ARCH_DIR=s390
ARCH_PREFIX=${LINUX32}
+ ARCHFLAG="-m31"
;;
+ s390x)
+ BUILD_ARCH_DIR=s390x
+ INSTALL_ARCH_DIR=s390x
+ JRE_ARCH_DIR=s390x
+ CROSS_TARGET_ARCH=s390x
+ ARCHFLAG="-m64"
*)
BUILD_ARCH_DIR=`uname -m`
INSTALL_ARCH_DIR=$BUILD_ARCH_DIR
@@ -64,6 +84,7 @@
AC_SUBST(INSTALL_ARCH_DIR)
AC_SUBST(JRE_ARCH_DIR)
AC_SUBST(ARCH_PREFIX)
+ AC_SUBST(ARCHFLAG)
])
AC_DEFUN([SET_OS_DIRS],
@@ -750,23 +771,10 @@ AC_DEFUN([ENABLE_ZERO_BUILD],
*)
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([jvm.cfg])
AC_CONFIG_FILES([ergo.c])
])
diff -r efb52113d74b -r d9f8a98810eb configure.ac
--- a/configure.ac Tue Jun 01 15:35:38 2010 +0100
+++ b/configure.ac Tue Jun 01 16:12:06 2010 +0100
@@ -135,7 +135,7 @@ IT_GET_PKGVERSION
IT_GET_PKGVERSION
IT_GET_LSB_DATA
-SET_ARCH_DIRS
+IT_SET_ARCH_SETTINGS
SET_OS_DIRS
IT_CHECK_NUMBER_OF_PARALLEL_JOBS
diff -r efb52113d74b -r d9f8a98810eb ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Tue Jun 01 15:35:38 2010 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Tue Jun 01 16:12:06 2010 +0100
@@ -71,8 +71,8 @@ SharkCompiler::SharkCompiler()
args.push_back(""); // program name
args.push_back(cpu.c_str());
+ std::string mattr("-mattr=");
if(gotCpuFeatures){
- std::string mattr("-mattr=");
for(StringMap<bool>::iterator I = Features.begin(),
E = Features.end(); I != E; ++I){
if(I->second){
More information about the distro-pkg-dev
mailing list