changeset in /hg/icedtea6: 2008-03-17 Gary Benson <gbenson@red...

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

changeset in /hg/icedtea6: 2008-03-17 Gary Benson <gbenson@red...

Gary Benson
changeset 3748242d0fa1 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3748242d0fa1
description:
        2008-03-17  Gary Benson  <[hidden email]>

                * platform_zero.in: New file.
                * ports/hotspot/build/linux/makefiles/zero.make: Likewise.

                * acinclude.m4
                (SET_ARCH_DIRS): Added special case for arm.
                (ENABLE_ZERO_BUILD): Added new substitutions (ZERO_LIBARCH,
                ZERO_BITSPERWORD, ZERO_ENDIANNESS, ZERO_ARCHDEF and ZERO_ARCHFLAG)
                and new generated file (platform_zero).
                (SET_CORE_BUILD): Enable whenever zero is used.
                * Makefile.am
                (ZERO_PATCHES): New variable listing all zero patches.
                (EXTRA_DIST): Added ZERO_PATCHES.
                (ZERO_PATCHES_COND): New variable listing zero patches when used.
                (ICEDTEA_PATCHES): Grouped all zero patches into ZERO_PATCHES_COND,
                added icedtea-zero-build.patch and icedtea-static-libstdc++.patch,
                and removed icedtea-always-zero.patch.
                (stamps/ports.stamp, stamps/ports-ecj.stamp): Use platform_zero.
                (ICEDTEA_ENV, ICEDTEA_ENV_ECJ): Pass ZERO_* variables through.
                * Makefile.in, configure: Regenerated.

                * patches/icedtea-zero.patch: Split build system bits into...
                * patches/icedtea-zero-build.patch: New file.
                * patches/icedtea-hotspot7-ports.patch: Merged into icedtea-zero.patch.
                * patches/icedtea-ports.patch: Moved hotspot-specific bits into
                icedtea-zero.patch.
                * patches/icedtea-signature-iterator.patch: Rebased.
                * patches/icedtea-test-atomic-operations.patch: Likewise.
                * patches/icedtea-signed-types.patch: Likewise, and missing
                hunk reinstated.
                * patches/icedtea-text-relocations.patch: Base conditional
                on ZERO_LIBARCH rather than BUILDARCH.
                * patches/icedtea-always-zero.patch: Removed.

                * ports/hotspot/build/linux/makefiles/arm.make: Removed.
                * ports/hotspot/build/linux/makefiles/ia64.make: Likewise.
                * ports/hotspot/build/linux/makefiles/ppc.make: Likewise.
                * ports/hotspot/build/linux/makefiles/ppc64.make: Likewise.
                * ports/hotspot/build/linux/makefiles/s390.make: Likewise.
                * ports/hotspot/build/linux/makefiles/s390x.make: Likewise.
                * ports/hotspot/build/linux/platform_arm: Likewise.
                * ports/hotspot/build/linux/platform_ia64: Likewise.
                * ports/hotspot/build/linux/platform_ppc: Likewise.
                * ports/hotspot/build/linux/platform_ppc64: Likewise.
                * ports/hotspot/build/linux/platform_s390: Likewise.
                * ports/hotspot/build/linux/platform_s390x: Likewise.

                * .hgignore: Added platform_zero.

diffstat:

