Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authoramurillo
Fri, 17 Aug 2012 16:47:04 -0700
changeset 13528 e5b423c2edd1
parent 13465 d3fc5d192448 (current diff)
parent 13527 28748d6b89cc (diff)
child 13529 dc25e69fd16d
Merge
--- a/hotspot/make/pic.make	Wed Aug 15 16:49:38 2012 -0700
+++ b/hotspot/make/pic.make	Fri Aug 17 16:47:04 2012 -0700
@@ -32,7 +32,7 @@
   ifndef LP64
     PARTIAL_NONPIC=1
   endif
-  PIC_ARCH = ppc
+  PIC_ARCH = ppc arm
   ifneq ("$(filter $(PIC_ARCH),$(BUILDARCH))","")
     PARTIAL_NONPIC=0
   endif
jdk-sandbox