# HG changeset patch
# User ohair
# Date 1304634200 25200
# Node ID 8f5e2b975fa22dc00df666a8d170b5514a93b059
# Parent  99a7ebf426f2f6c942bff96b83e79bbb8093e24c# Parent  5675b83ad5ebc8872077a01d82157a2d46e0d0eb
Merge

diff -r 99a7ebf426f2 -r 8f5e2b975fa2 jdk/make/common/Program.gmk
--- a/jdk/make/common/Program.gmk	Thu May 05 14:02:17 2011 -0700
+++ b/jdk/make/common/Program.gmk	Thu May 05 15:23:20 2011 -0700
@@ -55,10 +55,13 @@
 
 program: $(ACTUAL_PROGRAM)
 
-# reuse the mapfiles in the launcher's directory, the same should
-# be applicable to the tool launchers as well.
-FILES_m = $(BUILDDIR)/java/main/java/mapfile-$(ARCH)
-include $(BUILDDIR)/common/Mapfile-vers.gmk
+# Work-around for missing processor specific mapfiles
+ifndef CROSS_COMPILE_ARCH
+  # reuse the mapfiles in the launcher's directory, the same should
+  # be applicable to the tool launchers as well.
+  FILES_m = $(BUILDDIR)/java/main/java/mapfile-$(ARCH)
+  include $(BUILDDIR)/common/Mapfile-vers.gmk
+endif
 
 include $(JDK_TOPDIR)/make/common/Rules.gmk