29 files changed, 1257 insertions(+), 950 deletions(-)
.hgignore                                      |    1
ChangeLog                                      |   50 +
Makefile.am                                    |   67 -
Makefile.in                                    |   80 +-
acinclude.m4                                   |   95 +-
configure                                      |  909 ++++++++++++++++++++----
patches/icedtea-always-zero.patch              |  127 ---
patches/icedtea-hotspot7-ports.patch           |   23
patches/icedtea-ports.patch                    |  222 -----
patches/icedtea-signature-iterator.patch       |   12
patches/icedtea-signed-types.patch             |   14
patches/icedtea-test-atomic-operations.patch   |    4
patches/icedtea-text-relocations.patch         |    2
patches/icedtea-zero-build.patch               |  132 +++
patches/icedtea-zero.patch                     |   96 +-
platform_zero.in                               |   17
ports/hotspot/build/linux/makefiles/arm.make   |   37
ports/hotspot/build/linux/makefiles/ia64.make  |   40 -
ports/hotspot/build/linux/makefiles/ppc.make   |   31
ports/hotspot/build/linux/makefiles/ppc64.make |   34
ports/hotspot/build/linux/makefiles/s390.make  |   34
ports/hotspot/build/linux/makefiles/s390x.make |   37
ports/hotspot/build/linux/makefiles/zero.make  |   41 +
ports/hotspot/build/linux/platform_arm         |   17
ports/hotspot/build/linux/platform_ia64        |   17
ports/hotspot/build/linux/platform_ppc         |   17
ports/hotspot/build/linux/platform_ppc64       |   17
ports/hotspot/build/linux/platform_s390        |   17
ports/hotspot/build/linux/platform_s390x       |   17

diffs (truncated from 2742 to 500 lines):

diff -r 1716fdaf57ee -r 3748242d0fa1 .hgignore
--- a/.hgignore Fri Mar 14 09:47:37 2008 -0400
+++ b/.hgignore Mon Mar 17 07:03:05 2008 -0400
@@ -19,6 +19,7 @@ rt-source-files.txt
 rt-source-files.txt
 hotspot-tools-source-files.txt
 tools-source-files.txt
+platform_zero
 rt/com/sun/jdi/AbsentInformationException.java
 rt/com/sun/jdi/Accessible.java
 rt/com/sun/jdi/ArrayReference.java
diff -r 1716fdaf57ee -r 3748242d0fa1 ChangeLog
--- a/ChangeLog Fri Mar 14 09:47:37 2008 -0400
+++ b/ChangeLog Mon Mar 17 07:03:05 2008 -0400
@@ -1,3 +1,53 @@ 2008-03-14  Lillian Angel  <langel@redha
+2008-03-17  Gary Benson  <[hidden email]>
+
+ * platform_zero.in: New file.
+ * ports/hotspot/build/linux/makefiles/zero.make: Likewise.
+
+ * acinclude.m4
+ (SET_ARCH_DIRS): Added special case for arm.
+ (ENABLE_ZERO_BUILD): Added new substitutions (ZERO_LIBARCH,
+ ZERO_BITSPERWORD, ZERO_ENDIANNESS, ZERO_ARCHDEF and ZERO_ARCHFLAG)
+ and new generated file (platform_zero).
+ (SET_CORE_BUILD): Enable whenever zero is used.
+ * Makefile.am
+ (ZERO_PATCHES): New variable listing all zero patches.
+ (EXTRA_DIST): Added ZERO_PATCHES.
+ (ZERO_PATCHES_COND): New variable listing zero patches when used.
+ (ICEDTEA_PATCHES): Grouped all zero patches into ZERO_PATCHES_COND,
+ added icedtea-zero-build.patch and icedtea-static-libstdc++.patch,
+ and removed icedtea-always-zero.patch.
+ (stamps/ports.stamp, stamps/ports-ecj.stamp): Use platform_zero.
+ (ICEDTEA_ENV, ICEDTEA_ENV_ECJ): Pass ZERO_* variables through.
+ * Makefile.in, configure: Regenerated.
+
+ * patches/icedtea-zero.patch: Split build system bits into...
+ * patches/icedtea-zero-build.patch: New file.
+ * patches/icedtea-hotspot7-ports.patch: Merged into icedtea-zero.patch.
+ * patches/icedtea-ports.patch: Moved hotspot-specific bits into
+ icedtea-zero.patch.
+ * patches/icedtea-signature-iterator.patch: Rebased.
+ * patches/icedtea-test-atomic-operations.patch: Likewise.
+ * patches/icedtea-signed-types.patch: Likewise, and missing
+ hunk reinstated.
+ * patches/icedtea-text-relocations.patch: Base conditional
+ on ZERO_LIBARCH rather than BUILDARCH.
+ * patches/icedtea-always-zero.patch: Removed.
+
+ * ports/hotspot/build/linux/makefiles/arm.make: Removed.
+ * ports/hotspot/build/linux/makefiles/ia64.make: Likewise.
+ * ports/hotspot/build/linux/makefiles/ppc.make: Likewise.
+ * ports/hotspot/build/linux/makefiles/ppc64.make: Likewise.
+ * ports/hotspot/build/linux/makefiles/s390.make: Likewise.
+ * ports/hotspot/build/linux/makefiles/s390x.make: Likewise.
+ * ports/hotspot/build/linux/platform_arm: Likewise.
+ * ports/hotspot/build/linux/platform_ia64: Likewise.
+ * ports/hotspot/build/linux/platform_ppc: Likewise.
+ * ports/hotspot/build/linux/platform_ppc64: Likewise.
+ * ports/hotspot/build/linux/platform_s390: Likewise.
+ * ports/hotspot/build/linux/platform_s390x: Likewise.
+
+ * .hgignore: Added platform_zero.
+
 2008-03-14  Lillian Angel  <[hidden email]>
 
  * .hgignore: Updated.
