changeset 172:b84fc2f85e13

Merge from main OpenJDK repository
author Greg Lewis <glewis@eyesbeyond.com>
date Sun, 20 Dec 2009 19:49:47 -0800
parents 76c434515fcd ec0421b5703b
children fad47829eadc
files make/common/shared/Platform.gmk
diffstat 3 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Sat Dec 05 15:37:14 2009 -0800
+++ b/.hgignore	Sun Dec 20 19:49:47 2009 -0800
@@ -1,3 +1,3 @@
 ^build/
 ^dist/
-^nbproject/private/
+/nbproject/private/
--- a/.hgtags	Sat Dec 05 15:37:14 2009 -0800
+++ b/.hgtags	Sun Dec 20 19:49:47 2009 -0800
@@ -51,3 +51,5 @@
 5d0cf59a3203b9f57aceebc33ae656b884987955 jdk7-b74
 0fb137085952c8e47878e240d1cb40f14de463c4 jdk7-b75
 937144222e2219939101b0129d26a872a7956b13 jdk7-b76
+6881f0383f623394b5ec73f27a5f329ff55d0467 jdk7-b77
+a7f7276b48cd74d8eb1baa83fbf3d1ef4a2603c8 jdk7-b78
--- a/make/common/shared/Platform.gmk	Sat Dec 05 15:37:14 2009 -0800
+++ b/make/common/shared/Platform.gmk	Sun Dec 20 19:49:47 2009 -0800
@@ -187,6 +187,9 @@
                 sparc*) \
                     echo sparc \
                     ;; \
+                arm*) \
+                    echo arm \
+                    ;; \
                 *) \
                     echo $(mach) \
                     ;; \