Mercurial > hg > release > icedtea6-1.2
changeset 824:580c9ff79417
2008-04-21 Christan Thalinger <twisti@complang.tuwien.ac.at>
* patches/icedtea-cacao.patch: Set the ARCH_DATA_MODEL correct for
almost all architectures (I missed that when merging in the
cacao-branch).
author | Christian Thalinger <twisti@complang.tuwien.ac.at> |
---|---|
date | Mon, 21 Apr 2008 16:41:07 +0200 |
parents | 7a015d5c9cb1 |
children | 46671a3d6f13 |
files | ChangeLog patches/icedtea-cacao.patch |
diffstat | 2 files changed, 82 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Apr 17 17:04:16 2008 -0400 +++ b/ChangeLog Mon Apr 21 16:41:07 2008 +0200 @@ -1,3 +1,9 @@ +2008-04-21 Christan Thalinger <twisti@complang.tuwien.ac.at> + + * patches/icedtea-cacao.patch: Set the ARCH_DATA_MODEL correct for + almost all architectures (I missed that when merging in the + cacao-branch). + 2008-04-17 Joshua Sumali <jsumali@redhat.com> * configure: Regenerated.
--- a/patches/icedtea-cacao.patch Thu Apr 17 17:04:16 2008 -0400 +++ b/patches/icedtea-cacao.patch Mon Apr 21 16:41:07 2008 +0200 @@ -165,3 +165,79 @@ // ********************************** // Make sure you set X_PLATFORM and X_ARCH defines correctly. +--- openjdk/corba/make/common/shared/Platform.gmk~ 2008-04-21 09:54:27.000000000 +0200 ++++ openjdk/corba/make/common/shared/Platform.gmk 2008-04-21 16:14:54.000000000 +0200 +@@ -224,9 +224,34 @@ + else + # i586 is 32-bit, amd64 is 64-bit + ifndef ARCH_DATA_MODEL ++ ifeq ($(ARCH), alpha) ++ ARCH_DATA_MODEL=64 ++ endif ++ ifeq ($(ARCH), amd64) ++ ARCH_DATA_MODEL=64 ++ endif ++ ifeq ($(ARCH), arm) ++ ARCH_DATA_MODEL=32 ++ endif + ifeq ($(ARCH), i586) + ARCH_DATA_MODEL=32 +- else ++ endif ++ ifeq ($(ARCH), ia64) ++ ARCH_DATA_MODEL=64 ++ endif ++ ifeq ($(ARCH), mips) ++ ARCH_DATA_MODEL=32 ++ endif ++ ifeq ($(ARCH), ppc) ++ ARCH_DATA_MODEL=32 ++ endif ++ ifeq ($(ARCH), ppc64) ++ ARCH_DATA_MODEL=64 ++ endif ++ ifeq ($(ARCH), s390) ++ ARCH_DATA_MODEL=32 ++ endif ++ ifeq ($(ARCH), s390x) + ARCH_DATA_MODEL=64 + endif + endif +--- openjdk/jdk/make/common/shared/Platform.gmk~ 2008-04-21 09:54:27.000000000 +0200 ++++ openjdk/jdk/make/common/shared/Platform.gmk 2008-04-21 16:15:00.000000000 +0200 +@@ -235,9 +235,34 @@ + else + # i586 is 32-bit, amd64 is 64-bit + ifndef ARCH_DATA_MODEL ++ ifeq ($(ARCH), alpha) ++ ARCH_DATA_MODEL=64 ++ endif ++ ifeq ($(ARCH), amd64) ++ ARCH_DATA_MODEL=64 ++ endif ++ ifeq ($(ARCH), arm) ++ ARCH_DATA_MODEL=32 ++ endif + ifeq ($(ARCH), i586) + ARCH_DATA_MODEL=32 +- else ++ endif ++ ifeq ($(ARCH), ia64) ++ ARCH_DATA_MODEL=64 ++ endif ++ ifeq ($(ARCH), mips) ++ ARCH_DATA_MODEL=32 ++ endif ++ ifeq ($(ARCH), ppc) ++ ARCH_DATA_MODEL=32 ++ endif ++ ifeq ($(ARCH), ppc64) ++ ARCH_DATA_MODEL=64 ++ endif ++ ifeq ($(ARCH), s390) ++ ARCH_DATA_MODEL=32 ++ endif ++ ifeq ($(ARCH), s390x) + ARCH_DATA_MODEL=64 + endif + endif