diff -r 1716fdaf57ee -r 3748242d0fa1 Makefile.am
--- a/Makefile.am Fri Mar 14 09:47:37 2008 -0400
+++ b/Makefile.am Mon Mar 17 07:03:05 2008 -0400
@@ -40,12 +40,7 @@ install:
 
 EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
  gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib ports \
- patches/icedtea-gcc-4.3.patch patches/icedtea-always-zero.patch extra \
- patches/icedtea-hotspot-6b06-7b24.patch \
-        patches/icedtea-hotspot7-build-fixes.patch \
-        patches/icedtea-hotspot7-ports.patch \
-        patches/icedtea-bytecodeInterpreter.patch \
-        patches/icedtea-bytecodeInterpreterWithChecks.patch
+ patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES)
 
 # The Binary plugs directory is called jdk1.7.0 for historical reasons. The
 # name is completely irrelevant; only contains the plugs to build IcedTea.
@@ -67,6 +62,11 @@ if CORE_BUILD
   ICEDTEA_CORE_BUILD = yes
 else
   ICEDTEA_CORE_BUILD =
+endif
+if ZERO_BUILD
+  ICEDTEA_ZERO_BUILD = yes
+else
+  ICEDTEA_ZERO_BUILD =
 endif
 ICEDTEA_ENV = \
  "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
@@ -87,6 +87,12 @@ ICEDTEA_ENV = \
  "CLASSPATH=" \
  "LD_LIBRARY_PATH=" \
  "ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
+ "ICEDTEA_ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
+ "ZERO_LIBARCH=$(ZERO_LIBARCH)" \
+ "ZERO_BITSPERWORD=$(ZERO_BITSPERWORD)" \
+ "ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
+ "ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
+ "ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
  "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
  "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
  "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
@@ -126,6 +132,12 @@ ICEDTEA_ENV_ECJ = \
  "LD_LIBRARY_PATH=" \
  "GENSRCDIR=$(abs_top_srcdir)/generated" \
  "ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
+ "ICEDTEA_ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
+ "ZERO_LIBARCH=$(ZERO_LIBARCH)" \
+ "ZERO_BITSPERWORD=$(ZERO_BITSPERWORD)" \
+ "ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
+ "ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
+ "ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
  "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
  "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
  "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
@@ -170,13 +182,13 @@ clean-download:
 
 # Link ports sources into tree
 stamps/ports.stamp: stamps/extract.stamp
