# HG changeset patch
# User Xerxes Ranby <xerxes@zafena.se>
# Date 1313067646 -7200
# Node ID 55a2cf00dc6a1966d1cefd8d2ff15210369cd159
# Parent  4da6bd3bb35e37082fb60050927f4f5aa6ca7569
PR770 Zero 7033954 regression: missing mapfile

2011-06-11  Xerxes Ranby  <xerxes@zafena.se>
	    Matthias Klose  <doko@ubuntu.com>

	* make/common/Program.gmk: don't assume that mapfiles are available
	  for every architecture; most likely only seen with some zero builds.

diff -r 4da6bd3bb35e -r 55a2cf00dc6a make/common/Program.gmk
--- a/make/common/Program.gmk	Thu Aug 04 05:09:19 2011 +0100
+++ b/make/common/Program.gmk	Thu Aug 11 15:00:46 2011 +0200
@@ -56,12 +56,14 @@
 program: $(ACTUAL_PROGRAM)
 
 # Work-around for missing processor specific mapfiles
+ifneq (,$(filter $(ARCH), amd64 i586 sparc sparcv9))
 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
+endif
 
 include $(JDK_TOPDIR)/make/common/Rules.gmk