commit cff28354352abf6c6c06808f8d17bb081abe13e7
author ohair <none@none> Wed Nov 25 11:08:25 2009 -0800
committer ohair <none@none> Wed Nov 25 11:08:25 2009 -0800
tree 2a92cfc64fd97e5fb8b33fb6b739ba755e7505eb
parent 81101fa5c678bfcd5b8d2f189969c822a3c06f4e
parent 069ff316d9eed788bd9ac88289afe04c40e5ece2

Merge

make/common/shared/Platform.gmk

diff --git a/make/common/shared/Platform.gmk b/make/common/shared/Platform.gmk
index e07de24..ee6f38f 100644
--- a/make/common/shared/Platform.gmk
+++ b/make/common/shared/Platform.gmk
@@ -165,6 +165,9 @@
                 sparc*) \
                     echo sparc \
                     ;; \
+                arm*) \
+                    echo arm \
+                    ;; \
                 *) \
                     echo $(mach) \
                     ;; \

src/share/native/java/lang/fdlibm/include/fdlibm.h

diff --git a/src/share/native/java/lang/fdlibm/include/fdlibm.h b/src/share/native/java/lang/fdlibm/include/fdlibm.h
index 906bcf9..874b964 100644
--- a/src/share/native/java/lang/fdlibm/include/fdlibm.h
+++ b/src/share/native/java/lang/fdlibm/include/fdlibm.h
@@ -29,7 +29,7 @@
 #ifdef __NEWVALID       /* special setup for Sun test regime */
 #if defined(i386) || defined(i486) || \
         defined(intel) || defined(x86) || \
-        defined(i86pc) || defined(_M_IA64)
+        defined(i86pc) || defined(_M_IA64) || defined(ia64)
 #define _LITTLE_ENDIAN
 #endif
 #endif