- for target in ports/hotspot/build/*/platform_* \
-      ports/hotspot/build/*/makefiles/* \
+ for target in ports/hotspot/build/*/makefiles/* \
       ports/hotspot/src/*/* \
       ports/jdk/src/*/bin/*; do \
   link=$$(dirname $$target | sed 's/^ports/openjdk/'); \
   ln -sf $$PWD/$$target $$link; \
  done
+ ln -sf $$PWD/platform_zero openjdk/hotspot/build/linux
  mkdir -p stamps
  touch stamps/ports.stamp
 
@@ -187,13 +199,6 @@ else
   FAST_BUILD_PATCH =
 endif
 
-# If --enable-zero was passed then patch the build files
-if ZERO_BUILD
-  ZERO_BUILD_PATCH = patches/icedtea-always-zero.patch
-else
-  ZERO_BUILD_PATCH =
-endif
-
 # If new gcc is installed, apply 4.3 patch
 if GCC_OLD
   GCC_PATCH =
@@ -201,21 +206,26 @@ else
   GCC_PATCH = patches/icedtea-gcc-4.3.patch
 endif
 
-# If CORE_BUILD is set then we are building zero and need
+# If ZERO_BUILD is set then we are building zero and need
 # to patch up to OpenJDK 7 HotSpot for the C++ interpreter.
-if CORE_BUILD
-  HOTSPOT_7_PATCHES = \
+ZERO_PATCHES = \
  patches/icedtea-hotspot-6b06-7b24.patch \
  patches/icedtea-hotspot7-build-fixes.patch \
- patches/icedtea-hotspot7-ports.patch \
  patches/icedtea-bytecodeInterpreter.patch \
- patches/icedtea-bytecodeInterpreterWithChecks.patch
-else
-  HOTSPOT_7_PATCHES =
+ patches/icedtea-bytecodeInterpreterWithChecks.patch \
+ patches/icedtea-signature-iterator.patch \
+ patches/icedtea-signed-types.patch \
+ patches/icedtea-test-atomic-operations.patch \
+ patches/icedtea-zero.patch
+
+if ZERO_BUILD
+  ZERO_PATCHES_COND = $(ZERO_PATCHES)
+else
+  ZERO_PATCHES_COND =
 endif
 
 ICEDTEA_PATCHES = \
- $(HOTSPOT_7_PATCHES) \
+ $(ZERO_PATCHES_COND) \
  patches/icedtea-copy-plugs.patch \
  patches/icedtea-version.patch \
  patches/icedtea-text-relocations.patch \
@@ -241,22 +251,19 @@ ICEDTEA_PATCHES = \
  patches/icedtea-libraries.patch \
  patches/icedtea-javafiles.patch \
  patches/icedtea-corba.patch \
- patches/icedtea-signature-iterator.patch \
- patches/icedtea-signed-types.patch \
- patches/icedtea-test-atomic-operations.patch \
  patches/icedtea-core-build.patch \
  patches/icedtea-linker-options.patch \
  patches/icedtea-ports.patch \
+ patches/icedtea-static-libstdc++.patch \
  patches/icedtea-lcms-leak.patch \
  patches/icedtea-timerqueue.patch \
  patches/icedtea-lesstif-64.patch \
  patches/icedtea-generated.patch \
  patches/icedtea-lib64.patch \
- patches/icedtea-zero.patch \
+ patches/icedtea-zero-build.patch \
  patches/icedtea-print-lsb-release.patch \
  $(GCC_PATCH) \
  $(FAST_BUILD_PATCH) \
- $(ZERO_BUILD_PATCH) \
  $(DISTRIBUTION_PATCHES)
 
 stamps/extract.stamp: stamps/download.stamp
@@ -330,13 +337,13 @@ clean-extract-ecj:
 
 # Link ports sources into tree
 stamps/ports-ecj.stamp: stamps/extract-ecj.stamp
- for target in ports/hotspot/build/*/platform_* \
-      ports/hotspot/build/*/makefiles/* \
+ for target in ports/hotspot/build/*/makefiles/* \
       ports/hotspot/src/*/* \
       ports/jdk/src/*/bin/*; do \
   link=$$(dirname $$target | sed 's/^ports/openjdk-ecj/'); \
   ln -sf $$PWD/$$target $$link; \
  done
+ ln -sf $$PWD/platform_zero openjdk-ecj/hotspot/build/linux
  mkdir -p stamps
  touch stamps/ports-ecj.stamp
 
diff -r 1716fdaf57ee -r 3748242d0fa1 Makefile.in
--- a/Makefile.in Fri Mar 14 09:47:37 2008 -0400
+++ b/Makefile.in Mon Mar 17 07:03:05 2008 -0400
@@ -34,8 +34,9 @@ subdir = .
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
  $(srcdir)/Makefile.in $(srcdir)/javac.in $(srcdir)/javap.in \
- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
- config.guess config.sub install-sh missing
+ $(srcdir)/platform_zero.in $(top_srcdir)/configure AUTHORS \
+ COPYING ChangeLog INSTALL NEWS config.guess config.sub \
+ install-sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
  $(top_srcdir)/configure.ac
@@ -44,7 +45,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES = javac javap
+CONFIG_CLEAN_FILES = javac javap platform_zero
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -160,6 +161,11 @@ XTST_LIBS = @XTST_LIBS@
 XTST_LIBS = @XTST_LIBS@
 XT_CFLAGS = @XT_CFLAGS@
 XT_LIBS = @XT_LIBS@
+ZERO_ARCHDEF = @ZERO_ARCHDEF@
+ZERO_ARCHFLAG = @ZERO_ARCHFLAG@
+ZERO_BITSPERWORD = @ZERO_BITSPERWORD@
+ZERO_ENDIANNESS = @ZERO_ENDIANNESS@
+ZERO_LIBARCH = @ZERO_LIBARCH@
 ZIP = @ZIP@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -219,12 +225,7 @@ OPENJDK_VERSION = b06
 @NETX_PLUGIN_TRUE@NETX_PATCH = patches/icedtea-netx-plugin.patch
 EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
  gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib ports \
- patches/icedtea-gcc-4.3.patch patches/icedtea-always-zero.patch extra \
- patches/icedtea-hotspot-6b06-7b24.patch \
-        patches/icedtea-hotspot7-build-fixes.patch \
-        patches/icedtea-hotspot7-ports.patch \
-        patches/icedtea-bytecodeInterpreter.patch \
-        patches/icedtea-bytecodeInterpreterWithChecks.patch
+ patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES)
 
 
 # The Binary plugs directory is called jdk1.7.0 for historical reasons. The
@@ -250,6 +251,8 @@ ICEDTEA_ENDORSED_DIR = \
 
 @CORE_BUILD_FALSE@ICEDTEA_CORE_BUILD =
 @CORE_BUILD_TRUE@ICEDTEA_CORE_BUILD = yes
+@ZERO_BUILD_FALSE@ICEDTEA_ZERO_BUILD =
+@ZERO_BUILD_TRUE@ICEDTEA_ZERO_BUILD = yes
 ICEDTEA_ENV = \
  "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
  "ANT_HOME=$(SYSTEM_ANT_DIR)" \
@@ -269,6 +272,12 @@ ICEDTEA_ENV = \
  "CLASSPATH=" \
  "LD_LIBRARY_PATH=" \
  "ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
+ "ICEDTEA_ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
+ "ZERO_LIBARCH=$(ZERO_LIBARCH)" \
+ "ZERO_BITSPERWORD=$(ZERO_BITSPERWORD)" \
+ "ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
+ "ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
+ "ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
  "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
  "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
  "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
@@ -307,6 +316,12 @@ ICEDTEA_ENV_ECJ = \
  "LD_LIBRARY_PATH=" \
  "GENSRCDIR=$(abs_top_srcdir)/generated" \
  "ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
+ "ICEDTEA_ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
+ "ZERO_LIBARCH=$(ZERO_LIBARCH)" \
+ "ZERO_BITSPERWORD=$(ZERO_BITSPERWORD)" \
+ "ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
+ "ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
+ "ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
  "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
  "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
  "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
@@ -324,27 +339,27 @@ OPENJDK_URL = http://download.java.net/o
 
 # Patch OpenJDK sources for plug replacements.
 @FAST_BUILD_TRUE@FAST_BUILD_PATCH = patches/icedtea-speed.patch
-@ZERO_BUILD_FALSE@ZERO_BUILD_PATCH =
-
-# If --enable-zero was passed then patch the build files
-@ZERO_BUILD_TRUE@ZERO_BUILD_PATCH = patches/icedtea-always-zero.patch
 @GCC_OLD_FALSE@GCC_PATCH = patches/icedtea-gcc-4.3.patch
 
 # If new gcc is installed, apply 4.3 patch
 @GCC_OLD_TRUE@GCC_PATCH =
-@CORE_BUILD_FALSE@HOTSPOT_7_PATCHES =
-
-# If CORE_BUILD is set then we are building zero and need
+
+# If ZERO_BUILD is set then we are building zero and need
 # to patch up to OpenJDK 7 HotSpot for the C++ interpreter.
-@CORE_BUILD_TRUE@HOTSPOT_7_PATCHES = \
-@CORE_BUILD_TRUE@ patches/icedtea-hotspot-6b06-7b24.patch \
-@CORE_BUILD_TRUE@ patches/icedtea-hotspot7-build-fixes.patch \
-@CORE_BUILD_TRUE@ patches/icedtea-hotspot7-ports.patch \
-@CORE_BUILD_TRUE@ patches/icedtea-bytecodeInterpreter.patch \
-@CORE_BUILD_TRUE@ patches/icedtea-bytecodeInterpreterWithChecks.patch
-
+ZERO_PATCHES = \
+ patches/icedtea-hotspot-6b06-7b24.patch \
+ patches/icedtea-hotspot7-build-fixes.patch \
+ patches/icedtea-bytecodeInterpreter.patch \
+ patches/icedtea-bytecodeInterpreterWithChecks.patch \
+ patches/icedtea-signature-iterator.patch \
+ patches/icedtea-signed-types.patch \
+ patches/icedtea-test-atomic-operations.patch \
+ patches/icedtea-zero.patch
+
+@ZERO_BUILD_FALSE@ZERO_PATCHES_COND =
+@ZERO_BUILD_TRUE@ZERO_PATCHES_COND = $(ZERO_PATCHES)
 ICEDTEA_PATCHES = \
- $(HOTSPOT_7_PATCHES) \
+ $(ZERO_PATCHES_COND) \
  patches/icedtea-copy-plugs.patch \
  patches/icedtea-version.patch \
  patches/icedtea-text-relocations.patch \
@@ -370,22 +385,19 @@ ICEDTEA_PATCHES = \
  patches/icedtea-libraries.patch \
  patches/icedtea-javafiles.patch \
  patches/icedtea-corba.patch \
- patches/icedtea-signature-iterator.patch \
- patches/icedtea-signed-types.patch \
- patches/icedtea-test-atomic-operations.patch \
  patches/icedtea-core-build.patch \
  patches/icedtea-linker-options.patch \
  patches/icedtea-ports.patch \
+ patches/icedtea-static-libstdc++.patch \
  patches/icedtea-lcms-leak.patch \
  patches/icedtea-timerqueue.patch \
  patches/icedtea-lesstif-64.patch \
  patches/icedtea-generated.patch \
  patches/icedtea-lib64.patch \
- patches/icedtea-zero.patch \
+ patches/icedtea-zero-build.patch \
  patches/icedtea-print-lsb-release.patch \
  $(GCC_PATCH) \
  $(FAST_BUILD_PATCH) \
- $(ZERO_BUILD_PATCH) \
  $(DISTRIBUTION_PATCHES)
 
 
@@ -472,6 +484,8 @@ javac: $(top_builddir)/config.status $(s
 javac: $(top_builddir)/config.status $(srcdir)/javac.in
  cd $(top_builddir) && $(SHELL) ./config.status $@
 javap: $(top_builddir)/config.status $(srcdir)/javap.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+platform_zero: $(top_builddir)/config.status $(srcdir)/platform_zero.in
  cd $(top_builddir) && $(SHELL) ./config.status $@
 tags: TAGS
 TAGS:
@@ -764,13 +778,13 @@ clean-download:
 
 # Link ports sources into tree
 stamps/ports.stamp: stamps/extract.stamp
- for target in ports/hotspot/build/*/platform_* \
-      ports/hotspot/build/*/makefiles/* \
+ for target in ports/hotspot/build/*/makefiles/* \
       ports/hotspot/src/*/* \
       ports/jdk/src/*/bin/*; do \
   link=$$(dirname $$target | sed 's/^ports/openjdk/'); \
   ln -sf $$PWD/$$target $$link; \
  done
+ ln -sf $$PWD/platform_zero openjdk/hotspot/build/linux
  mkdir -p stamps
  touch stamps/ports.stamp
 
@@ -844,13 +858,13 @@ clean-extract-ecj:
 
 # Link ports sources into tree
 stamps/ports-ecj.stamp: stamps/extract-ecj.stamp
- for target in ports/hotspot/build/*/platform_* \
-      ports/hotspot/build/*/makefiles/* \
+ for target in ports/hotspot/build/*/makefiles/* \
       ports/hotspot/src/*/* \
       ports/jdk/src/*/bin/*; do \
   link=$$(dirname $$target | sed 's/^ports/openjdk-ecj/'); \
   ln -sf $$PWD/$$target $$link; \
  done
+ ln -sf $$PWD/platform_zero openjdk-ecj/hotspot/build/linux
  mkdir -p stamps
  touch stamps/ports-ecj.stamp
 
diff -r 1716fdaf57ee -r 3748242d0fa1 acinclude.m4
--- a/acinclude.m4 Fri Mar 14 09:47:37 2008 -0400
+++ b/acinclude.m4 Mon Mar 17 07:03:05 2008 -0400
@@ -8,6 +8,10 @@ AC_DEFUN([SET_ARCH_DIRS],
     i?86-*-*)
       BUILD_ARCH_DIR=i586
       INSTALL_ARCH_DIR=i386
+      ;;
+    arm*-*-*)
+      BUILD_ARCH_DIR=arm
+      INSTALL_ARCH_DIR=arm
       ;;
     *)
       BUILD_ARCH_DIR=`uname -m`
@@ -511,31 +515,82 @@ AC_DEFUN([FIND_TOOL],
 
 AC_DEFUN([ENABLE_ZERO_BUILD],
 [
+  AC_MSG_CHECKING(whether to use the zero-assembler port)
+  use_zero=no
   AC_ARG_ENABLE([zero],
-                [AS_HELP_STRING(--enable-zero,use zero-assembler port on non-zero platforms)],
-  [
-    AC_MSG_CHECKING(zero-assembler port)
-    AC_MSG_RESULT(will apply patches/icedtea-always-zero.patch)
-    AM_CONDITIONAL(ZERO_BUILD, test x = x)
-  ],
-  [
-    AM_CONDITIONAL(ZERO_BUILD, test x != x)
-  ])
+                [AS_HELP_STRING(--enable-zero,
+                               use zero-assembler port on non-zero platforms)],
+  [
+    use_zero=yes
+  ],
+  [
+    case "${host}" in
+      i?86-*-*) ;;
+      x86_64-*-*) ;;
+      *)
+        use_zero=yes
+    esac
+  ])
+  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)
+        ZERO_BITSPERWORD=32
+        ;;
+      amd64|ppc64|s390x)
+        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"
+        ;;
+      *)
Reply | Threaded
Open this post in threaded view
|

Re: changeset in /hg/icedtea6: 2008-03-17 Gary Benson...

Gary Benson
Hi all,

The changeset I just committed to icedtea6 is the hotspot part of the
universal build system I've been talking about lately.  It builds on
ppc and ppc64; it _should_ build on x86_64 (with --enable-zero), s390,
s390x and ia64, and anything else fairly regular (alpha? mips?); and
it might even build on arm.

Note that I haven't extended this universality into the class library
yet, mainly for fear of trampling over the cacao stuff, so there's
still a couple of bits of icedtea-ports.patch remaining.  If you do
want to try it on something new then it's fairly simple: create the
ergo file and jvm.cfg for your platform in ports/jdk/src/solaris/bin
(they are all just copies of each other) and patch the remaining
couple of files in icedtea-ports.patch.  I hope to fix this Soon.

Cheers,
Gary

--
http://gbenson.net/
Reply | Threaded
Open this post in threaded view
|

Re: changeset in /hg/icedtea6: 2008-03-17 Gary Benson...

Christian Thalinger
On Mon, 2008-03-17 at 11:34 +0000, Gary Benson wrote:
> Note that I haven't extended this universality into the class library
> yet, mainly for fear of trampling over the cacao stuff, so there's

I will merge the cacao branch today.  Maybe then it's easier to spot
problems.

- twisti