From b0d3f4f87570cab394e3a5dec20cf984cc7951ea Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Tue, 13 May 2014 16:56:36 +0200
Subject: [PATCH] update libxmlsec config.* to support ppc64le

---
 ...libxmlsec-config.-to-support-ppc64le.patch | 1663 +++++++++++++++++
 libreoffice.spec                              |    1 +
 2 files changed, 1664 insertions(+)
 create mode 100644 0001-update-libxmlsec-config.-to-support-ppc64le.patch

diff --git a/0001-update-libxmlsec-config.-to-support-ppc64le.patch b/0001-update-libxmlsec-config.-to-support-ppc64le.patch
new file mode 100644
index 0000000..6966a08
--- /dev/null
+++ b/0001-update-libxmlsec-config.-to-support-ppc64le.patch
@@ -0,0 +1,1663 @@
+From 106d9b392bd59f52775eeb09e2a4e8b20828894b Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Tue, 13 May 2014 16:48:40 +0200
+Subject: [PATCH] update libxmlsec config.* to support ppc64le
+
+Change-Id: I4b31729481b7fd538483db5b6e39e1d80e03b3b6
+---
+ external/libxmlsec/UnpackedTarball_xmlsec.mk       |    1 +
+ .../libxmlsec/xmlsec1-update-config.guess.patch.1  | 1630 ++++++++++++++++++++
+ 2 files changed, 1631 insertions(+)
+ create mode 100644 external/libxmlsec/xmlsec1-update-config.guess.patch.1
+
+diff --git a/external/libxmlsec/UnpackedTarball_xmlsec.mk b/external/libxmlsec/UnpackedTarball_xmlsec.mk
+index 6d1cb43..a72deed 100644
+--- a/external/libxmlsec/UnpackedTarball_xmlsec.mk
++++ b/external/libxmlsec/UnpackedTarball_xmlsec.mk
+@@ -25,6 +25,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,xmlsec,\
+ 	external/libxmlsec/xmlsec1-android.patch \
+ 	external/libxmlsec/xmlsec1-1.2.14-ansi.patch \
+ 	external/libxmlsec/xmlsec1-customkeymanage.patch \
++	external/libxmlsec/xmlsec1-update-config.guess.patch.1 \
+ ))
+ 
+ $(eval $(call gb_UnpackedTarball_add_file,xmlsec,include/xmlsec/mscrypto/akmngr.h,external/libxmlsec/include/akmngr_mscrypto.h))
+diff --git a/external/libxmlsec/xmlsec1-update-config.guess.patch.1 b/external/libxmlsec/xmlsec1-update-config.guess.patch.1
+new file mode 100644
+index 0000000..1b8ea40
+--- /dev/null
++++ b/external/libxmlsec/xmlsec1-update-config.guess.patch.1
+@@ -0,0 +1,1630 @@
++From dd15aae9ce221198be486a6e75d5a42f75ff9de6 Mon Sep 17 00:00:00 2001
++From: David Tardon <dtardon@redhat.com>
++Date: Tue, 13 May 2014 16:35:04 +0200
++Subject: [PATCH] update config.* to support ppc64le
++
++---
++ config.guess | 541 +++++++++++++++++++++++++++++------------------------------
++ config.sub   | 301 ++++++++++++++++++++++-----------
++ 2 files changed, 472 insertions(+), 370 deletions(-)
++
++diff --git a/config.guess b/config.guess
++index da83314..b79252d 100755
++--- a/config.guess
+++++ b/config.guess
++@@ -1,14 +1,12 @@
++ #! /bin/sh
++ # Attempt to guess a canonical system name.
++-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
++-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
++-#   Free Software Foundation, Inc.
+++#   Copyright 1992-2013 Free Software Foundation, Inc.
++ 
++-timestamp='2009-04-27'
+++timestamp='2013-06-10'
++ 
++ # This file is free software; you can redistribute it and/or modify it
++ # under the terms of the GNU General Public License as published by
++-# the Free Software Foundation; either version 2 of the License, or
+++# the Free Software Foundation; either version 3 of the License, or
++ # (at your option) any later version.
++ #
++ # This program is distributed in the hope that it will be useful, but
++@@ -17,26 +15,22 @@ timestamp='2009-04-27'
++ # General Public License for more details.
++ #
++ # You should have received a copy of the GNU General Public License
++-# along with this program; if not, write to the Free Software
++-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
++-# 02110-1301, USA.
+++# along with this program; if not, see <http://www.gnu.org/licenses/>.
++ #
++ # As a special exception to the GNU General Public License, if you
++ # distribute this file as part of a program that contains a
++ # configuration script generated by Autoconf, you may include it under
++-# the same distribution terms that you use for the rest of that program.
++-
++-
++-# Originally written by Per Bothner <per@bothner.com>.
++-# Please send patches to <config-patches@gnu.org>.  Submit a context
++-# diff and a properly formatted ChangeLog entry.
+++# the same distribution terms that you use for the rest of that
+++# program.  This Exception is an additional permission under section 7
+++# of the GNU General Public License, version 3 ("GPLv3").
+++#
+++# Originally written by Per Bothner.
++ #
++-# This script attempts to guess a canonical system name similar to
++-# config.sub.  If it succeeds, it prints the system name on stdout, and
++-# exits with 0.  Otherwise, it exits with 1.
+++# You can get the latest version of this script from:
+++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
++ #
++-# The plan is that this can be called by configure scripts if you
++-# don't specify an explicit build system type.
+++# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+++
++ 
++ me=`echo "$0" | sed -e 's,.*/,,'`
++ 
++@@ -56,8 +50,7 @@ version="\
++ GNU config.guess ($timestamp)
++ 
++ Originally written by Per Bothner.
++-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
++-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+++Copyright 1992-2013 Free Software Foundation, Inc.
++ 
++ This is free software; see the source for copying conditions.  There is NO
++ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++@@ -139,12 +132,33 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
++ UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
++ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
++ 
+++case "${UNAME_SYSTEM}" in
+++Linux|GNU|GNU/*)
+++	# If the system lacks a compiler, then just pick glibc.
+++	# We could probably try harder.
+++	LIBC=gnu
+++
+++	eval $set_cc_for_build
+++	cat <<-EOF > $dummy.c
+++	#include <features.h>
+++	#if defined(__UCLIBC__)
+++	LIBC=uclibc
+++	#elif defined(__dietlibc__)
+++	LIBC=dietlibc
+++	#else
+++	LIBC=gnu
+++	#endif
+++	EOF
+++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+++	;;
+++esac
+++
++ # Note: order is significant - the case branches are not exclusive.
++ 
++ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
++     *:NetBSD:*:*)
++ 	# NetBSD (nbsd) targets should (where applicable) match one or
++-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+++	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
++ 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
++ 	# switched to ELF, *-*-netbsd* would select the old
++ 	# object file format.  This provides both forward
++@@ -170,7 +184,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
++ 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
++ 		eval $set_cc_for_build
++ 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
++-			| grep __ELF__ >/dev/null
+++			| grep -q __ELF__
++ 		then
++ 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
++ 		    # Return netbsd for either.  FIX?
++@@ -180,7 +194,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
++ 		fi
++ 		;;
++ 	    *)
++-	        os=netbsd
+++		os=netbsd
++ 		;;
++ 	esac
++ 	# The OS release
++@@ -201,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
++ 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
++ 	echo "${machine}-${os}${release}"
++ 	exit ;;
+++    *:Bitrig:*:*)
+++	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+++	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+++	exit ;;
++     *:OpenBSD:*:*)
++ 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
++ 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
++@@ -223,7 +241,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
++ 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
++ 		;;
++ 	*5.*)
++-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+++		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
++ 		;;
++ 	esac
++ 	# According to Compaq, /usr/sbin/psrinfo has been available on
++@@ -269,7 +287,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
++ 	# A Xn.n version is an unreleased experimental baselevel.
++ 	# 1.2 uses "1.2" for uname -r.
++ 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
++-	exit ;;
+++	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+++	exitcode=$?
+++	trap '' 0
+++	exit $exitcode ;;
++     Alpha\ *:Windows_NT*:*)
++ 	# How do we know it's Interix rather than the generic POSIX subsystem?
++ 	# Should we change UNAME_MACHINE based on the output of uname instead
++@@ -295,12 +316,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
++ 	echo s390-ibm-zvmoe
++ 	exit ;;
++     *:OS400:*:*)
++-        echo powerpc-ibm-os400
+++	echo powerpc-ibm-os400
++ 	exit ;;
++     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
++ 	echo arm-acorn-riscix${UNAME_RELEASE}
++ 	exit ;;
++-    arm:riscos:*:*|arm:RISCOS:*:*)
+++    arm*:riscos:*:*|arm*:RISCOS:*:*)
++ 	echo arm-unknown-riscos
++ 	exit ;;
++     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
++@@ -333,6 +354,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
++     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
++ 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++ 	exit ;;
+++    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+++	echo i386-pc-auroraux${UNAME_RELEASE}
+++	exit ;;
++     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
++ 	eval $set_cc_for_build
++ 	SUN_ARCH="i386"
++@@ -391,23 +415,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
++     # MiNT.  But MiNT is downward compatible to TOS, so this should
++     # be no problem.
++     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
++-        echo m68k-atari-mint${UNAME_RELEASE}
+++	echo m68k-atari-mint${UNAME_RELEASE}
++ 	exit ;;
++     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
++ 	echo m68k-atari-mint${UNAME_RELEASE}
++-        exit ;;
+++	exit ;;
++     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
++-        echo m68k-atari-mint${UNAME_RELEASE}
+++	echo m68k-atari-mint${UNAME_RELEASE}
++ 	exit ;;
++     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
++-        echo m68k-milan-mint${UNAME_RELEASE}
++-        exit ;;
+++	echo m68k-milan-mint${UNAME_RELEASE}
+++	exit ;;
++     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
++-        echo m68k-hades-mint${UNAME_RELEASE}
++-        exit ;;
+++	echo m68k-hades-mint${UNAME_RELEASE}
+++	exit ;;
++     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
++-        echo m68k-unknown-mint${UNAME_RELEASE}
++-        exit ;;
+++	echo m68k-unknown-mint${UNAME_RELEASE}
+++	exit ;;
++     m68k:machten:*:*)
++ 	echo m68k-apple-machten${UNAME_RELEASE}
++ 	exit ;;
++@@ -477,8 +501,8 @@ EOF
++ 	echo m88k-motorola-sysv3
++ 	exit ;;
++     AViiON:dgux:*:*)
++-        # DG/UX returns AViiON for all architectures
++-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+++	# DG/UX returns AViiON for all architectures
+++	UNAME_PROCESSOR=`/usr/bin/uname -p`
++ 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
++ 	then
++ 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
++@@ -491,7 +515,7 @@ EOF
++ 	else
++ 	    echo i586-dg-dgux${UNAME_RELEASE}
++ 	fi
++- 	exit ;;
+++	exit ;;
++     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
++ 	echo m88k-dolphin-sysv3
++ 	exit ;;
++@@ -548,7 +572,7 @@ EOF
++ 		echo rs6000-ibm-aix3.2
++ 	fi
++ 	exit ;;
++-    *:AIX:*:[456])
+++    *:AIX:*:[4567])
++ 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
++ 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
++ 		IBM_ARCH=rs6000
++@@ -591,52 +615,52 @@ EOF
++ 	    9000/[678][0-9][0-9])
++ 		if [ -x /usr/bin/getconf ]; then
++ 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
++-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
++-                    case "${sc_cpu_version}" in
++-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
++-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
++-                      532)                      # CPU_PA_RISC2_0
++-                        case "${sc_kernel_bits}" in
++-                          32) HP_ARCH="hppa2.0n" ;;
++-                          64) HP_ARCH="hppa2.0w" ;;
+++		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+++		    case "${sc_cpu_version}" in
+++		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+++		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+++		      532)                      # CPU_PA_RISC2_0
+++			case "${sc_kernel_bits}" in
+++			  32) HP_ARCH="hppa2.0n" ;;
+++			  64) HP_ARCH="hppa2.0w" ;;
++ 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
++-                        esac ;;
++-                    esac
+++			esac ;;
+++		    esac
++ 		fi
++ 		if [ "${HP_ARCH}" = "" ]; then
++ 		    eval $set_cc_for_build
++-		    sed 's/^              //' << EOF >$dummy.c
+++		    sed 's/^		//' << EOF >$dummy.c
++ 
++-              #define _HPUX_SOURCE
++-              #include <stdlib.h>
++-              #include <unistd.h>
+++		#define _HPUX_SOURCE
+++		#include <stdlib.h>
+++		#include <unistd.h>
++ 
++-              int main ()
++-              {
++-              #if defined(_SC_KERNEL_BITS)
++-                  long bits = sysconf(_SC_KERNEL_BITS);
++-              #endif
++-                  long cpu  = sysconf (_SC_CPU_VERSION);
+++		int main ()
+++		{
+++		#if defined(_SC_KERNEL_BITS)
+++		    long bits = sysconf(_SC_KERNEL_BITS);
+++		#endif
+++		    long cpu  = sysconf (_SC_CPU_VERSION);
++ 
++-                  switch (cpu)
++-              	{
++-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
++-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
++-              	case CPU_PA_RISC2_0:
++-              #if defined(_SC_KERNEL_BITS)
++-              	    switch (bits)
++-              		{
++-              		case 64: puts ("hppa2.0w"); break;
++-              		case 32: puts ("hppa2.0n"); break;
++-              		default: puts ("hppa2.0"); break;
++-              		} break;
++-              #else  /* !defined(_SC_KERNEL_BITS) */
++-              	    puts ("hppa2.0"); break;
++-              #endif
++-              	default: puts ("hppa1.0"); break;
++-              	}
++-                  exit (0);
++-              }
+++		    switch (cpu)
+++			{
+++			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+++			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+++			case CPU_PA_RISC2_0:
+++		#if defined(_SC_KERNEL_BITS)
+++			    switch (bits)
+++				{
+++				case 64: puts ("hppa2.0w"); break;
+++				case 32: puts ("hppa2.0n"); break;
+++				default: puts ("hppa2.0"); break;
+++				} break;
+++		#else  /* !defined(_SC_KERNEL_BITS) */
+++			    puts ("hppa2.0"); break;
+++		#endif
+++			default: puts ("hppa1.0"); break;
+++			}
+++		    exit (0);
+++		}
++ EOF
++ 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
++ 		    test -z "$HP_ARCH" && HP_ARCH=hppa
++@@ -656,7 +680,7 @@ EOF
++ 	    # => hppa64-hp-hpux11.23
++ 
++ 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
++-		grep __LP64__ >/dev/null
+++		grep -q __LP64__
++ 	    then
++ 		HP_ARCH="hppa2.0w"
++ 	    else
++@@ -727,22 +751,22 @@ EOF
++ 	exit ;;
++     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
++ 	echo c1-convex-bsd
++-        exit ;;
+++	exit ;;
++     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
++ 	if getsysinfo -f scalar_acc
++ 	then echo c32-convex-bsd
++ 	else echo c2-convex-bsd
++ 	fi
++-        exit ;;
+++	exit ;;
++     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
++ 	echo c34-convex-bsd
++-        exit ;;
+++	exit ;;
++     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
++ 	echo c38-convex-bsd
++-        exit ;;
+++	exit ;;
++     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
++ 	echo c4-convex-bsd
++-        exit ;;
+++	exit ;;
++     CRAY*Y-MP:*:*:*)
++ 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++ 	exit ;;
++@@ -766,14 +790,14 @@ EOF
++ 	exit ;;
++     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
++ 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
++-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
++-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++-        exit ;;
+++	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+++	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+++	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+++	exit ;;
++     5000:UNIX_System_V:4.*:*)
++-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
++-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+++	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+++	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+++	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++ 	exit ;;
++     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
++ 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
++@@ -785,34 +809,39 @@ EOF
++ 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
++ 	exit ;;
++     *:FreeBSD:*:*)
++-	case ${UNAME_MACHINE} in
++-	    pc98)
++-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+++	UNAME_PROCESSOR=`/usr/bin/uname -p`
+++	case ${UNAME_PROCESSOR} in
++ 	    amd64)
++ 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++ 	    *)
++-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+++		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++ 	esac
++ 	exit ;;
++     i*:CYGWIN*:*)
++ 	echo ${UNAME_MACHINE}-pc-cygwin
++ 	exit ;;
+++    *:MINGW64*:*)
+++	echo ${UNAME_MACHINE}-pc-mingw64
+++	exit ;;
++     *:MINGW*:*)
++ 	echo ${UNAME_MACHINE}-pc-mingw32
++ 	exit ;;
+++    i*:MSYS*:*)
+++	echo ${UNAME_MACHINE}-pc-msys
+++	exit ;;
++     i*:windows32*:*)
++-    	# uname -m includes "-pc" on this system.
++-    	echo ${UNAME_MACHINE}-mingw32
+++	# uname -m includes "-pc" on this system.
+++	echo ${UNAME_MACHINE}-mingw32
++ 	exit ;;
++     i*:PW*:*)
++ 	echo ${UNAME_MACHINE}-pc-pw32
++ 	exit ;;
++-    *:Interix*:[3456]*)
++-    	case ${UNAME_MACHINE} in
+++    *:Interix*:*)
+++	case ${UNAME_MACHINE} in
++ 	    x86)
++ 		echo i586-pc-interix${UNAME_RELEASE}
++ 		exit ;;
++-	    EM64T | authenticamd | genuineintel)
+++	    authenticamd | genuineintel | EM64T)
++ 		echo x86_64-unknown-interix${UNAME_RELEASE}
++ 		exit ;;
++ 	    IA64)
++@@ -822,6 +851,9 @@ EOF
++     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
++ 	echo i${UNAME_MACHINE}-pc-mks
++ 	exit ;;
+++    8664:Windows_NT:*)
+++	echo x86_64-pc-mks
+++	exit ;;
++     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
++ 	# How do we know it's Interix rather than the generic POSIX subsystem?
++ 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
++@@ -842,210 +874,157 @@ EOF
++ 	exit ;;
++     *:GNU:*:*)
++ 	# the GNU system
++-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+++	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
++ 	exit ;;
++     *:GNU/*:*:*)
++ 	# other systems with GNU libc and userland
++-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+++	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
++ 	exit ;;
++     i*86:Minix:*:*)
++ 	echo ${UNAME_MACHINE}-pc-minix
++ 	exit ;;
+++    aarch64:Linux:*:*)
+++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+++	exit ;;
+++    aarch64_be:Linux:*:*)
+++	UNAME_MACHINE=aarch64_be
+++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+++	exit ;;
+++    alpha:Linux:*:*)
+++	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+++	  EV5)   UNAME_MACHINE=alphaev5 ;;
+++	  EV56)  UNAME_MACHINE=alphaev56 ;;
+++	  PCA56) UNAME_MACHINE=alphapca56 ;;
+++	  PCA57) UNAME_MACHINE=alphapca56 ;;
+++	  EV6)   UNAME_MACHINE=alphaev6 ;;
+++	  EV67)  UNAME_MACHINE=alphaev67 ;;
+++	  EV68*) UNAME_MACHINE=alphaev68 ;;
+++	esac
+++	objdump --private-headers /bin/sh | grep -q ld.so.1
+++	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+++	exit ;;
+++    arc:Linux:*:* | arceb:Linux:*:*)
+++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+++	exit ;;
++     arm*:Linux:*:*)
++ 	eval $set_cc_for_build
++ 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
++ 	    | grep -q __ARM_EABI__
++ 	then
++-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+++	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ 	else
++-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+++	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+++		| grep -q __ARM_PCS_VFP
+++	    then
+++		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+++	    else
+++		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+++	    fi
++ 	fi
++ 	exit ;;
++     avr32*:Linux:*:*)
++-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ 	exit ;;
++     cris:Linux:*:*)
++-	echo cris-axis-linux-gnu
+++	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
++ 	exit ;;
++     crisv32:Linux:*:*)
++-	echo crisv32-axis-linux-gnu
+++	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
++ 	exit ;;
++     frv:Linux:*:*)
++-    	echo frv-unknown-linux-gnu
+++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+++	exit ;;
+++    hexagon:Linux:*:*)
+++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+++	exit ;;
+++    i*86:Linux:*:*)
+++	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
++ 	exit ;;
++     ia64:Linux:*:*)
++-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ 	exit ;;
++     m32r*:Linux:*:*)
++-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ 	exit ;;
++     m68*:Linux:*:*)
++-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ 	exit ;;
++-    mips:Linux:*:*)
++-	eval $set_cc_for_build
++-	sed 's/^	//' << EOF >$dummy.c
++-	#undef CPU
++-	#undef mips
++-	#undef mipsel
++-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
++-	CPU=mipsel
++-	#else
++-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
++-	CPU=mips
++-	#else
++-	CPU=
++-	#endif
++-	#endif
++-EOF
++-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++-	    /^CPU/{
++-		s: ::g
++-		p
++-	    }'`"
++-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
++-	;;
++-    mips64:Linux:*:*)
+++    mips:Linux:*:* | mips64:Linux:*:*)
++ 	eval $set_cc_for_build
++ 	sed 's/^	//' << EOF >$dummy.c
++ 	#undef CPU
++-	#undef mips64
++-	#undef mips64el
+++	#undef ${UNAME_MACHINE}
+++	#undef ${UNAME_MACHINE}el
++ 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
++-	CPU=mips64el
+++	CPU=${UNAME_MACHINE}el
++ 	#else
++ 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
++-	CPU=mips64
+++	CPU=${UNAME_MACHINE}
++ 	#else
++ 	CPU=
++ 	#endif
++ 	#endif
++ EOF
++-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++-	    /^CPU/{
++-		s: ::g
++-		p
++-	    }'`"
++-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
++ 	;;
++-    or32:Linux:*:*)
++-	echo or32-unknown-linux-gnu
++-	exit ;;
++-    ppc:Linux:*:*)
++-	echo powerpc-unknown-linux-gnu
+++    or1k:Linux:*:*)
+++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ 	exit ;;
++-    ppc64:Linux:*:*)
++-	echo powerpc64-unknown-linux-gnu
++-	exit ;;
++-    alpha:Linux:*:*)
++-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++-	  EV5)   UNAME_MACHINE=alphaev5 ;;
++-	  EV56)  UNAME_MACHINE=alphaev56 ;;
++-	  PCA56) UNAME_MACHINE=alphapca56 ;;
++-	  PCA57) UNAME_MACHINE=alphapca56 ;;
++-	  EV6)   UNAME_MACHINE=alphaev6 ;;
++-	  EV67)  UNAME_MACHINE=alphaev67 ;;
++-	  EV68*) UNAME_MACHINE=alphaev68 ;;
++-        esac
++-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
++-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+++    or32:Linux:*:*)
+++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ 	exit ;;
++     padre:Linux:*:*)
++-	echo sparc-unknown-linux-gnu
+++	echo sparc-unknown-linux-${LIBC}
+++	exit ;;
+++    parisc64:Linux:*:* | hppa64:Linux:*:*)
+++	echo hppa64-unknown-linux-${LIBC}
++ 	exit ;;
++     parisc:Linux:*:* | hppa:Linux:*:*)
++ 	# Look for CPU level
++ 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
++-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
++-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
++-	  *)    echo hppa-unknown-linux-gnu ;;
+++	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+++	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+++	  *)    echo hppa-unknown-linux-${LIBC} ;;
++ 	esac
++ 	exit ;;
++-    parisc64:Linux:*:* | hppa64:Linux:*:*)
++-	echo hppa64-unknown-linux-gnu
+++    ppc64:Linux:*:*)
+++	echo powerpc64-unknown-linux-${LIBC}
+++	exit ;;
+++    ppc:Linux:*:*)
+++	echo powerpc-unknown-linux-${LIBC}
+++	exit ;;
+++    ppc64le:Linux:*:*)
+++	echo powerpc64le-unknown-linux-${LIBC}
+++	exit ;;
+++    ppcle:Linux:*:*)
+++	echo powerpcle-unknown-linux-${LIBC}
++ 	exit ;;
++     s390:Linux:*:* | s390x:Linux:*:*)
++-	echo ${UNAME_MACHINE}-ibm-linux
+++	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
++ 	exit ;;
++     sh64*:Linux:*:*)
++-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ 	exit ;;
++     sh*:Linux:*:*)
++-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ 	exit ;;
++     sparc:Linux:*:* | sparc64:Linux:*:*)
++-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+++	exit ;;
+++    tile*:Linux:*:*)
+++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ 	exit ;;
++     vax:Linux:*:*)
++-	echo ${UNAME_MACHINE}-dec-linux-gnu
+++	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
++ 	exit ;;
++     x86_64:Linux:*:*)
++-	echo x86_64-unknown-linux-gnu
+++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ 	exit ;;
++     xtensa*:Linux:*:*)
++-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ 	exit ;;
++-    i*86:Linux:*:*)
++-	# The BFD linker knows what the default object file format is, so
++-	# first see if it will tell us. cd to the root directory to prevent
++-	# problems with other programs or directories called `ld' in the path.
++-	# Set LC_ALL=C to ensure ld outputs messages in English.
++-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
++-			 | sed -ne '/supported targets:/!d
++-				    s/[ 	][ 	]*/ /g
++-				    s/.*supported targets: *//
++-				    s/ .*//
++-				    p'`
++-        case "$ld_supported_targets" in
++-	  elf32-i386)
++-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
++-		;;
++-	  a.out-i386-linux)
++-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
++-		exit ;;
++-	  "")
++-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
++-		# one that does not give us useful --help.
++-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
++-		exit ;;
++-	esac
++-	# Determine whether the default compiler is a.out or elf
++-	eval $set_cc_for_build
++-	sed 's/^	//' << EOF >$dummy.c
++-	#include <features.h>
++-	#ifdef __ELF__
++-	# ifdef __GLIBC__
++-	#  if __GLIBC__ >= 2
++-	LIBC=gnu
++-	#  else
++-	LIBC=gnulibc1
++-	#  endif
++-	# else
++-	LIBC=gnulibc1
++-	# endif
++-	#else
++-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
++-	LIBC=gnu
++-	#else
++-	LIBC=gnuaout
++-	#endif
++-	#endif
++-	#ifdef __dietlibc__
++-	LIBC=dietlibc
++-	#endif
++-EOF
++-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++-	    /^LIBC/{
++-		s: ::g
++-		p
++-	    }'`"
++-	test x"${LIBC}" != x && {
++-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++-		exit
++-	}
++-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
++-	;;
++     i*86:DYNIX/ptx:4*:*)
++ 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
++ 	# earlier versions are messed up and put the nodename in both
++@@ -1053,11 +1032,11 @@ EOF
++ 	echo i386-sequent-sysv4
++ 	exit ;;
++     i*86:UNIX_SV:4.2MP:2.*)
++-        # Unixware is an offshoot of SVR4, but it has its own version
++-        # number series starting with 2...
++-        # I am not positive that other SVR4 systems won't match this,
+++	# Unixware is an offshoot of SVR4, but it has its own version
+++	# number series starting with 2...
+++	# I am not positive that other SVR4 systems won't match this,
++ 	# I just have to hope.  -- rms.
++-        # Use sysv4.2uw... so that sysv4* matches it.
+++	# Use sysv4.2uw... so that sysv4* matches it.
++ 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
++ 	exit ;;
++     i*86:OS/2:*:*)
++@@ -1074,7 +1053,7 @@ EOF
++     i*86:syllable:*:*)
++ 	echo ${UNAME_MACHINE}-pc-syllable
++ 	exit ;;
++-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+++    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
++ 	echo i386-unknown-lynxos${UNAME_RELEASE}
++ 	exit ;;
++     i*86:*DOS:*:*)
++@@ -1089,7 +1068,7 @@ EOF
++ 	fi
++ 	exit ;;
++     i*86:*:5:[678]*)
++-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+++	# UnixWare 7.x, OpenUNIX and OpenServer 6.
++ 	case `/bin/uname -X | grep "^Machine"` in
++ 	    *486*)	     UNAME_MACHINE=i486 ;;
++ 	    *Pentium)	     UNAME_MACHINE=i586 ;;
++@@ -1117,13 +1096,13 @@ EOF
++ 	exit ;;
++     pc:*:*:*)
++ 	# Left here for compatibility:
++-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
++-        # the processor, so we play safe by assuming i586.
+++	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+++	# the processor, so we play safe by assuming i586.
++ 	# Note: whatever this is, it MUST be the same as what config.sub
++ 	# prints for the "djgpp" host, or else GDB configury will decide that
++ 	# this is a cross-build.
++ 	echo i586-pc-msdosdjgpp
++-        exit ;;
+++	exit ;;
++     Intel:Mach:3*:*)
++ 	echo i386-pc-mach3
++ 	exit ;;
++@@ -1158,8 +1137,8 @@ EOF
++ 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
++ 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
++     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
++-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++-          && { echo i486-ncr-sysv4; exit; } ;;
+++	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+++	  && { echo i486-ncr-sysv4; exit; } ;;
++     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
++ 	OS_REL='.3'
++ 	test -r /etc/.relid \
++@@ -1182,7 +1161,7 @@ EOF
++     rs6000:LynxOS:2.*:*)
++ 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
++ 	exit ;;
++-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+++    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
++ 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
++ 	exit ;;
++     SM[BE]S:UNIX_SV:*:*)
++@@ -1202,10 +1181,10 @@ EOF
++ 		echo ns32k-sni-sysv
++ 	fi
++ 	exit ;;
++-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
++-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
++-        echo i586-unisys-sysv4
++-        exit ;;
+++    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+++			# says <Richard.M.Bartel@ccMail.Census.GOV>
+++	echo i586-unisys-sysv4
+++	exit ;;
++     *:UNIX_System_V:4*:FTX*)
++ 	# From Gerald Hewes <hewes@openmarket.com>.
++ 	# How about differentiating between stratus architectures? -djm
++@@ -1231,11 +1210,11 @@ EOF
++ 	exit ;;
++     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
++ 	if [ -d /usr/nec ]; then
++-	        echo mips-nec-sysv${UNAME_RELEASE}
+++		echo mips-nec-sysv${UNAME_RELEASE}
++ 	else
++-	        echo mips-unknown-sysv${UNAME_RELEASE}
+++		echo mips-unknown-sysv${UNAME_RELEASE}
++ 	fi
++-        exit ;;
+++	exit ;;
++     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
++ 	echo powerpc-be-beos
++ 	exit ;;
++@@ -1248,6 +1227,9 @@ EOF
++     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
++ 	echo i586-pc-haiku
++ 	exit ;;
+++    x86_64:Haiku:*:*)
+++	echo x86_64-unknown-haiku
+++	exit ;;
++     SX-4:SUPER-UX:*:*)
++ 	echo sx4-nec-superux${UNAME_RELEASE}
++ 	exit ;;
++@@ -1274,9 +1256,21 @@ EOF
++ 	exit ;;
++     *:Darwin:*:*)
++ 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
++-	case $UNAME_PROCESSOR in
++-	    unknown) UNAME_PROCESSOR=powerpc ;;
++-	esac
+++	eval $set_cc_for_build
+++	if test "$UNAME_PROCESSOR" = unknown ; then
+++	    UNAME_PROCESSOR=powerpc
+++	fi
+++	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+++	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+++		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+++		grep IS_64BIT_ARCH >/dev/null
+++	    then
+++		case $UNAME_PROCESSOR in
+++		    i386) UNAME_PROCESSOR=x86_64 ;;
+++		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
+++		esac
+++	    fi
+++	fi
++ 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
++ 	exit ;;
++     *:procnto*:*:* | *:QNX:[0123456789]*:*)
++@@ -1290,7 +1284,10 @@ EOF
++     *:QNX:*:4*)
++ 	echo i386-pc-qnx
++ 	exit ;;
++-    NSE-?:NONSTOP_KERNEL:*:*)
+++    NEO-?:NONSTOP_KERNEL:*:*)
+++	echo neo-tandem-nsk${UNAME_RELEASE}
+++	exit ;;
+++    NSE-*:NONSTOP_KERNEL:*:*)
++ 	echo nse-tandem-nsk${UNAME_RELEASE}
++ 	exit ;;
++     NSR-?:NONSTOP_KERNEL:*:*)
++@@ -1335,13 +1332,13 @@ EOF
++ 	echo pdp10-unknown-its
++ 	exit ;;
++     SEI:*:*:SEIUX)
++-        echo mips-sei-seiux${UNAME_RELEASE}
+++	echo mips-sei-seiux${UNAME_RELEASE}
++ 	exit ;;
++     *:DragonFly:*:*)
++ 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
++ 	exit ;;
++     *:*VMS:*:*)
++-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+++	UNAME_MACHINE=`(uname -p) 2>/dev/null`
++ 	case "${UNAME_MACHINE}" in
++ 	    A*) echo alpha-dec-vms ; exit ;;
++ 	    I*) echo ia64-dec-vms ; exit ;;
++@@ -1359,11 +1356,11 @@ EOF
++     i*86:AROS:*:*)
++ 	echo ${UNAME_MACHINE}-pc-aros
++ 	exit ;;
+++    x86_64:VMkernel:*:*)
+++	echo ${UNAME_MACHINE}-unknown-esx
+++	exit ;;
++ esac
++ 
++-#echo '(No uname command or uname output not recognized.)' 1>&2
++-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
++-
++ eval $set_cc_for_build
++ cat >$dummy.c <<EOF
++ #ifdef _SEQUENT_
++@@ -1381,11 +1378,11 @@ main ()
++ #include <sys/param.h>
++   printf ("m68k-sony-newsos%s\n",
++ #ifdef NEWSOS4
++-          "4"
+++	"4"
++ #else
++-	  ""
+++	""
++ #endif
++-         ); exit (0);
+++	); exit (0);
++ #endif
++ #endif
++ 
++diff --git a/config.sub b/config.sub
++index 45bad78..d2a9613 100755
++--- a/config.sub
+++++ b/config.sub
++@@ -1,44 +1,40 @@
++ #! /bin/sh
++ # Configuration validation subroutine script.
++-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
++-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
++-#   Free Software Foundation, Inc.
+++#   Copyright 1992-2013 Free Software Foundation, Inc.
++ 
++-timestamp='2009-04-17'
+++timestamp='2013-08-10'
++ 
++-# This file is (in principle) common to ALL GNU software.
++-# The presence of a machine in this file suggests that SOME GNU software
++-# can handle that machine.  It does not imply ALL GNU software can.
++-#
++-# This file is free software; you can redistribute it and/or modify
++-# it under the terms of the GNU General Public License as published by
++-# the Free Software Foundation; either version 2 of the License, or
+++# This file is free software; you can redistribute it and/or modify it
+++# under the terms of the GNU General Public License as published by
+++# the Free Software Foundation; either version 3 of the License, or
++ # (at your option) any later version.
++ #
++-# This program is distributed in the hope that it will be useful,
++-# but WITHOUT ANY WARRANTY; without even the implied warranty of
++-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++-# GNU General Public License for more details.
+++# This program is distributed in the hope that it will be useful, but
+++# WITHOUT ANY WARRANTY; without even the implied warranty of
+++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+++# General Public License for more details.
++ #
++ # You should have received a copy of the GNU General Public License
++-# along with this program; if not, write to the Free Software
++-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
++-# 02110-1301, USA.
+++# along with this program; if not, see <http://www.gnu.org/licenses/>.
++ #
++ # As a special exception to the GNU General Public License, if you
++ # distribute this file as part of a program that contains a
++ # configuration script generated by Autoconf, you may include it under
++-# the same distribution terms that you use for the rest of that program.
+++# the same distribution terms that you use for the rest of that
+++# program.  This Exception is an additional permission under section 7
+++# of the GNU General Public License, version 3 ("GPLv3").
++ 
++ 
++-# Please send patches to <config-patches@gnu.org>.  Submit a context
++-# diff and a properly formatted ChangeLog entry.
+++# Please send patches with a ChangeLog entry to config-patches@gnu.org.
++ #
++ # Configuration subroutine to validate and canonicalize a configuration type.
++ # Supply the specified configuration type as an argument.
++ # If it is invalid, we print an error message on stderr and exit with code 1.
++ # Otherwise, we print the canonical config type on stdout and succeed.
++ 
+++# You can get the latest version of this script from:
+++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+++
++ # This file is supposed to be the same for all GNU packages
++ # and recognize all the CPU types, system types and aliases
++ # that are meaningful with *any* GNU software.
++@@ -72,8 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
++ version="\
++ GNU config.sub ($timestamp)
++ 
++-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
++-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+++Copyright 1992-2013 Free Software Foundation, Inc.
++ 
++ This is free software; see the source for copying conditions.  There is NO
++ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++@@ -120,13 +115,18 @@ esac
++ # Here we must recognize all the valid KERNEL-OS combinations.
++ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
++ case $maybe_os in
++-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
++-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+++  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+++  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+++  knetbsd*-gnu* | netbsd*-gnu* | \
++   kopensolaris*-gnu* | \
++   storm-chaos* | os2-emx* | rtmk-nova*)
++     os=-$maybe_os
++     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
++     ;;
+++  android-linux)
+++    os=-linux-android
+++    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+++    ;;
++   *)
++     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
++     if [ $basic_machine != $1 ]
++@@ -149,10 +149,13 @@ case $os in
++ 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
++ 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
++ 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
++-	-apple | -axis | -knuth | -cray)
+++	-apple | -axis | -knuth | -cray | -microblaze*)
++ 		os=
++ 		basic_machine=$1
++ 		;;
+++	-bluegene*)
+++		os=-cnk
+++		;;
++ 	-sim | -cisco | -oki | -wec | -winbond)
++ 		os=
++ 		basic_machine=$1
++@@ -167,10 +170,10 @@ case $os in
++ 		os=-chorusos
++ 		basic_machine=$1
++ 		;;
++- 	-chorusrdb)
++- 		os=-chorusrdb
+++	-chorusrdb)
+++		os=-chorusrdb
++ 		basic_machine=$1
++- 		;;
+++		;;
++ 	-hiux*)
++ 		os=-hiuxwe2
++ 		;;
++@@ -215,6 +218,12 @@ case $os in
++ 	-isc*)
++ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++ 		;;
+++	-lynx*178)
+++		os=-lynxos178
+++		;;
+++	-lynx*5)
+++		os=-lynxos5
+++		;;
++ 	-lynx*)
++ 		os=-lynxos
++ 		;;
++@@ -239,20 +248,27 @@ case $basic_machine in
++ 	# Some are omitted here because they have special meanings below.
++ 	1750a | 580 \
++ 	| a29k \
+++	| aarch64 | aarch64_be \
++ 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
++ 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
++ 	| am33_2.0 \
++-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+++	| arc | arceb \
+++	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+++	| avr | avr32 \
+++	| be32 | be64 \
++ 	| bfin \
++-	| c4x | clipper \
+++	| c4x | c8051 | clipper \
++ 	| d10v | d30v | dlx | dsp16xx \
+++	| epiphany \
++ 	| fido | fr30 | frv \
++ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+++	| hexagon \
++ 	| i370 | i860 | i960 | ia64 \
++ 	| ip2k | iq2000 \
+++	| le32 | le64 \
++ 	| lm32 \
++ 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
++-	| maxq | mb | microblaze | mcore | mep | metag \
+++	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
++ 	| mips | mipsbe | mipseb | mipsel | mipsle \
++ 	| mips16 \
++ 	| mips64 | mips64el \
++@@ -270,32 +286,45 @@ case $basic_machine in
++ 	| mipsisa64r2 | mipsisa64r2el \
++ 	| mipsisa64sb1 | mipsisa64sb1el \
++ 	| mipsisa64sr71k | mipsisa64sr71kel \
+++	| mipsr5900 | mipsr5900el \
++ 	| mipstx39 | mipstx39el \
++ 	| mn10200 | mn10300 \
++ 	| moxie \
++ 	| mt \
++ 	| msp430 \
++-	| nios | nios2 \
+++	| nds32 | nds32le | nds32be \
+++	| nios | nios2 | nios2eb | nios2el \
++ 	| ns16k | ns32k \
++-	| or32 \
+++	| open8 \
+++	| or1k | or32 \
++ 	| pdp10 | pdp11 | pj | pjl \
++-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+++	| powerpc | powerpc64 | powerpc64le | powerpcle \
++ 	| pyramid \
+++	| rl78 | rx \
++ 	| score \
++ 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
++ 	| sh64 | sh64le \
++ 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
++ 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
++-	| spu | strongarm \
++-	| tahoe | thumb | tic4x | tic80 | tron \
++-	| v850 | v850e \
+++	| spu \
+++	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+++	| ubicom32 \
+++	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
++ 	| we32k \
++-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+++	| x86 | xc16x | xstormy16 | xtensa \
++ 	| z8k | z80)
++ 		basic_machine=$basic_machine-unknown
++ 		;;
++-	m6811 | m68hc11 | m6812 | m68hc12)
++-		# Motorola 68HC11/12.
+++	c54x)
+++		basic_machine=tic54x-unknown
+++		;;
+++	c55x)
+++		basic_machine=tic55x-unknown
+++		;;
+++	c6x)
+++		basic_machine=tic6x-unknown
+++		;;
+++	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
++ 		basic_machine=$basic_machine-unknown
++ 		os=-none
++ 		;;
++@@ -305,6 +334,21 @@ case $basic_machine in
++ 		basic_machine=mt-unknown
++ 		;;
++ 
+++	strongarm | thumb | xscale)
+++		basic_machine=arm-unknown
+++		;;
+++	xgate)
+++		basic_machine=$basic_machine-unknown
+++		os=-none
+++		;;
+++	xscaleeb)
+++		basic_machine=armeb-unknown
+++		;;
+++
+++	xscaleel)
+++		basic_machine=armel-unknown
+++		;;
+++
++ 	# We use `pc' rather than `unknown'
++ 	# because (1) that's what they normally are, and
++ 	# (2) the word "unknown" tends to confuse beginning users.
++@@ -319,25 +363,30 @@ case $basic_machine in
++ 	# Recognize the basic CPU types with company name.
++ 	580-* \
++ 	| a29k-* \
+++	| aarch64-* | aarch64_be-* \
++ 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
++ 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
++-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+++	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
++ 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
++ 	| avr-* | avr32-* \
+++	| be32-* | be64-* \
++ 	| bfin-* | bs2000-* \
++-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
++-	| clipper-* | craynv-* | cydra-* \
+++	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+++	| c8051-* | clipper-* | craynv-* | cydra-* \
++ 	| d10v-* | d30v-* | dlx-* \
++ 	| elxsi-* \
++ 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
++ 	| h8300-* | h8500-* \
++ 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+++	| hexagon-* \
++ 	| i*86-* | i860-* | i960-* | ia64-* \
++ 	| ip2k-* | iq2000-* \
+++	| le32-* | le64-* \
++ 	| lm32-* \
++ 	| m32c-* | m32r-* | m32rle-* \
++ 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
++ 	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+++	| microblaze-* | microblazeel-* \
++ 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
++ 	| mips16-* \
++ 	| mips64-* | mips64el-* \
++@@ -355,28 +404,34 @@ case $basic_machine in
++ 	| mipsisa64r2-* | mipsisa64r2el-* \
++ 	| mipsisa64sb1-* | mipsisa64sb1el-* \
++ 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+++	| mipsr5900-* | mipsr5900el-* \
++ 	| mipstx39-* | mipstx39el-* \
++ 	| mmix-* \
++ 	| mt-* \
++ 	| msp430-* \
++-	| nios-* | nios2-* \
+++	| nds32-* | nds32le-* | nds32be-* \
+++	| nios-* | nios2-* | nios2eb-* | nios2el-* \
++ 	| none-* | np1-* | ns16k-* | ns32k-* \
+++	| open8-* \
++ 	| orion-* \
++ 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
++-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+++	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
++ 	| pyramid-* \
++-	| romp-* | rs6000-* \
+++	| rl78-* | romp-* | rs6000-* | rx-* \
++ 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
++ 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
++ 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
++ 	| sparclite-* \
++-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
++-	| tahoe-* | thumb-* \
++-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+++	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+++	| tahoe-* \
+++	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+++	| tile*-* \
++ 	| tron-* \
++-	| v850-* | v850e-* | vax-* \
+++	| ubicom32-* \
+++	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+++	| vax-* \
++ 	| we32k-* \
++-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+++	| x86-* | x86_64-* | xc16x-* | xps100-* \
++ 	| xstormy16-* | xtensa*-* \
++ 	| ymp-* \
++ 	| z8k-* | z80-*)
++@@ -401,7 +456,7 @@ case $basic_machine in
++ 		basic_machine=a29k-amd
++ 		os=-udi
++ 		;;
++-    	abacus)
+++	abacus)
++ 		basic_machine=abacus-unknown
++ 		;;
++ 	adobe68k)
++@@ -467,11 +522,24 @@ case $basic_machine in
++ 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
++ 		os=-linux
++ 		;;
+++	bluegene*)
+++		basic_machine=powerpc-ibm
+++		os=-cnk
+++		;;
+++	c54x-*)
+++		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+++		;;
+++	c55x-*)
+++		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+++		;;
+++	c6x-*)
+++		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+++		;;
++ 	c90)
++ 		basic_machine=c90-cray
++ 		os=-unicos
++ 		;;
++-        cegcc)
+++	cegcc)
++ 		basic_machine=arm-unknown
++ 		os=-cegcc
++ 		;;
++@@ -503,7 +571,7 @@ case $basic_machine in
++ 		basic_machine=craynv-cray
++ 		os=-unicosmp
++ 		;;
++-	cr16)
+++	cr16 | cr16-*)
++ 		basic_machine=cr16-unknown
++ 		os=-elf
++ 		;;
++@@ -661,7 +729,6 @@ case $basic_machine in
++ 	i370-ibm* | ibm*)
++ 		basic_machine=i370-ibm
++ 		;;
++-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
++ 	i*86v32)
++ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++ 		os=-sysv32
++@@ -719,8 +786,15 @@ case $basic_machine in
++ 		basic_machine=ns32k-utek
++ 		os=-sysv
++ 		;;
+++	microblaze*)
+++		basic_machine=microblaze-xilinx
+++		;;
+++	mingw64)
+++		basic_machine=x86_64-pc
+++		os=-mingw64
+++		;;
++ 	mingw32)
++-		basic_machine=i386-pc
+++		basic_machine=i686-pc
++ 		os=-mingw32
++ 		;;
++ 	mingw32ce)
++@@ -755,10 +829,18 @@ case $basic_machine in
++ 	ms1-*)
++ 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
++ 		;;
+++	msys)
+++		basic_machine=i686-pc
+++		os=-msys
+++		;;
++ 	mvs)
++ 		basic_machine=i370-ibm
++ 		os=-mvs
++ 		;;
+++	nacl)
+++		basic_machine=le32-unknown
+++		os=-nacl
+++		;;
++ 	ncr3000)
++ 		basic_machine=i486-ncr
++ 		os=-sysv4
++@@ -823,6 +905,12 @@ case $basic_machine in
++ 	np1)
++ 		basic_machine=np1-gould
++ 		;;
+++	neo-tandem)
+++		basic_machine=neo-tandem
+++		;;
+++	nse-tandem)
+++		basic_machine=nse-tandem
+++		;;
++ 	nsr-tandem)
++ 		basic_machine=nsr-tandem
++ 		;;
++@@ -905,9 +993,10 @@ case $basic_machine in
++ 		;;
++ 	power)	basic_machine=power-ibm
++ 		;;
++-	ppc)	basic_machine=powerpc-unknown
+++	ppc | ppcbe)	basic_machine=powerpc-unknown
++ 		;;
++-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+++	ppc-* | ppcbe-*)
+++		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
++ 		;;
++ 	ppcle | powerpclittle | ppc-le | powerpc-little)
++ 		basic_machine=powerpcle-unknown
++@@ -917,7 +1006,7 @@ case $basic_machine in
++ 		;;
++ 	ppc64)	basic_machine=powerpc64-unknown
++ 		;;
++-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+++	ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
++ 		;;
++ 	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
++ 		basic_machine=powerpc64le-unknown
++@@ -932,7 +1021,11 @@ case $basic_machine in
++ 		basic_machine=i586-unknown
++ 		os=-pw32
++ 		;;
++-	rdos)
+++	rdos | rdos64)
+++		basic_machine=x86_64-pc
+++		os=-rdos
+++		;;
+++	rdos32)
++ 		basic_machine=i386-pc
++ 		os=-rdos
++ 		;;
++@@ -1001,6 +1094,9 @@ case $basic_machine in
++ 		basic_machine=i860-stratus
++ 		os=-sysv4
++ 		;;
+++	strongarm-* | thumb-*)
+++		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+++		;;
++ 	sun2)
++ 		basic_machine=m68000-sun
++ 		;;
++@@ -1057,20 +1153,8 @@ case $basic_machine in
++ 		basic_machine=t90-cray
++ 		os=-unicos
++ 		;;
++-	tic54x | c54x*)
++-		basic_machine=tic54x-unknown
++-		os=-coff
++-		;;
++-	tic55x | c55x*)
++-		basic_machine=tic55x-unknown
++-		os=-coff
++-		;;
++-	tic6x | c6x*)
++-		basic_machine=tic6x-unknown
++-		os=-coff
++-		;;
++ 	tile*)
++-		basic_machine=tile-unknown
+++		basic_machine=$basic_machine-unknown
++ 		os=-linux-gnu
++ 		;;
++ 	tx39)
++@@ -1140,6 +1224,9 @@ case $basic_machine in
++ 	xps | xps100)
++ 		basic_machine=xps100-honeywell
++ 		;;
+++	xscale-* | xscalee[bl]-*)
+++		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+++		;;
++ 	ymp)
++ 		basic_machine=ymp-cray
++ 		os=-unicos
++@@ -1237,9 +1324,12 @@ esac
++ if [ x"$os" != x"" ]
++ then
++ case $os in
++-        # First match some system type aliases
++-        # that might get confused with valid system types.
+++	# First match some system type aliases
+++	# that might get confused with valid system types.
++ 	# -solaris* is a basic system type, with this one exception.
+++	-auroraux)
+++		os=-auroraux
+++		;;
++ 	-solaris1 | -solaris1.*)
++ 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
++ 		;;
++@@ -1260,22 +1350,23 @@ case $os in
++ 	# Each alternative MUST END IN A *, to match a version number.
++ 	# -sysv* is not here because it comes later, after sysvr4.
++ 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
++-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
++-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
++-	      | -kopensolaris* \
+++	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+++	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+++	      | -sym* | -kopensolaris* | -plan9* \
++ 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
++ 	      | -aos* | -aros* \
++ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
++ 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
++ 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
++-	      | -openbsd* | -solidbsd* \
+++	      | -bitrig* | -openbsd* | -solidbsd* \
++ 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
++ 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
++ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
++ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++ 	      | -chorusos* | -chorusrdb* | -cegcc* \
++-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
++-	      | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
+++	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+++	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+++	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
++ 	      | -uxpv* | -beos* | -mpeix* | -udk* \
++ 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
++ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
++@@ -1283,7 +1374,7 @@ case $os in
++ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
++ 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
++ 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
++-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+++	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
++ 	# Remember, each alternative MUST END IN *, to match a version number.
++ 		;;
++ 	-qnx*)
++@@ -1322,7 +1413,7 @@ case $os in
++ 	-opened*)
++ 		os=-openedition
++ 		;;
++-        -os400*)
+++	-os400*)
++ 		os=-os400
++ 		;;
++ 	-wince*)
++@@ -1371,7 +1462,7 @@ case $os in
++ 	-sinix*)
++ 		os=-sysv4
++ 		;;
++-        -tpf*)
+++	-tpf*)
++ 		os=-tpf
++ 		;;
++ 	-triton*)
++@@ -1407,15 +1498,14 @@ case $os in
++ 	-aros*)
++ 		os=-aros
++ 		;;
++-	-kaos*)
++-		os=-kaos
++-		;;
++ 	-zvmoe)
++ 		os=-zvmoe
++ 		;;
++ 	-dicos*)
++ 		os=-dicos
++ 		;;
+++	-nacl*)
+++		;;
++ 	-none)
++ 		;;
++ 	*)
++@@ -1438,10 +1528,10 @@ else
++ # system, and we'll never get to this point.
++ 
++ case $basic_machine in
++-        score-*)
+++	score-*)
++ 		os=-elf
++ 		;;
++-        spu-*)
+++	spu-*)
++ 		os=-elf
++ 		;;
++ 	*-acorn)
++@@ -1453,8 +1543,23 @@ case $basic_machine in
++ 	arm*-semi)
++ 		os=-aout
++ 		;;
++-        c4x-* | tic4x-*)
++-        	os=-coff
+++	c4x-* | tic4x-*)
+++		os=-coff
+++		;;
+++	c8051-*)
+++		os=-elf
+++		;;
+++	hexagon-*)
+++		os=-elf
+++		;;
+++	tic54x-*)
+++		os=-coff
+++		;;
+++	tic55x-*)
+++		os=-coff
+++		;;
+++	tic6x-*)
+++		os=-coff
++ 		;;
++ 	# This must come before the *-dec entry.
++ 	pdp10-*)
++@@ -1474,14 +1579,11 @@ case $basic_machine in
++ 		;;
++ 	m68000-sun)
++ 		os=-sunos3
++-		# This also exists in the configure program, but was not the
++-		# default.
++-		# os=-sunos4
++ 		;;
++ 	m68*-cisco)
++ 		os=-aout
++ 		;;
++-        mep-*)
+++	mep-*)
++ 		os=-elf
++ 		;;
++ 	mips*-cisco)
++@@ -1490,6 +1592,9 @@ case $basic_machine in
++ 	mips*-*)
++ 		os=-elf
++ 		;;
+++	or1k-*)
+++		os=-elf
+++		;;
++ 	or32-*)
++ 		os=-coff
++ 		;;
++@@ -1508,7 +1613,7 @@ case $basic_machine in
++ 	*-ibm)
++ 		os=-aix
++ 		;;
++-    	*-knuth)
+++	*-knuth)
++ 		os=-mmixware
++ 		;;
++ 	*-wec)
++@@ -1613,7 +1718,7 @@ case $basic_machine in
++ 			-sunos*)
++ 				vendor=sun
++ 				;;
++-			-aix*)
+++			-cnk*|-aix*)
++ 				vendor=ibm
++ 				;;
++ 			-beos*)
++-- 
++1.9.0
++
+-- 
+1.9.0
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 057880d..24152c0 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -309,6 +309,7 @@ Patch48: 0001-Resolves-rhbz-1096486-avoid-access-to-nonexisting-pa.patch
 Patch49: 0001-Resolves-rhbz-1096295-hard-to-distinguish-selected-f.patch
 Patch50: 0001-fdo-78119-find-the-longest-match-for-month-name.patch
 Patch51: 0001-fdo-77242-fix-crash.patch
+Patch52: 0001-update-libxmlsec-config.-to-support-ppc64le.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice