Mercurial > hg > release > icedtea7-forest-2.3 > jdk
changeset 6317:8e4c462b3a10
PR1551: Add build support for Zero AArch64
| author | andrew |
|---|---|
| date | Fri, 04 Oct 2013 16:40:15 +0100 |
| parents | 6200515176fa |
| children | b37ac011ed13 |
| files | make/common/shared/Defs-java.gmk make/javax/sound/SoundDefs.gmk make/jdk_generic_profile.sh src/share/native/com/sun/media/sound/SoundDefs.h |
| diffstat | 4 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/shared/Defs-java.gmk Tue Sep 03 15:19:59 2013 +0100 +++ b/make/common/shared/Defs-java.gmk Fri Oct 04 16:40:15 2013 +0100 @@ -90,7 +90,7 @@ ifeq ($(ARCH_DATA_MODEL), 32) JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768 else - JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1536 + JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1664 endif JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%)
--- a/make/javax/sound/SoundDefs.gmk Tue Sep 03 15:19:59 2013 +0100 +++ b/make/javax/sound/SoundDefs.gmk Fri Oct 04 16:40:15 2013 +0100 @@ -118,6 +118,10 @@ CPPFLAGS += -DX_ARCH=X_SPARCV9 endif # ARCH sparcv9 + ifeq ($(ARCH), aarch64) + CPPFLAGS += -DX_ARCH=X_AARCH64 + endif # ARCH aarch64 + ifeq ($(ARCH), amd64) CPPFLAGS += -DX_ARCH=X_AMD64 endif # ARCH amd64
--- a/make/jdk_generic_profile.sh Tue Sep 03 15:19:59 2013 +0100 +++ b/make/jdk_generic_profile.sh Fri Oct 04 16:40:15 2013 +0100 @@ -269,7 +269,7 @@ i386|ppc|s390|sparc|arm|sh) ARCH_DATA_MODEL=32 ;; - amd64|ppc64|s390x|sparcv9|ia64|alpha) + aarch64|alpha|amd64|ia64|ppc64|s390x|sparcv9) ARCH_DATA_MODEL=64 ;; *) @@ -280,7 +280,7 @@ # ZERO_ENDIANNESS is the endianness of the processor case "${ZERO_LIBARCH}" in - i386|amd64|ia64|arm) + arm|aarch64|amd64|i386|ia64|mipsel) ZERO_ENDIANNESS=little ;; ppc*|s390*|sparc*|alpha)
--- a/src/share/native/com/sun/media/sound/SoundDefs.h Tue Sep 03 15:19:59 2013 +0100 +++ b/src/share/native/com/sun/media/sound/SoundDefs.h Fri Oct 04 16:40:15 2013 +0100 @@ -51,6 +51,7 @@ #define X_S390 14 #define X_S390X 15 #define X_SH 16 +#define X_AARCH64 17 // ********************************** // Make sure you set X_PLATFORM and X_ARCH defines correctly.