changeset in /hg/icedtea: Upgrade to b31.
gnu_andrew at member.fsf.org
gnu_andrew at member.fsf.org
Tue Jul 22 12:23:52 PDT 2008
changeset 9154a4bd413e in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9154a4bd413e
description:
Upgrade to b31.
2008-07-22 Andrew John Hughes <gnu_andrew at member.fsf.org>
* patches/icedtea-gcc-4.3.patch,
* patches/icedtea-sparc.patch: Removed.
* HACKING: Updated.
* Makefile.am: Move to b31, remove patches listed above
and fix escaping on hg clone line.
* acinclude.m4: Only set ALT_OPENJDK_SRC_ZIP when
needed.
* configure.ac: Don't bother with GCC_OLD.
* patches/icedtea-text-relocations.patch: Reapplied to b31.
* patches/icedtea-use-system-tzdata.patch: Make solution
work on g++ 4.3.
* patches/icedtea-zero-build.patch: Reapplied.
diffstat:
11 files changed, 167 insertions(+), 337 deletions(-)
ChangeLog | 15 +
HACKING | 4
Makefile.am | 19 --
acinclude.m4 | 2
configure.ac | 2
fsg.sh | 1
patches/icedtea-gcc-4.3.patch | 84 ---------
patches/icedtea-sparc.patch | 79 --------
patches/icedtea-text-relocations.patch | 20 --
patches/icedtea-use-system-tzdata.patch | 2
patches/icedtea-zero-build.patch | 276 +++++++++++++++----------------
diffs (truncated from 724 to 500 lines):
diff -r 818a37c3bff4 -r 9154a4bd413e ChangeLog
--- a/ChangeLog Mon Jul 21 20:30:09 2008 +0100
+++ b/ChangeLog Tue Jul 22 20:23:40 2008 +0100
@@ -1,3 +1,18 @@ 2008-07-21 Andrew John Hughes <gnu_and
+2008-07-22 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * patches/icedtea-gcc-4.3.patch,
+ * patches/icedtea-sparc.patch: Removed.
+ * HACKING: Updated.
+ * Makefile.am: Move to b31, remove patches listed above
+ and fix escaping on hg clone line.
+ * acinclude.m4: Only set ALT_OPENJDK_SRC_ZIP when
+ needed.
+ * configure.ac: Don't bother with GCC_OLD.
+ * patches/icedtea-text-relocations.patch: Reapplied to b31.
+ * patches/icedtea-use-system-tzdata.patch: Make solution
+ work on g++ 4.3.
+ * patches/icedtea-zero-build.patch: Reapplied.
+
2008-07-21 Andrew John Hughes <gnu_andrew at member.fsf.org>
* patches/icedtea-nomotif-6706121.patch,
diff -r 818a37c3bff4 -r 9154a4bd413e HACKING
--- a/HACKING Mon Jul 21 20:30:09 2008 +0100
+++ b/HACKING Tue Jul 22 20:23:40 2008 +0100
@@ -27,7 +27,6 @@ The following patches are currently appl
* icedtea-directaudio-close-trick.patch: Allow hardware sound device to be reopened.
* icedtea-float-double-trailing-zeros.patch: Remove trailing zeros from Double/Float (PR29/30)
* icedtea-fonts.patch: Add Fedora fontconfig.
-* icedtea-gcc-4.3.patch: Fix code to compile with GCC 4.3 and turn off -Werror.
* icedtea-gcc-suffix.patch: Append $(GCC_SUFFIX) to end of 'gcc' binary name.
* icedtea-generated.patch: Force use of /bin/bash.
* icedtea-gervill.patch: Add support for Gervill from the overlay.
@@ -48,7 +47,6 @@ The following patches are currently appl
* icedtea-rhino.patch: Add support for Javascript.
* icedtea-rmi_amd64.patch: Build RMI binaries on all platforms not just 32-bit ones.
* icedtea-security-updates.patch: OpenJDK security patches from Sun.
-* icedtea-sparc.patch: Add support for GNU/Linux on SPARC (version in IcedTea includes only minimal build changes).
* icedtea-sparc64-linux.patch: Fixes needed to build the SPARC port on 32-bit SPARC as used by Fedora.
* icedtea-sparc-ptracefix.patch: Avoid importing asm-sparc/ptrace.h by including pt_regs directly.
* icedtea-sparc-trapsfix.patch: Include traps.h from correct directory.
@@ -66,8 +64,10 @@ The following patches are currently appl
The following patches are only applied to OpenJDK6 in IcedTea6:
+* icedtea-gcc-4.3.patch: Fix code to compile with GCC 4.3 and turn off -Werror.
* icedtea-nomotif.patch: Remove sanity and GrabShell.h dependency on Motif/Lesstif library.
* icedtea-nomotif-6706121.patch: Remove Motif AWT peers (S6706121).
+* icedtea-sparc.patch: Add support for GNU/Linux on SPARC (version in IcedTea includes only minimal build changes).
The following patches are only applied to OpenJDK in IcedTea:
diff -r 818a37c3bff4 -r 9154a4bd413e Makefile.am
--- a/Makefile.am Mon Jul 21 20:30:09 2008 +0100
+++ b/Makefile.am Tue Jul 22 20:23:40 2008 +0100
@@ -1,6 +1,6 @@ OPENJDK_DATE = 03_jul_2008
-OPENJDK_DATE = 03_jul_2008
-OPENJDK_MD5SUM = 95c2f20163e496f98fc2d6767d7ca7e5
-OPENJDK_VERSION = b30
+OPENJDK_DATE = 17_jul_2008
+OPENJDK_MD5SUM = 42f251c593fdf0edfc59524f5eb7df12
+OPENJDK_VERSION = b31
CACAO_VERSION = 0.99.2
CACAO_MD5SUM = a2865f47535f6dc3def268c0055ff20a
@@ -287,7 +287,7 @@ if USE_HG
"http://selenic.com/mercurial/wiki/index.cgi/ForestExtension"; \
exit 1; \
fi; \
- hg fclone -r jdk7-$(OPENJDK_VERSION) $(OPENJDK_HG_URL) openjdk; \
+ hg fclone -r jdk7-$(OPENJDK_VERSION) $(OPENJDK_HG_URL) openjdk;
else
if ! echo "$(OPENJDK_MD5SUM) $(OPENJDK_SRC_ZIP)" \
| $(MD5SUM) --check ; \
@@ -351,13 +351,6 @@ stamps/ports.stamp: stamps/extract.stamp
fi
mkdir -p stamps
touch stamps/ports.stamp
-
-# If new gcc is installed, apply 4.3 patch
-if GCC_OLD
- GCC_PATCH =
-else
- GCC_PATCH = patches/icedtea-gcc-4.3.patch
-endif
# Patches from the other OpenJDK trees (should be removed
# when in an official bxx release)
@@ -432,7 +425,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-fonts.patch \
patches/icedtea-gervill.patch \
patches/icedtea-directaudio-close-trick.patch \
- patches/icedtea-sparc.patch \
patches/icedtea-sparc64-linux.patch \
patches/icedtea-sparc-ptracefix.patch \
patches/icedtea-sparc-trapsfix.patch \
@@ -446,8 +438,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-constructor-properties.patch \
patches/icedtea-jsoundhs.patch \
patches/icedtea-jdk-docs-target.patch \
- $(SHARK_PATCH) \
- $(GCC_PATCH)
+ $(SHARK_PATCH)
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r 818a37c3bff4 -r 9154a4bd413e acinclude.m4
--- a/acinclude.m4 Mon Jul 21 20:30:09 2008 +0100
+++ b/acinclude.m4 Tue Jul 22 20:23:40 2008 +0100
@@ -408,13 +408,13 @@ AC_DEFUN([WITH_OPENJDK_SRC_ZIP],
[
ALT_OPENJDK_SRC_ZIP=${withval}
AM_CONDITIONAL(USE_ALT_OPENJDK_SRC_ZIP, test x = x)
+ AC_SUBST(ALT_OPENJDK_SRC_ZIP)
],
[
ALT_OPENJDK_SRC_ZIP="not specified"
AM_CONDITIONAL(USE_ALT_OPENJDK_SRC_ZIP, test x != x)
])
AC_MSG_RESULT(${ALT_OPENJDK_SRC_ZIP})
- AC_SUBST(ALT_OPENJDK_SRC_ZIP)
])
AC_DEFUN([FIND_XALAN2_JAR],
diff -r 818a37c3bff4 -r 9154a4bd413e configure.ac
--- a/configure.ac Mon Jul 21 20:30:09 2008 +0100
+++ b/configure.ac Tue Jul 22 20:23:40 2008 +0100
@@ -177,7 +177,6 @@ then
AC_SUBST(JAR)
RMIC=${SYSTEM_OPENJDK_DIR}/bin/rmic
AC_SUBST(RMIC)
- AM_CONDITIONAL(GCC_OLD, test x != x)
else
if test "${with_icedtea}" == true
then
@@ -191,7 +190,6 @@ then
AC_SUBST(JAR)
RMIC=${SYSTEM_ICEDTEA_DIR}/bin/rmic
AC_SUBST(RMIC)
- AM_CONDITIONAL(GCC_OLD, test x != x)
else
FIND_JAVA
FIND_JAVAC
diff -r 818a37c3bff4 -r 9154a4bd413e fsg.sh
--- a/fsg.sh Mon Jul 21 20:30:09 2008 +0100
+++ b/fsg.sh Tue Jul 22 20:23:40 2008 +0100
@@ -26,7 +26,6 @@ rm -f \
openjdk/jdk/test/tools/launcher/lib/sparc/lib64/liblibrary.so
rm -f \
- openjdk/jdk/make/tools/winver/bin/winver.exe \
openjdk/jdk/test/java/util/Locale/data/deflocale.exe \
openjdk/jdk/test/java/util/Locale/data/deflocale.jds3 \
openjdk/jdk/test/java/util/Locale/data/deflocale.rhel4 \
diff -r 818a37c3bff4 -r 9154a4bd413e patches/icedtea-gcc-4.3.patch
--- a/patches/icedtea-gcc-4.3.patch Mon Jul 21 20:30:09 2008 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
---- openjdk/hotspot/src/share/vm/adlc/adlc.hpp.ark 2008-01-11 14:15:41.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/adlc/adlc.hpp 2008-01-11 14:16:14.000000000 +0000
-@@ -32,7 +32,7 @@
- // standard library constants
- #include "stdio.h"
- #include "stdlib.h"
--#if _MSC_VER >= 1300 // Visual C++ 7.0 or later
-+#if (defined(__GNUC__) && __GNUC__ >= 3) || (_MSC_VER >= 1300) // gcc 3.0 or later or Visual C++ 7.0 or later
- #include <iostream>
- #else
- #include <iostream.h>
---- openjdk/hotspot/src/share/vm/adlc/filebuff.cpp.ark 2008-01-11 14:17:17.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/adlc/filebuff.cpp 2008-01-11 14:17:34.000000000 +0000
-@@ -28,6 +28,8 @@
- // FILEBUFF.CPP - Routines for handling a parser file buffer
- #include "adlc.hpp"
-
-+using namespace std;
-+
- //------------------------------FileBuff---------------------------------------
- // Create a new parsing buffer
- FileBuff::FileBuff( BufferedFile *fptr, ArchDesc& archDesc) : _fp(fptr), _AD(archDesc) {
---- openjdk/hotspot/src/share/vm/adlc/filebuff.hpp.ark 2008-01-11 14:14:45.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/adlc/filebuff.hpp 2008-01-11 14:15:34.000000000 +0000
-@@ -27,7 +27,7 @@
-
- // FILEBUFF.HPP - Definitions for parser file buffering routines
-
--#if _MSC_VER >= 1300 // Visual C++ 7.0 or later
-+#if (defined(__GNUC__) && __GNUC__ >= 3) || (_MSC_VER >= 1300) // gcc 3.0 or later, or Visual C++ 7.0 or later
- #include <iostream>
- #else
- #include <iostream.h>
-@@ -99,8 +99,11 @@
- FileBuffRegion *copy(); // Deep copy
- FileBuffRegion *merge(FileBuffRegion*); // Merge 2 regions; delete input
-
--// void print(std::ostream&);
--// friend std::ostream& operator<< (std::ostream&, FileBuffRegion&);
-+#if defined(__GNUC__) && __GNUC__ >= 3
-+ void print(std::ostream&);
-+ friend std::ostream& operator<< (std::ostream&, FileBuffRegion&);
-+#else
- void print(ostream&);
- friend ostream& operator<< (ostream&, FileBuffRegion&);
-+#endif
- };
---- openjdk/hotspot/make/linux/makefiles/gcc.make.ark 2008-01-11 14:24:05.000000000 +0000
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2008-01-11 14:24:27.000000000 +0000
-@@ -94,7 +94,8 @@
- endif
-
- # Compiler warnings are treated as errors
--WARNINGS_ARE_ERRORS = -Werror
-+# Commented out for now because of gcc 4.3 warnings OpenJDK isn't ready for
-+#WARNINGS_ARE_ERRORS = -Werror
- # Except for a few acceptable ones
- ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
- CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
---- openjdk/hotspot/make/solaris/makefiles/gcc.make.ark 2008-01-11 14:24:33.000000000 +0000
-+++ openjdk/hotspot/make/solaris/makefiles/gcc.make 2008-01-11 14:24:48.000000000 +0000
-@@ -109,7 +109,8 @@
-
-
- # Compiler warnings are treated as errors
--WARNINGS_ARE_ERRORS = -Werror
-+# Commented out for now because of gcc 4.3 warnings OpenJDK isn't ready for
-+# WARNINGS_ARE_ERRORS = -Werror
- # Enable these warnings. See 'info gcc' about details on these options
- ADDITIONAL_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
- CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ADDITIONAL_WARNINGS)
---- openjdk/jdk/make/common/Defs-linux.gmk.ark 2008-01-11 14:20:26.000000000 +0000
-+++ openjdk/jdk/make/common/Defs-linux.gmk 2008-01-11 14:21:10.000000000 +0000
-@@ -139,7 +139,9 @@
- # Treat compiler warnings as errors, if warnings not allowed
- #
- ifeq ($(COMPILER_WARNINGS_FATAL),true)
-- GCC_WARNINGS += -Werror
-+ # gcc 4.3 introduces new warnings OpenJDK code isn't quite ready for, such as
-+ # "cast from double to float may chance its value". Let's ignore this for now.
-+ # GCC_WARNINGS += -Werror
- endif
-
- #
diff -r 818a37c3bff4 -r 9154a4bd413e patches/icedtea-sparc.patch
--- a/patches/icedtea-sparc.patch Mon Jul 21 20:30:09 2008 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +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-06-23 03:35:43.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/defs.make 2008-06-23 18:57:15.000000000 +0100
-@@ -59,7 +59,7 @@
- endif
-
- # sparc
--ifeq ($(ARCH), sparc64)
-+ifneq (,$(filter $(ARCH), sparc sparc64))
- ifeq ($(ARCH_DATA_MODEL), 64)
- ARCH_DATA_MODEL = 64
- MAKE_ARGS += LP64=1
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
---- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2008-06-23 03:35:43.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2008-06-23 18:57:15.000000000 +0100
-@@ -52,6 +52,10 @@
- PICFLAG = -fpic
- endif
-
-+ifneq ($(filter sparc sparcv9,$(BUILDARCH)),)
-+PICFLAG = -fPIC
-+endif
-+
- VM_PICFLAG/LIBJVM = $(PICFLAG)
- VM_PICFLAG/AOUT =
-
-diff -Nru openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.hpp openjdk/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.hpp
---- openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.hpp 2008-06-22 20:44:42.000000000 +0100
-+++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.hpp 2008-06-23 18:57:15.000000000 +0100
-@@ -44,3 +44,49 @@
- // Used to register dynamic code cache area with the OS
- // Note: Currently only used in 64 bit Windows implementations
- static bool register_code_area(char *low, char *high) { return true; }
-+/*
-+ * Copyright 1999-2004 Sun Microsystems, Inc. All Rights Reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-+ * CA 95054 USA or visit www.sun.com if you need additional information or
-+ * have any questions.
-+ *
-+ */
-+
-+ //
-+ // NOTE: we are back in class os here, not Linux
-+ //
-+ static jint (*atomic_xchg_func) (jint, volatile jint*);
-+ static jint (*atomic_cmpxchg_func) (jint, volatile jint*, jint);
-+ static jlong (*atomic_cmpxchg_long_func)(jlong, volatile jlong*, jlong);
-+ static jint (*atomic_add_func) (jint, volatile jint*);
-+ static void (*fence_func) ();
-+
-+ static jint atomic_xchg_bootstrap (jint, volatile jint*);
-+ static jint atomic_cmpxchg_bootstrap (jint, volatile jint*, jint);
-+ static jlong atomic_cmpxchg_long_bootstrap(jlong, volatile jlong*, jlong);
-+ static jint atomic_add_bootstrap (jint, volatile jint*);
-+ static void fence_bootstrap ();
-+
-+ static void setup_fpu() {}
-+
-+ static bool is_allocatable(size_t bytes);
-+
-+ // Used to register dynamic code cache area with the OS
-+ // Note: Currently only used in 64 bit Windows implementations
-+ static bool register_code_area(char *low, char *high) { return true; }
diff -r 818a37c3bff4 -r 9154a4bd413e patches/icedtea-text-relocations.patch
--- a/patches/icedtea-text-relocations.patch Mon Jul 21 20:30:09 2008 +0100
+++ b/patches/icedtea-text-relocations.patch Tue Jul 22 20:23:40 2008 +0100
@@ -1,10 +1,11 @@
---- openjdk/hotspot/make/linux/makefiles/gcc.make.orig 2007-06-17 16:46:45.000000000 -0400
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2007-06-17 16:47:12.000000000 -0400
-@@ -46,18 +46,16 @@
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
+--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2008-07-17 08:40:27.000000000 +0100
++++ openjdk/hotspot/make/linux/makefiles/gcc.make 2008-07-21 23:10:50.000000000 +0100
+@@ -46,7 +46,11 @@
# Compiler flags
# position-independent code
-+ifneq ($(filter ppc ppc64 sparc sparc64,$(ZERO_LIBARCH)),)
++ifneq ($(filter ppc ppc64 sparc sparc64 sparcv9,$(ZERO_LIBARCH)),)
PICFLAG = -fPIC
+else
+PICFLAG = -fpic
@@ -12,14 +13,3 @@
VM_PICFLAG/LIBJVM = $(PICFLAG)
VM_PICFLAG/AOUT =
-
--ifneq ($(BUILDARCH), i486)
- VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO))
--else
--# PIC has significant overhead on x86, build nonpic VM for now.
--# Link JVM at a "good" base location to avoid unnecessary .text patching.
--JVM_BASE_ADDR = 0x06000000
--endif
-
- CFLAGS += $(VM_PICFLAG)
- CFLAGS += -fno-rtti
diff -r 818a37c3bff4 -r 9154a4bd413e patches/icedtea-use-system-tzdata.patch
--- a/patches/icedtea-use-system-tzdata.patch Mon Jul 21 20:30:09 2008 +0100
+++ b/patches/icedtea-use-system-tzdata.patch Tue Jul 22 20:23:40 2008 +0100
@@ -52,7 +52,7 @@
+ SystemProperty* sp = Arguments::system_properties();
+ // Use the system zoneinfo files, if present
+ Arguments::PropertyList_add (&sp,
-+ "user.zoneinfo.dir", "/usr/share/javazi");
++ new SystemProperty("user.zoneinfo.dir", "/usr/share/javazi", true));
+
#undef malloc
#undef getenv
diff -r 818a37c3bff4 -r 9154a4bd413e patches/icedtea-zero-build.patch
--- a/patches/icedtea-zero-build.patch Mon Jul 21 20:30:09 2008 +0100
+++ b/patches/icedtea-zero-build.patch Tue Jul 22 20:23:40 2008 +0100
@@ -1,6 +1,6 @@ diff -Nru openjdk.orig/corba/make/common
diff -Nru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk
---- openjdk.orig/corba/make/common/Defs-linux.gmk 2008-05-23 23:42:18.000000000 +0100
-+++ openjdk/corba/make/common/Defs-linux.gmk 2008-05-24 00:01:14.000000000 +0100
+--- openjdk.orig/corba/make/common/Defs-linux.gmk 2008-07-21 23:18:56.000000000 +0100
++++ openjdk/corba/make/common/Defs-linux.gmk 2008-07-22 17:55:24.000000000 +0100
@@ -99,8 +99,13 @@
LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
@@ -18,8 +18,8 @@ diff -Nru openjdk.orig/corba/make/common
# Add in platform specific optimizations for all opt levels
CC_HIGHEST_OPT += $(_OPT_$(ARCH))
diff -Nru openjdk.orig/corba/make/common/shared/Compiler-gcc.gmk openjdk/corba/make/common/shared/Compiler-gcc.gmk
---- openjdk.orig/corba/make/common/shared/Compiler-gcc.gmk 2008-05-23 23:42:18.000000000 +0100
-+++ openjdk/corba/make/common/shared/Compiler-gcc.gmk 2008-05-24 00:01:14.000000000 +0100
+--- openjdk.orig/corba/make/common/shared/Compiler-gcc.gmk 2008-07-21 23:18:56.000000000 +0100
++++ openjdk/corba/make/common/shared/Compiler-gcc.gmk 2008-07-22 17:55:24.000000000 +0100
@@ -70,6 +70,11 @@
else
CXX = $(COMPILER_PATH)g++$(GCC_SUFFIX)
@@ -41,8 +41,8 @@ diff -Nru openjdk.orig/corba/make/common
SHARED_LIBRARY_FLAG = -shared -mimpure-text
SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 )
diff -Nru openjdk.orig/corba/make/common/shared/Platform.gmk openjdk/corba/make/common/shared/Platform.gmk
---- openjdk.orig/corba/make/common/shared/Platform.gmk 2008-05-16 22:13:14.000000000 +0100
-+++ openjdk/corba/make/common/shared/Platform.gmk 2008-05-24 00:01:14.000000000 +0100
+--- openjdk.orig/corba/make/common/shared/Platform.gmk 2008-07-17 08:39:53.000000000 +0100
++++ openjdk/corba/make/common/shared/Platform.gmk 2008-07-22 17:55:24.000000000 +0100
@@ -202,6 +202,11 @@
ARCH_FAMILY := $(ARCH)
@@ -55,109 +55,10 @@ diff -Nru openjdk.orig/corba/make/common
ifeq ($(ARCH), sparc)
# Linux sparc build can be either 32-bit or 64-bit.
# Default to 32, but allow explicit setting to 32 or 64.
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/buildtree.make openjdk/hotspot/make/linux/makefiles/buildtree.make
---- openjdk.orig/hotspot/make/linux/makefiles/buildtree.make 2008-05-19 22:56:21.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/buildtree.make 2008-05-24 00:01:14.000000000 +0100
-@@ -321,6 +321,7 @@
- DATA_MODE/sparcv9 = 64
- DATA_MODE/amd64 = 64
- DATA_MODE/ia64 = 64
-+DATA_MODE/zero = $(ZERO_BITSPERWORD)
-
- JAVA_FLAG/32 = -d32
- JAVA_FLAG/64 = -d64
-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-23 23:42:18.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/defs.make 2008-05-24 00:01:14.000000000 +0100
-@@ -37,6 +37,18 @@
- ARCH_DATA_MODEL ?= 32
- endif
-
-+# zero
-+ifdef ICEDTEA_ZERO_BUILD
-+ ARCH_DATA_MODEL = $(ZERO_BITSPERWORD)
-+ ifeq ($(ARCH_DATA_MODEL), 64)
-+ MAKE_ARGS += LP64=1
-+ endif
-+ PLATFORM = linux-zero
-+ VM_PLATFORM = linux_zero
-+ HS_ARCH = zero
-+ ARCH = zero
-+endif
-+
- # ia64
- ifeq ($(ARCH), ia64)
- ARCH_DATA_MODEL = 64
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
---- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2008-05-23 23:42:18.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2008-05-24 00:01:14.000000000 +0100
-@@ -57,6 +57,9 @@
-
- VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO))
-
-+ifdef ICEDTEA_ZERO_BUILD
-+CFLAGS += $(LIBFFI_CFLAGS)
-+endif
- CFLAGS += $(VM_PICFLAG)
- CFLAGS += -fno-rtti
- CFLAGS += -fno-exceptions
-@@ -73,6 +76,7 @@
- ARCHFLAG/ia64 =
- ARCHFLAG/sparc = -m32 -mcpu=v9
- ARCHFLAG/sparcv9 = -m64 -mcpu=v9
-+ARCHFLAG/zero = $(ZERO_ARCHFLAG)
-
- CFLAGS += $(ARCHFLAG)
- AOUT_FLAGS += $(ARCHFLAG)
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/sa.make openjdk/hotspot/make/linux/makefiles/sa.make
---- openjdk.orig/hotspot/make/linux/makefiles/sa.make 2008-05-16 22:13:31.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/sa.make 2008-05-24 00:01:14.000000000 +0100
-@@ -51,10 +51,10 @@
- SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties
-
- # if $(AGENT_DIR) does not exist, we don't build SA
--# also, we don't build SA on Itanium.
-+# also, we don't build SA on Itanium or zero.
-
- all:
-- if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" ] ; then \
-+ if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" -a "$(SRCARCH)" != "zero" ] ; then \
- $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
- fi
-
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/saproc.make openjdk/hotspot/make/linux/makefiles/saproc.make
---- openjdk.orig/hotspot/make/linux/makefiles/saproc.make 2008-05-16 22:13:31.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/saproc.make 2008-05-24 00:01:14.000000000 +0100
-@@ -44,10 +44,10 @@
- DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC)
-
- # if $(AGENT_DIR) does not exist, we don't build SA
--# also, we don't build SA on Itanium.
-+# also, we don't build SA on Itanium or zero.
-
- checkAndBuildSA:
-- $(QUIETLY) if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" ] ; then \
-+ $(QUIETLY) if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" -a "$(SRCARCH)" != "zero" ] ; then \
- $(MAKE) -f vm.make $(LIBSAPROC); \
- fi
-
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make
---- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2008-05-23 23:42:18.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/vm.make 2008-05-24 00:01:14.000000000 +0100
-@@ -152,6 +152,9 @@
-
More information about the distro-pkg-dev
mailing list