# HG changeset patch
# User anoll
# Date 1418662387 28800
# Node ID 6743c7dbf7c6b2efe97e269ec27c6dd2ad68e1db
# Parent  a35c0be8c82a5ababa353e18e984d0c3223c355e# Parent  d0931c6d456a9cfd78e462229c69b67a9f9674a7
Merge

diff -r a35c0be8c82a -r 6743c7dbf7c6 common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Fri Dec 12 08:40:18 2014 -0800
+++ b/common/autoconf/generated-configure.sh	Mon Dec 15 08:53:07 2014 -0800
@@ -4329,7 +4329,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1418036274
+DATE_WHEN_GENERATED=1418395009
 
 ###############################################################################
 #
@@ -13965,7 +13965,8 @@
 
   # ZERO_ARCHDEF is used to enable architecture-specific code
   case "${OPENJDK_TARGET_CPU}" in
-    ppc*)    ZERO_ARCHDEF=PPC   ;;
+    ppc)     ZERO_ARCHDEF=PPC32 ;;
+    ppc64)   ZERO_ARCHDEF=PPC64 ;;
     s390*)   ZERO_ARCHDEF=S390  ;;
     sparc*)  ZERO_ARCHDEF=SPARC ;;
     x86_64*) ZERO_ARCHDEF=AMD64 ;;
diff -r a35c0be8c82a -r 6743c7dbf7c6 common/autoconf/platform.m4
--- a/common/autoconf/platform.m4	Fri Dec 12 08:40:18 2014 -0800
+++ b/common/autoconf/platform.m4	Mon Dec 15 08:53:07 2014 -0800
@@ -367,7 +367,8 @@
 
   # ZERO_ARCHDEF is used to enable architecture-specific code
   case "${OPENJDK_TARGET_CPU}" in
-    ppc*)    ZERO_ARCHDEF=PPC   ;;
+    ppc)     ZERO_ARCHDEF=PPC32 ;;
+    ppc64)   ZERO_ARCHDEF=PPC64 ;;
     s390*)   ZERO_ARCHDEF=S390  ;;
     sparc*)  ZERO_ARCHDEF=SPARC ;;
     x86_64*) ZERO_ARCHDEF=AMD64 ;;
diff -r a35c0be8c82a -r 6743c7dbf7c6 make/StripBinaries.gmk
--- a/make/StripBinaries.gmk	Fri Dec 12 08:40:18 2014 -0800
+++ b/make/StripBinaries.gmk	Mon Dec 15 08:53:07 2014 -0800
@@ -66,11 +66,6 @@
     $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/modules_libs \
         -name '*$(SHARED_LIBRARY_SUFFIX)' -type f)
 
-# On Windows, don't include debug info for libs either.
-ifeq ($(OPENJDK_TARGET_OS), windows)
-  COPY_LIBS_SRC := $(filter-out %.diz %.map %.pdb, $(COPY_LIBS_SRC))
-endif
-
 $(eval $(call SetupCopyFiles,STRIP_MODULES_CMDS, \
     SRC := $(SUPPORT_OUTPUTDIR)/modules_cmds, \
     DEST := $(MODULES_CMDS_STRIPPED), \