Mercurial > hg > release > icedtea8-forest-3.0 > jdk

changeset 1710:c2cd86f82ed7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update to latest revision of Gary's Zero patch.
author andrew
date Tue, 29 Sep 2009 14:24:18 +0100
parents d18387e8d954
children 93da8a843f32
files make/common/shared/Platform.gmk make/java/redist/Makefile make/jdk_generic_profile.sh
diffstat 3 files changed, 10 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/shared/Platform.gmk	Tue Sep 22 18:53:05 2009 +0100
+++ b/make/common/shared/Platform.gmk	Tue Sep 29 14:24:18 2009 +0100
@@ -173,11 +173,6 @@
   ARCH_FAMILY := $(ARCH)
 
   # Linux builds may be 32-bit or 64-bit data model.
-  ifeq ($(ZERO_BUILD), true)
-    ifndef ARCH_DATA_MODEL
-      ARCH_DATA_MODEL = $(ZERO_BITSPERWORD)
-    endif
-  endif
   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.
--- a/make/java/redist/Makefile	Tue Sep 22 18:53:05 2009 +0100
+++ b/make/java/redist/Makefile	Tue Sep 29 14:24:18 2009 +0100
@@ -94,8 +94,8 @@
   endif
 endif # INCLUDE_SA
 
-# Hotspot client is only available on 32-bit non-core builds
-ifneq ($(CORE_BUILD), true)
+# Hotspot client is only available on 32-bit non-Zero builds
+ifneq ($(ZERO_BUILD), true)
 ifeq ($(ARCH_DATA_MODEL), 32)
   IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME) \
                  $(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt
@@ -173,7 +173,7 @@
   IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_NAME)
 endif 
 
-ifneq ($(CORE_BUILD), true)
+ifneq ($(ZERO_BUILD), true)
 ifeq ($(ARCH_DATA_MODEL), 32)
 
 IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME)
@@ -204,7 +204,7 @@
 
 endif # 32bit
 
-endif # CORE_BUILD
+endif # ZERO_BUILD
 
 #  NOT Windows ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ NOT Windows
 
--- a/make/jdk_generic_profile.sh	Tue Sep 22 18:53:05 2009 +0100
+++ b/make/jdk_generic_profile.sh	Tue Sep 29 14:24:18 2009 +0100
@@ -353,19 +353,19 @@
   esac
   export ZERO_LIBARCH
 
-  # ZERO_BITSPERWORD is the number of bits in a pointer
+  # ARCH_DATA_MODEL is the number of bits in a pointer
   case "${ZERO_LIBARCH}" in
     i386|ppc|s390|sparc|arm)
-      ZERO_BITSPERWORD=32
+      ARCH_DATA_MODEL=32
       ;;
     amd64|ppc64|s390x|sparcv9|ia64|alpha)
-      ZERO_BITSPERWORD=64
+      ARCH_DATA_MODEL=64
       ;;
     *)
-      echo "ERROR: Unable to determine ZERO_BITSPERWORD for ${ZERO_LIBARCH}"
+      echo "ERROR: Unable to determine ARCH_DATA_MODEL for ${ZERO_LIBARCH}"
       exit 1
   esac
-  export ZERO_BITSPERWORD
+  export ARCH_DATA_MODEL
 
   # ZERO_ENDIANNESS is the endianness of the processor
   case "${ZERO_LIBARCH}" in
@@ -397,7 +397,7 @@
       ZERO_ARCHFLAG="-m31"
       ;;
     *)
-      ZERO_ARCHFLAG="-m${ZERO_BITSPERWORD}"
+      ZERO_ARCHFLAG="-m${ARCH_DATA_MODEL}"
   esac
   export ZERO_ARCHFLAG
 
@@ -417,8 +417,4 @@
   fi
   export LIBFFI_CFLAGS
   export LIBFFI_LIBS
-  if [ "${LIBFFI_LIBS}" = "" ] ; then
-    echo "ERROR: LIBFFI_LIBS is not set"
-    exit 1
-  fi
 fi