# HG changeset patch
# User amurillo
# Date 1345247224 25200
# Node ID e5b423c2edd1df94bfd91b0e6b627df49002fbbf
# Parent  d3fc5d192448979cfd08afe1e780961a1ef78cdf# Parent  28748d6b89cc929d3d829a9c03a8c987f548db1a
Merge

diff -r d3fc5d192448 -r e5b423c2edd1 hotspot/make/pic.make
--- 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