/hg/icedtea6: Updates for Hitachi SH
doko at icedtea.classpath.org
doko at icedtea.classpath.org
Wed Mar 17 07:00:11 PDT 2010
changeset 6140e5b242ab in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6140e5b242ab
author: doko at ubuntu.com
date: Wed Mar 17 14:39:47 2010 +0100
Updates for Hitachi SH
2010-03-17 Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
* acinclude.m4 (IT_SET_ARCH_SETTINGS): Define architecture
as sh for all sh* variants.
* patches/icedtea-sh4-support.patch: Likewise.
diffstat:
3 files changed, 133 insertions(+)
ChangeLog | 6 +
acinclude.m4 | 6 +
patches/icedtea-sh4-support.patch | 121 +++++++++++++++++++++++++++++++++++++
diffs (157 lines):
diff -r fc2b07c22fa2 -r 6140e5b242ab ChangeLog
--- a/ChangeLog Wed Mar 17 11:42:01 2010 +0100
+++ b/ChangeLog Wed Mar 17 14:39:47 2010 +0100
@@ -1,3 +1,9 @@ 2010-03-17 Matthias Klose <doko at ubuntu
+2010-03-17 Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
+
+ * acinclude.m4 (IT_SET_ARCH_SETTINGS): Define architecture as sh
+ for all sh* variants.
+ * patches/icedtea-sh4-support.patch: Likewise.
+
2010-03-17 Matthias Klose <doko at ubuntu.com>
* NEWS: Add 1.7.1, update for 1.8.
diff -r fc2b07c22fa2 -r 6140e5b242ab acinclude.m4
--- a/acinclude.m4 Wed Mar 17 11:42:01 2010 +0100
+++ b/acinclude.m4 Wed Mar 17 14:39:47 2010 +0100
@@ -85,6 +85,12 @@ AC_DEFUN([IT_SET_ARCH_SETTINGS],
CROSS_TARGET_ARCH=s390x
ARCHFLAG="-m64"
;;
+ sh*-*-*)
+ BUILD_ARCH_DIR=sh
+ INSTALL_ARCH_DIR=sh
+ JRE_ARCH_DIR=sh
+ CROSS_TARGET_ARCH=sh
+ ;;
*)
BUILD_ARCH_DIR=`uname -m`
INSTALL_ARCH_DIR=$BUILD_ARCH_DIR
diff -r fc2b07c22fa2 -r 6140e5b242ab patches/icedtea-sh4-support.patch
--- a/patches/icedtea-sh4-support.patch Wed Mar 17 11:42:01 2010 +0100
+++ b/patches/icedtea-sh4-support.patch Wed Mar 17 14:39:47 2010 +0100
@@ -61,3 +61,124 @@
endif
endif
+--- openjdk/corba/make/common/shared/Platform.gmk 2010-01-18 22:27:21.000000000 +0900
++++ openjdk/corba/make/common/shared/Platform.gmk 2010-01-18 22:28:50.000000000 +0900
+@@ -205,6 +205,9 @@
+ arm*) \
+ echo arm \
+ ;; \
++ sh*) \
++ echo sh \
++ ;; \
+ *) \
+ echo $(mach) \
+ ;; \
+--- openjdk/jdk/make/common/shared/Platform.gmk 2010-01-18 22:39:35.000000000 +0900
++++ openjdk/jdk/make/common/shared/Platform.gmk 2010-01-19 09:39:26.000000000 +0900
+@@ -214,6 +214,9 @@
+ arm*) \
+ echo arm \
+ ;; \
++ sh*) \
++ echo sh \
++ ;; \
+ *) \
+ echo $(mach) \
+ ;; \
+@@ -272,6 +275,9 @@
+ ifeq ($(ARCH), s390x)
+ ARCH_DATA_MODEL=64
+ endif
++ ifeq ($(ARCH), sh)
++ ARCH_DATA_MODEL=32
++ endif
+ endif
+ endif
+
+--- openjdk/jdk/make/jdk_generic_profile.sh 2010-01-19 09:49:57.000000000 +0900
++++ openjdk/jdk/make/jdk_generic_profile.sh 2010-01-19 21:43:22.000000000 +0900
+@@ -350,13 +350,14 @@
+ i?86) ZERO_LIBARCH=i386 ;;
+ sparc64) ZERO_LIBARCH=sparcv9 ;;
+ arm*) ZERO_LIBARCH=arm ;;
++ sh*) ZERO_LIBARCH=sh ;;
+ *) ZERO_LIBARCH="$(arch)"
+ esac
+ export ZERO_LIBARCH
+
+ # ARCH_DATA_MODEL is the number of bits in a pointer
+ case "${ZERO_LIBARCH}" in
+- i386|ppc|s390|sparc|arm)
++ i386|ppc|s390|sparc|arm|sh)
+ ARCH_DATA_MODEL=32
+ ;;
+ amd64|ppc64|s390x|sparcv9|ia64|alpha)
+--- openjdk/jdk/make/jdk_generic_profile.sh 2010-01-19 09:49:57.000000000 +0900
++++ openjdk/jdk/make/jdk_generic_profile.sh 2010-01-19 21:44:30.000000000 +0900
+@@ -350,13 +350,14 @@
+ i?86) ZERO_LIBARCH=i386 ;;
+ sparc64) ZERO_LIBARCH=sparcv9 ;;
+ arm*) ZERO_LIBARCH=arm ;;
++ sh*) ZERO_LIBARCH=sh ;;
+ *) ZERO_LIBARCH="$(arch)"
+ esac
+ export ZERO_LIBARCH
+
+ # ARCH_DATA_MODEL is the number of bits in a pointer
+ case "${ZERO_LIBARCH}" in
+- i386|ppc|s390|sparc|arm)
++ i386|ppc|s390|sparc|arm|sh)
+ ARCH_DATA_MODEL=32
+ ;;
+ amd64|ppc64|s390x|sparcv9|ia64|alpha)
+--- openjdk/jdk/make/javax/sound/SoundDefs.gmk 2010-01-19 22:35:25.000000000 +0900
++++ openjdk/jdk/make/javax/sound/SoundDefs.gmk 2010-01-20 11:42:28.000000000 +0900
+@@ -113,6 +113,10 @@
+ ifeq ($(ARCH), sparcv9)
+ CPPFLAGS += -DX_ARCH=X_SPARCV9
+ endif # ARCH sparcv9
++
++ ifeq ($(ARCH), sh)
++ CPPFLAGS += -DX_ARCH=X_SH
++ endif # ARCH Renesas SuperH(sh)
+ endif
+
+
+--- openjdk/jdk/make/common/Defs-linux.gmk 2010-01-21 13:27:43.000000000 +0900
++++ openjdk/jdk/make/common/Defs-linux.gmk 2010-01-21 13:28:50.000000000 +0900
+@@ -119,6 +119,7 @@
+ LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
+ CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
+ LDFLAGS_COMMON_sparc += -m32 -mcpu=v9
++CFLAGS_REQUIRED_sh += -mieee
+ ifeq ($(ZERO_BUILD), true)
+ CFLAGS_REQUIRED = $(ZERO_ARCHFLAG)
+ ifeq ($(ZERO_ENDIANNESS), little)
+@@ -202,7 +203,7 @@
+ CXXFLAGS_DBG += $(CC_LOWER_OPT)
+ endif
+
+-CPPFLAGS_COMMON = -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) \
++CPPFLAGS_COMMON = -D_$(ARCH)_ $(if $(filter $(ARCH),alpha sh),,-D$(ARCH)) \
+ -DARCH='"$(ARCH)"' -DLINUX $(VERSION_DEFINES) \
+ -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT
+
+--- openjdk/corba/make/common/Defs-linux.gmk 2010-01-21 13:29:49.000000000 +0900
++++ openjdk/corba/make/common/Defs-linux.gmk 2010-01-21 13:30:58.000000000 +0900
+@@ -109,6 +109,7 @@
+ LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
+ CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
+ LDFLAGS_COMMON_sparc += -m32 -mcpu=v9
++CFLAGS_REQUIRED_sh += -mieee
+ ifeq ($(ZERO_BUILD), true)
+ CFLAGS_REQUIRED = $(ZERO_ARCHFLAG)
+ ifeq ($(ZERO_ENDIANNESS), little)
+@@ -186,7 +187,7 @@
+ CXXFLAGS_DBG += $(CC_LOWER_OPT)
+ endif
+
+-CPPFLAGS_COMMON = -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) \
++CPPFLAGS_COMMON = -D_$(ARCH)_ $(if $(filter $(ARCH),alpha sh),,-D$(ARCH)) \
+ -DARCH='"$(ARCH)"' -DLINUX $(VERSION_DEFINES) \
+ -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT
+
More information about the distro-pkg-dev
mailing list