diff -Nru firefox-esr-78.7.0esr/debian/changelog firefox-esr-78.7.0esr/debian/changelog
--- firefox-esr-78.7.0esr/debian/changelog	2021-01-26 23:57:31.000000000 +0000
+++ firefox-esr-78.7.0esr/debian/changelog	2021-02-05 14:38:48.000000000 +0000
@@ -1,3 +1,23 @@
+firefox-esr (78.7.0esr-1+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 60.3.0esr-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 05 Dec 2018 06:56:52 +0000]
+  * Hack broken rust target selection so it produces the right target
+    on raspbian.
+  * Fix clean target.
+
+  [changes introduce in 60.8.0esr-1+rpi1 by Peter Michael Green]
+  * Use a fake homedir for build (Closes: 933757).
+
+  [changes introduced in 68.2.0esr-1+rpi1 by Peter Michael Green]
+  * Disable webrtc, it seems to fail to build on raspbian.
+  * Try to disable Neon
+
+  [changes introduced in 78.3.0esr-2+rpi1 by Peter Michael Green]
+  * Clean up pycache directories.
+  * Disable neon in qcms.
+
+ -- Raspbian forward porter <root@raspbian.org>  Fri, 05 Feb 2021 14:38:48 +0000
+
 firefox-esr (78.7.0esr-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru firefox-esr-78.7.0esr/debian/patches/disable-neon-in-qcms.patch firefox-esr-78.7.0esr/debian/patches/disable-neon-in-qcms.patch
--- firefox-esr-78.7.0esr/debian/patches/disable-neon-in-qcms.patch	1970-01-01 00:00:00.000000000 +0000
+++ firefox-esr-78.7.0esr/debian/patches/disable-neon-in-qcms.patch	2021-02-05 14:38:48.000000000 +0000
@@ -0,0 +1,105 @@
+From: Peter Michael Green <plugwash@raspbian.org>
+Date: Wed, 7 Oct 2020 19:41:49 +0000
+X-Dgit-Generated: 78.3.0esr-2+rpi1 b1f30fd7ea0b729a7bbc7dc1e804e2a0cc0c573a
+Subject: Disable neon in qcms.
+
+
+---
+
+--- firefox-esr-78.3.0esr.orig/gfx/qcms/qcmsint.h
++++ firefox-esr-78.3.0esr/gfx/qcms/qcmsint.h
+@@ -344,18 +344,18 @@ void qcms_transform_data_bgra_out_lut_al
+                                               unsigned char *dest,
+                                               size_t length);
+ 
+-void qcms_transform_data_rgb_out_lut_neon(const qcms_transform *transform,
+-                                          const unsigned char *src,
+-                                          unsigned char *dest,
+-                                          size_t length);
+-void qcms_transform_data_rgba_out_lut_neon(const qcms_transform *transform,
+-                                           const unsigned char *src,
+-                                           unsigned char *dest,
+-                                           size_t length);
+-void qcms_transform_data_bgra_out_lut_neon(const qcms_transform *transform,
+-                                           const unsigned char *src,
+-                                           unsigned char *dest,
+-                                           size_t length);
++//void qcms_transform_data_rgb_out_lut_neon(const qcms_transform *transform,
++//                                          const unsigned char *src,
++//                                          unsigned char *dest,
++//                                          size_t length);
++//void qcms_transform_data_rgba_out_lut_neon(const qcms_transform *transform,
++//                                           const unsigned char *src,
++//                                           unsigned char *dest,
++//                                           size_t length);
++//void qcms_transform_data_bgra_out_lut_neon(const qcms_transform *transform,
++//                                           const unsigned char *src,
++//                                           unsigned char *dest,
++//                                           size_t length);
+ 
+ extern bool qcms_supports_iccv4;
+ extern bool qcms_supports_neon;
+--- firefox-esr-78.3.0esr.orig/gfx/qcms/transform.cpp
++++ firefox-esr-78.3.0esr/gfx/qcms/transform.cpp
+@@ -1240,7 +1240,7 @@ qcms_transform* qcms_transform_create(
+ #endif
+ 		    } else
+ #endif
+-#if defined(__arm__) || defined(__aarch64__)
++#if 0 // defined(__arm__) || defined(__aarch64__)
+                     if (qcms_supports_neon) {
+ 			    if (in_type == QCMS_DATA_RGB_8) {
+ 				    transform->transform_fn = qcms_transform_data_rgb_out_lut_neon;
+--- firefox-esr-78.3.0esr.orig/gfx/tests/gtest/TestQcms.cpp
++++ firefox-esr-78.3.0esr/gfx/tests/gtest/TestQcms.cpp
+@@ -493,11 +493,11 @@ void GfxQcms_ProfilePairBase::TransformP
+     EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgb_out_lut_avx));
+   }
+ #endif
+-#ifdef MOZILLA_MAY_SUPPORT_NEON
+-  if (mozilla::supports_neon()) {
+-    EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgb_out_lut_neon));
+-  }
+-#endif
++//#ifdef MOZILLA_MAY_SUPPORT_NEON
++//  if (mozilla::supports_neon()) {
++//    EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgb_out_lut_neon));
++//  }
++//#endif
+ 
+   // Verify RGBA transforms.
+   ASSERT_TRUE(SetBuffers(QCMS_DATA_RGBA_8));
+@@ -518,11 +518,11 @@ void GfxQcms_ProfilePairBase::TransformP
+     EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgba_out_lut_avx));
+   }
+ #endif
+-#ifdef MOZILLA_MAY_SUPPORT_NEON
+-  if (mozilla::supports_neon()) {
+-    EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgba_out_lut_neon));
+-  }
+-#endif
++//#ifdef MOZILLA_MAY_SUPPORT_NEON
++//  if (mozilla::supports_neon()) {
++//    EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgba_out_lut_neon));
++//  }
++//#endif
+ 
+   // Verify BGRA transforms.
+   ASSERT_TRUE(SetBuffers(QCMS_DATA_BGRA_8));
+@@ -543,11 +543,11 @@ void GfxQcms_ProfilePairBase::TransformP
+     EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_bgra_out_lut_avx));
+   }
+ #endif
+-#ifdef MOZILLA_MAY_SUPPORT_NEON
+-  if (mozilla::supports_neon()) {
+-    EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_bgra_out_lut_neon));
+-  }
+-#endif
++//#ifdef MOZILLA_MAY_SUPPORT_NEON
++//  if (mozilla::supports_neon()) {
++//    EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_bgra_out_lut_neon));
++//  }
++//#endif
+ }
+ 
+ class GfxQcms_sRGB_To_sRGB : public GfxQcms_ProfilePairBase {
diff -Nru firefox-esr-78.7.0esr/debian/patches/raspbian-rust-triplet-hack.patch firefox-esr-78.7.0esr/debian/patches/raspbian-rust-triplet-hack.patch
--- firefox-esr-78.7.0esr/debian/patches/raspbian-rust-triplet-hack.patch	1970-01-01 00:00:00.000000000 +0000
+++ firefox-esr-78.7.0esr/debian/patches/raspbian-rust-triplet-hack.patch	2021-02-05 14:38:48.000000000 +0000
@@ -0,0 +1,33 @@
+Description:  Hack broken rust target selection so it produces the right target on raspbian.
+Author: Peter Michael Green <plugwash@raspbian.org>
+--- firefox-esr-78.3.0esr.orig/build/moz.configure/rust.configure
++++ firefox-esr-78.3.0esr/build/moz.configure/rust.configure
+@@ -192,9 +192,14 @@ def rust_compiler(rustc_info, cargo_info
+ 
+ 
+ @depends(rustc, when=rust_compiler)
++@imports('sys')
++@imports(_from='__builtin__', _import='repr')
+ @imports(_from='__builtin__', _import='ValueError')
+ def rust_supported_targets(rustc):
+     out = check_cmd_output(rustc, '--print', 'target-list').splitlines()
++    #HACK: if there are multiple matches the algorithm uses the last one
++    #put arm-unknown-linux-gnuebihf on the end of the list so it gets preffered
++    out.append('arm-unknown-linux-gnueabihf')
+     data = {}
+     for t in out:
+         try:
+@@ -232,11 +237,13 @@ def rust_triple_alias(host_or_target, ho
+              rust_supported_targets, arm_target, when=rust_compiler)
+     @checking('for rust %s triplet' % host_or_target_str)
+     @imports('os')
++    @imports('sys')
+     @imports(_from='mozbuild.configure.util', _import='LineIO')
+     @imports(_from='mozbuild.shellutil', _import='quote')
+     @imports(_from='six', _import='ensure_binary')
+     @imports(_from='tempfile', _import='mkstemp')
+     @imports(_from='textwrap', _import='dedent')
++    @imports(_from='__builtin__', _import='repr')
+     def rust_target(rustc, host_or_target, compiler_info,
+                     rust_supported_targets, arm_target):
+         # Rust's --target options are similar to, but not exactly the same
diff -Nru firefox-esr-78.7.0esr/debian/patches/series firefox-esr-78.7.0esr/debian/patches/series
--- firefox-esr-78.7.0esr/debian/patches/series	2021-01-26 23:57:06.000000000 +0000
+++ firefox-esr-78.7.0esr/debian/patches/series	2021-02-05 14:38:48.000000000 +0000
@@ -25,3 +25,7 @@
 debian-hacks/Use-build-id-as-langpack-version-for-reproducibility.patch
 debian-hacks/Don-t-build-ICU-in-parallel.patch
 debian-hacks/Allow-to-build-with-older-versions-of-nodejs-10.patch
+raspbian-rust-triplet-hack.patch
+try-to-disable-neon.patch
+try-harder-to-disable-neon.patch
+disable-neon-in-qcms.patch
diff -Nru firefox-esr-78.7.0esr/debian/patches/try-harder-to-disable-neon.patch firefox-esr-78.7.0esr/debian/patches/try-harder-to-disable-neon.patch
--- firefox-esr-78.7.0esr/debian/patches/try-harder-to-disable-neon.patch	1970-01-01 00:00:00.000000000 +0000
+++ firefox-esr-78.7.0esr/debian/patches/try-harder-to-disable-neon.patch	2021-02-05 14:38:48.000000000 +0000
@@ -0,0 +1,21 @@
+From: Peter Michael Green <plugwash@raspbian.org>
+Date: Thu, 7 Nov 2019 11:23:19 +0000
+X-Dgit-Generated: 68.2.0esr-1+rpi1 a8a34a748cbe157a1fb6bfdb2c127ff6ec8416e9
+Subject: Try harder to disable neon.
+
+
+---
+
+--- firefox-esr-68.2.0esr.orig/build/moz.configure/arm.configure
++++ firefox-esr-68.2.0esr/build/moz.configure/arm.configure
+@@ -229,8 +229,8 @@ def build_arm_neon(arm_arch):
+     return arm_arch >= 700
+ 
+ 
+-set_config('BUILD_ARM_NEON', build_arm_neon)
+-set_define('BUILD_ARM_NEON', build_arm_neon)
++#set_config('BUILD_ARM_NEON', build_arm_neon)
++#set_define('BUILD_ARM_NEON', build_arm_neon)
+ 
+ 
+ set_config('ARM_ARCH', depends(arm_target.arm_arch)(lambda x: str(x)))
diff -Nru firefox-esr-78.7.0esr/debian/patches/try-to-disable-neon.patch firefox-esr-78.7.0esr/debian/patches/try-to-disable-neon.patch
--- firefox-esr-78.7.0esr/debian/patches/try-to-disable-neon.patch	1970-01-01 00:00:00.000000000 +0000
+++ firefox-esr-78.7.0esr/debian/patches/try-to-disable-neon.patch	2021-02-05 14:38:48.000000000 +0000
@@ -0,0 +1,12960 @@
+From: Peter Michael Green <plugwash@raspbian.org>
+Date: Thu, 7 Nov 2019 08:48:48 +0000
+X-Dgit-Generated: 68.2.0esr-1+rpi1 be4da04b831a114d84fc719b35cbf9cd4014c464
+Subject: Try to disable neon.
+
+
+---
+
+--- firefox-esr-78.3.0esr.orig/build/moz.configure/arm.configure
++++ firefox-esr-78.3.0esr/build/moz.configure/arm.configure
+@@ -226,7 +226,7 @@ set_define('HAVE_ARM_NEON', have_arm_neo
+ # This matches media/webrtc/trunk/webrtc/build/common.gypi.
+ @depends(arm_target.arm_arch, when=have_arm_neon)
+ def build_arm_neon(arm_arch):
+-    return arm_arch >= 7
++    return arm_arch >= 700
+ 
+ 
+ set_config('BUILD_ARM_NEON', build_arm_neon)
+--- firefox-esr-78.3.0esr.orig/intl/icu/source/config.guess
++++ firefox-esr-78.3.0esr/intl/icu/source/config.guess
+@@ -1,8 +1,8 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-#   Copyright 1992-2017 Free Software Foundation, Inc.
++#   Copyright 1992-2018 Free Software Foundation, Inc.
+ 
+-timestamp='2017-11-07'
++timestamp='2018-02-24'
+ 
+ # 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
+@@ -50,7 +50,7 @@ version="\
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright 1992-2017 Free Software Foundation, Inc.
++Copyright 1992-2018 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."
+@@ -107,9 +107,9 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdi
+ dummy=$tmp/dummy ;
+ tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+ case $CC_FOR_BUILD,$HOST_CC,$CC in
+- ,,)    echo "int x;" > $dummy.c ;
++ ,,)    echo "int x;" > "$dummy.c" ;
+ 	for c in cc gcc c89 c99 ; do
+-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
++	  if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+ 	     CC_FOR_BUILD="$c"; break ;
+ 	  fi ;
+ 	done ;
+@@ -132,14 +132,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+ 
+-case "${UNAME_SYSTEM}" in
++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
++	eval "$set_cc_for_build"
++	cat <<-EOF > "$dummy.c"
+ 	#include <features.h>
+ 	#if defined(__UCLIBC__)
+ 	LIBC=uclibc
+@@ -149,13 +149,20 @@ Linux|GNU|GNU/*)
+ 	LIBC=gnu
+ 	#endif
+ 	EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
++	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
++
++	# If ldd exists, use it to detect musl libc.
++	if command -v ldd >/dev/null && \
++		ldd --version 2>&1 | grep -q ^musl
++	then
++	    LIBC=musl
++	fi
+ 	;;
+ esac
+ 
+ # Note: order is significant - the case branches are not exclusive.
+ 
+-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
++case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
+     *:NetBSD:*:*)
+ 	# NetBSD (nbsd) targets should (where applicable) match one or
+ 	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+@@ -169,30 +176,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 	# portion of the name.  We always set it to "unknown".
+ 	sysctl="sysctl -n hw.machine_arch"
+ 	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+-	    /sbin/$sysctl 2>/dev/null || \
+-	    /usr/sbin/$sysctl 2>/dev/null || \
++	    "/sbin/$sysctl" 2>/dev/null || \
++	    "/usr/sbin/$sysctl" 2>/dev/null || \
+ 	    echo unknown)`
+-	case "${UNAME_MACHINE_ARCH}" in
++	case "$UNAME_MACHINE_ARCH" in
+ 	    armeb) machine=armeb-unknown ;;
+ 	    arm*) machine=arm-unknown ;;
+ 	    sh3el) machine=shl-unknown ;;
+ 	    sh3eb) machine=sh-unknown ;;
+ 	    sh5el) machine=sh5le-unknown ;;
+ 	    earmv*)
+-		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+-		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
+-		machine=${arch}${endian}-unknown
++		arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
++		endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
++		machine="${arch}${endian}"-unknown
+ 		;;
+-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
++	    *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
+ 	esac
+ 	# The Operating System including object format, if it has switched
+ 	# to ELF recently (or will in the future) and ABI.
+-	case "${UNAME_MACHINE_ARCH}" in
++	case "$UNAME_MACHINE_ARCH" in
+ 	    earm*)
+ 		os=netbsdelf
+ 		;;
+ 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+-		eval $set_cc_for_build
++		eval "$set_cc_for_build"
+ 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ 			| grep -q __ELF__
+ 		then
+@@ -208,10 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 		;;
+ 	esac
+ 	# Determine ABI tags.
+-	case "${UNAME_MACHINE_ARCH}" in
++	case "$UNAME_MACHINE_ARCH" in
+ 	    earm*)
+ 		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+-		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
++		abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
+ 		;;
+ 	esac
+ 	# The OS release
+@@ -219,52 +226,55 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 	# thus, need a distinct triplet. However, they do not need
+ 	# kernel version information, so it can be replaced with a
+ 	# suitable tag, in the style of linux-gnu.
+-	case "${UNAME_VERSION}" in
++	case "$UNAME_VERSION" in
+ 	    Debian*)
+ 		release='-gnu'
+ 		;;
+ 	    *)
+-		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
++		release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
+ 		;;
+ 	esac
+ 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+ 	# contains redundant information, the shorter form:
+ 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+-	echo "${machine}-${os}${release}${abi}"
++	echo "$machine-${os}${release}${abi}"
+ 	exit ;;
+     *:Bitrig:*:*)
+ 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+-	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
++	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}
++	echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
+ 	exit ;;
+     *:LibertyBSD:*:*)
+ 	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+-	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
++	echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
+ 	exit ;;
+     *:MidnightBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-midnightbsd${UNAME_RELEASE}
++	echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
+ 	exit ;;
+     *:ekkoBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
++	echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
+ 	exit ;;
+     *:SolidBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
++	echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
+ 	exit ;;
+     macppc:MirBSD:*:*)
+-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
++	echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
+ 	exit ;;
+     *:MirBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
++	echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
+ 	exit ;;
+     *:Sortix:*:*)
+-	echo ${UNAME_MACHINE}-unknown-sortix
++	echo "$UNAME_MACHINE"-unknown-sortix
+ 	exit ;;
+     *:Redox:*:*)
+-	echo ${UNAME_MACHINE}-unknown-redox
++	echo "$UNAME_MACHINE"-unknown-redox
+ 	exit ;;
++    mips:OSF1:*.*)
++        echo mips-dec-osf1
++        exit ;;
+     alpha:OSF1:*:*)
+ 	case $UNAME_RELEASE in
+ 	*4.0)
+@@ -316,7 +326,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 	# A Tn.n version is a released field test version.
+ 	# 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`
++	echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
+ 	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+ 	exitcode=$?
+ 	trap '' 0
+@@ -325,10 +335,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 	echo m68k-unknown-sysv4
+ 	exit ;;
+     *:[Aa]miga[Oo][Ss]:*:*)
+-	echo ${UNAME_MACHINE}-unknown-amigaos
++	echo "$UNAME_MACHINE"-unknown-amigaos
+ 	exit ;;
+     *:[Mm]orph[Oo][Ss]:*:*)
+-	echo ${UNAME_MACHINE}-unknown-morphos
++	echo "$UNAME_MACHINE"-unknown-morphos
+ 	exit ;;
+     *:OS/390:*:*)
+ 	echo i370-ibm-openedition
+@@ -340,7 +350,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 	echo powerpc-ibm-os400
+ 	exit ;;
+     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+-	echo arm-acorn-riscix${UNAME_RELEASE}
++	echo arm-acorn-riscix"$UNAME_RELEASE"
+ 	exit ;;
+     arm*:riscos:*:*|arm*:RISCOS:*:*)
+ 	echo arm-unknown-riscos
+@@ -367,19 +377,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 	    sparc) echo sparc-icl-nx7; exit ;;
+ 	esac ;;
+     s390x:SunOS:*:*)
+-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
+ 	exit ;;
+     sun4H:SunOS:5.*:*)
+-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+ 	exit ;;
+     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
+ 	exit ;;
+     i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+-	echo i386-pc-auroraux${UNAME_RELEASE}
++	echo i386-pc-auroraux"$UNAME_RELEASE"
+ 	exit ;;
+     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+-	eval $set_cc_for_build
++	eval "$set_cc_for_build"
+ 	SUN_ARCH=i386
+ 	# If there is a compiler, see if it is configured for 64-bit objects.
+ 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+@@ -392,13 +402,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 		SUN_ARCH=x86_64
+ 	    fi
+ 	fi
+-	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+ 	exit ;;
+     sun4*:SunOS:6*:*)
+ 	# According to config.sub, this is the proper way to canonicalize
+ 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+ 	# it's likely to be more like Solaris than SunOS4.
+-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+ 	exit ;;
+     sun4*:SunOS:*:*)
+ 	case "`/usr/bin/arch -k`" in
+@@ -407,25 +417,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 		;;
+ 	esac
+ 	# Japanese Language versions have a version number like `4.1.3-JL'.
+-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
++	echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
+ 	exit ;;
+     sun3*:SunOS:*:*)
+-	echo m68k-sun-sunos${UNAME_RELEASE}
++	echo m68k-sun-sunos"$UNAME_RELEASE"
+ 	exit ;;
+     sun*:*:4.2BSD:*)
+ 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+-	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
++	test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
+ 	case "`/bin/arch`" in
+ 	    sun3)
+-		echo m68k-sun-sunos${UNAME_RELEASE}
++		echo m68k-sun-sunos"$UNAME_RELEASE"
+ 		;;
+ 	    sun4)
+-		echo sparc-sun-sunos${UNAME_RELEASE}
++		echo sparc-sun-sunos"$UNAME_RELEASE"
+ 		;;
+ 	esac
+ 	exit ;;
+     aushp:SunOS:*:*)
+-	echo sparc-auspex-sunos${UNAME_RELEASE}
++	echo sparc-auspex-sunos"$UNAME_RELEASE"
+ 	exit ;;
+     # The situation for MiNT is a little confusing.  The machine name
+     # can be virtually everything (everything which is not
+@@ -436,44 +446,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+     # 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}
++	echo m68k-atari-mint"$UNAME_RELEASE"
+ 	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}
++	echo m68k-milan-mint"$UNAME_RELEASE"
+ 	exit ;;
+     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+-	echo m68k-hades-mint${UNAME_RELEASE}
++	echo m68k-hades-mint"$UNAME_RELEASE"
+ 	exit ;;
+     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+-	echo m68k-unknown-mint${UNAME_RELEASE}
++	echo m68k-unknown-mint"$UNAME_RELEASE"
+ 	exit ;;
+     m68k:machten:*:*)
+-	echo m68k-apple-machten${UNAME_RELEASE}
++	echo m68k-apple-machten"$UNAME_RELEASE"
+ 	exit ;;
+     powerpc:machten:*:*)
+-	echo powerpc-apple-machten${UNAME_RELEASE}
++	echo powerpc-apple-machten"$UNAME_RELEASE"
+ 	exit ;;
+     RISC*:Mach:*:*)
+ 	echo mips-dec-mach_bsd4.3
+ 	exit ;;
+     RISC*:ULTRIX:*:*)
+-	echo mips-dec-ultrix${UNAME_RELEASE}
++	echo mips-dec-ultrix"$UNAME_RELEASE"
+ 	exit ;;
+     VAX*:ULTRIX*:*:*)
+-	echo vax-dec-ultrix${UNAME_RELEASE}
++	echo vax-dec-ultrix"$UNAME_RELEASE"
+ 	exit ;;
+     2020:CLIX:*:* | 2430:CLIX:*:*)
+-	echo clipper-intergraph-clix${UNAME_RELEASE}
++	echo clipper-intergraph-clix"$UNAME_RELEASE"
+ 	exit ;;
+     mips:*:*:UMIPS | mips:*:*:RISCos)
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
++	eval "$set_cc_for_build"
++	sed 's/^	//' << EOF > "$dummy.c"
+ #ifdef __cplusplus
+ #include <stdio.h>  /* for printf() prototype */
+ 	int main (int argc, char *argv[]) {
+@@ -494,11 +504,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 	  exit (-1);
+ 	}
+ EOF
+-	$CC_FOR_BUILD -o $dummy $dummy.c &&
+-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+-	  SYSTEM_NAME=`$dummy $dummyarg` &&
++	$CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
++	  dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
++	  SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
+ 	    { echo "$SYSTEM_NAME"; exit; }
+-	echo mips-mips-riscos${UNAME_RELEASE}
++	echo mips-mips-riscos"$UNAME_RELEASE"
+ 	exit ;;
+     Motorola:PowerMAX_OS:*:*)
+ 	echo powerpc-motorola-powermax
+@@ -524,17 +534,17 @@ EOF
+     AViiON:dgux:*:*)
+ 	# DG/UX returns AViiON for all architectures
+ 	UNAME_PROCESSOR=`/usr/bin/uname -p`
+-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
++	if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
+ 	then
+-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
++	    if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
++	       [ "$TARGET_BINARY_INTERFACE"x = x ]
+ 	    then
+-		echo m88k-dg-dgux${UNAME_RELEASE}
++		echo m88k-dg-dgux"$UNAME_RELEASE"
+ 	    else
+-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
++		echo m88k-dg-dguxbcs"$UNAME_RELEASE"
+ 	    fi
+ 	else
+-	    echo i586-dg-dgux${UNAME_RELEASE}
++	    echo i586-dg-dgux"$UNAME_RELEASE"
+ 	fi
+ 	exit ;;
+     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+@@ -551,7 +561,7 @@ EOF
+ 	echo m68k-tektronix-bsd
+ 	exit ;;
+     *:IRIX*:*:*)
+-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
++	echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
+ 	exit ;;
+     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+ 	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+@@ -563,14 +573,14 @@ EOF
+ 	if [ -x /usr/bin/oslevel ] ; then
+ 		IBM_REV=`/usr/bin/oslevel`
+ 	else
+-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
+ 	fi
+-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
++	echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
+ 	exit ;;
+     *:AIX:2:3)
+ 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+-		eval $set_cc_for_build
+-		sed 's/^		//' << EOF >$dummy.c
++		eval "$set_cc_for_build"
++		sed 's/^		//' << EOF > "$dummy.c"
+ 		#include <sys/systemcfg.h>
+ 
+ 		main()
+@@ -581,7 +591,7 @@ EOF
+ 			exit(0);
+ 			}
+ EOF
+-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
++		if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
+ 		then
+ 			echo "$SYSTEM_NAME"
+ 		else
+@@ -595,7 +605,7 @@ EOF
+ 	exit ;;
+     *: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
++	if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
+ 		IBM_ARCH=rs6000
+ 	else
+ 		IBM_ARCH=powerpc
+@@ -604,9 +614,9 @@ EOF
+ 		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+ 			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
+ 	else
+-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
+ 	fi
+-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
++	echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
+ 	exit ;;
+     *:AIX:*:*)
+ 	echo rs6000-ibm-aix
+@@ -615,7 +625,7 @@ EOF
+ 	echo romp-ibm-bsd4.4
+ 	exit ;;
+     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
++	echo romp-ibm-bsd"$UNAME_RELEASE"   # 4.3 with uname added to
+ 	exit ;;                             # report: romp-ibm BSD 4.3
+     *:BOSX:*:*)
+ 	echo rs6000-bull-bosx
+@@ -630,28 +640,28 @@ EOF
+ 	echo m68k-hp-bsd4.4
+ 	exit ;;
+     9000/[34678]??:HP-UX:*:*)
+-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+-	case "${UNAME_MACHINE}" in
++	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
++	case "$UNAME_MACHINE" in
+ 	    9000/31?)            HP_ARCH=m68000 ;;
+ 	    9000/[34]??)         HP_ARCH=m68k ;;
+ 	    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
++		    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
++			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
+ 		fi
+-		if [ "${HP_ARCH}" = "" ]; then
+-		    eval $set_cc_for_build
+-		    sed 's/^		//' << EOF >$dummy.c
++		if [ "$HP_ARCH" = "" ]; then
++		    eval "$set_cc_for_build"
++		    sed 's/^		//' << EOF > "$dummy.c"
+ 
+ 		#define _HPUX_SOURCE
+ 		#include <stdlib.h>
+@@ -684,13 +694,13 @@ EOF
+ 		    exit (0);
+ 		}
+ EOF
+-		    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
++		    (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
+ 		    test -z "$HP_ARCH" && HP_ARCH=hppa
+ 		fi ;;
+ 	esac
+-	if [ ${HP_ARCH} = hppa2.0w ]
++	if [ "$HP_ARCH" = hppa2.0w ]
+ 	then
+-	    eval $set_cc_for_build
++	    eval "$set_cc_for_build"
+ 
+ 	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+ 	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+@@ -709,15 +719,15 @@ EOF
+ 		HP_ARCH=hppa64
+ 	    fi
+ 	fi
+-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
++	echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
+ 	exit ;;
+     ia64:HP-UX:*:*)
+-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+-	echo ia64-hp-hpux${HPUX_REV}
++	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
++	echo ia64-hp-hpux"$HPUX_REV"
+ 	exit ;;
+     3050*:HI-UX:*:*)
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
++	eval "$set_cc_for_build"
++	sed 's/^	//' << EOF > "$dummy.c"
+ 	#include <unistd.h>
+ 	int
+ 	main ()
+@@ -742,7 +752,7 @@ EOF
+ 	  exit (0);
+ 	}
+ EOF
+-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
++	$CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
+ 		{ echo "$SYSTEM_NAME"; exit; }
+ 	echo unknown-hitachi-hiuxwe2
+ 	exit ;;
+@@ -763,9 +773,9 @@ EOF
+ 	exit ;;
+     i*86:OSF1:*:*)
+ 	if [ -x /usr/sbin/sysversion ] ; then
+-	    echo ${UNAME_MACHINE}-unknown-osf1mk
++	    echo "$UNAME_MACHINE"-unknown-osf1mk
+ 	else
+-	    echo ${UNAME_MACHINE}-unknown-osf1
++	    echo "$UNAME_MACHINE"-unknown-osf1
+ 	fi
+ 	exit ;;
+     parisc*:Lites*:*:*)
+@@ -790,109 +800,109 @@ EOF
+ 	echo c4-convex-bsd
+ 	exit ;;
+     CRAY*Y-MP:*:*:*)
+-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+ 	exit ;;
+     CRAY*[A-Z]90:*:*:*)
+-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
++	echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
+ 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+ 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+ 	      -e 's/\.[^.]*$/.X/'
+ 	exit ;;
+     CRAY*TS:*:*:*)
+-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+ 	exit ;;
+     CRAY*T3E:*:*:*)
+-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+ 	exit ;;
+     CRAY*SV1:*:*:*)
+-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+ 	exit ;;
+     *:UNICOS/mp:*:*)
+-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+ 	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/ /_/'`
++	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/ /_/'`
++	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}
++	echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
+ 	exit ;;
+     sparc*:BSD/OS:*:*)
+-	echo sparc-unknown-bsdi${UNAME_RELEASE}
++	echo sparc-unknown-bsdi"$UNAME_RELEASE"
+ 	exit ;;
+     *:BSD/OS:*:*)
+-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
++	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
+ 	exit ;;
+     *:FreeBSD:*:*)
+ 	UNAME_PROCESSOR=`/usr/bin/uname -p`
+-	case ${UNAME_PROCESSOR} in
++	case "$UNAME_PROCESSOR" in
+ 	    amd64)
+ 		UNAME_PROCESSOR=x86_64 ;;
+ 	    i386)
+ 		UNAME_PROCESSOR=i586 ;;
+ 	esac
+-	echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
++	echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
+ 	exit ;;
+     i*:CYGWIN*:*)
+-	echo ${UNAME_MACHINE}-pc-cygwin
++	echo "$UNAME_MACHINE"-pc-cygwin
+ 	exit ;;
+     *:MINGW64*:*)
+-	echo ${UNAME_MACHINE}-pc-mingw64
++	echo "$UNAME_MACHINE"-pc-mingw64
+ 	exit ;;
+     *:MINGW*:*)
+-	echo ${UNAME_MACHINE}-pc-mingw32
++	echo "$UNAME_MACHINE"-pc-mingw32
+ 	exit ;;
+     *:MSYS*:*)
+-	echo ${UNAME_MACHINE}-pc-msys
++	echo "$UNAME_MACHINE"-pc-msys
+ 	exit ;;
+     i*:PW*:*)
+-	echo ${UNAME_MACHINE}-pc-pw32
++	echo "$UNAME_MACHINE"-pc-pw32
+ 	exit ;;
+     *:Interix*:*)
+-	case ${UNAME_MACHINE} in
++	case "$UNAME_MACHINE" in
+ 	    x86)
+-		echo i586-pc-interix${UNAME_RELEASE}
++		echo i586-pc-interix"$UNAME_RELEASE"
+ 		exit ;;
+ 	    authenticamd | genuineintel | EM64T)
+-		echo x86_64-unknown-interix${UNAME_RELEASE}
++		echo x86_64-unknown-interix"$UNAME_RELEASE"
+ 		exit ;;
+ 	    IA64)
+-		echo ia64-unknown-interix${UNAME_RELEASE}
++		echo ia64-unknown-interix"$UNAME_RELEASE"
+ 		exit ;;
+ 	esac ;;
+     i*:UWIN*:*)
+-	echo ${UNAME_MACHINE}-pc-uwin
++	echo "$UNAME_MACHINE"-pc-uwin
+ 	exit ;;
+     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ 	echo x86_64-unknown-cygwin
+ 	exit ;;
+     prep*:SunOS:5.*:*)
+-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+ 	exit ;;
+     *:GNU:*:*)
+ 	# the GNU system
+-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`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 "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
++	echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
+ 	exit ;;
+     i*86:Minix:*:*)
+-	echo ${UNAME_MACHINE}-pc-minix
++	echo "$UNAME_MACHINE"-pc-minix
+ 	exit ;;
+     aarch64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     aarch64_be:Linux:*:*)
+ 	UNAME_MACHINE=aarch64_be
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     alpha:Linux:*:*)
+ 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+@@ -906,63 +916,63 @@ EOF
+ 	esac
+ 	objdump --private-headers /bin/sh | grep -q ld.so.1
+ 	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     arc:Linux:*:* | arceb:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     arm*:Linux:*:*)
+-	eval $set_cc_for_build
++	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-${LIBC}
++	    echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	else
+ 	    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
++		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
+ 	    else
+-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
++		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
+ 	    fi
+ 	fi
+ 	exit ;;
+     avr32*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     cris:Linux:*:*)
+-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
++	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
+ 	exit ;;
+     crisv32:Linux:*:*)
+-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
++	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
+ 	exit ;;
+     e2k:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     frv:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     hexagon:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     i*86:Linux:*:*)
+-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
++	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+ 	exit ;;
+     ia64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     k1om:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     m32r*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     m68*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     mips:Linux:*:* | mips64:Linux:*:*)
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
++	eval "$set_cc_for_build"
++	sed 's/^	//' << EOF > "$dummy.c"
+ 	#undef CPU
+ 	#undef ${UNAME_MACHINE}
+ 	#undef ${UNAME_MACHINE}el
+@@ -976,70 +986,74 @@ EOF
+ 	#endif
+ 	#endif
+ EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
++	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
++	test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
+ 	;;
+     mips64el:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     openrisc*:Linux:*:*)
+-	echo or1k-unknown-linux-${LIBC}
++	echo or1k-unknown-linux-"$LIBC"
+ 	exit ;;
+     or32:Linux:*:* | or1k*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     padre:Linux:*:*)
+-	echo sparc-unknown-linux-${LIBC}
++	echo sparc-unknown-linux-"$LIBC"
+ 	exit ;;
+     parisc64:Linux:*:* | hppa64:Linux:*:*)
+-	echo hppa64-unknown-linux-${LIBC}
++	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-${LIBC} ;;
+-	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+-	  *)    echo hppa-unknown-linux-${LIBC} ;;
++	  PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
++	  PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
++	  *)    echo hppa-unknown-linux-"$LIBC" ;;
+ 	esac
+ 	exit ;;
+     ppc64:Linux:*:*)
+-	echo powerpc64-unknown-linux-${LIBC}
++	echo powerpc64-unknown-linux-"$LIBC"
+ 	exit ;;
+     ppc:Linux:*:*)
+-	echo powerpc-unknown-linux-${LIBC}
++	echo powerpc-unknown-linux-"$LIBC"
+ 	exit ;;
+     ppc64le:Linux:*:*)
+-	echo powerpc64le-unknown-linux-${LIBC}
++	echo powerpc64le-unknown-linux-"$LIBC"
+ 	exit ;;
+     ppcle:Linux:*:*)
+-	echo powerpcle-unknown-linux-${LIBC}
++	echo powerpcle-unknown-linux-"$LIBC"
+ 	exit ;;
+     riscv32:Linux:*:* | riscv64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     s390:Linux:*:* | s390x:Linux:*:*)
+-	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
++	echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
+ 	exit ;;
+     sh64*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     sh*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     sparc:Linux:*:* | sparc64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     tile*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     vax:Linux:*:*)
+-	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
++	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
+ 	exit ;;
+     x86_64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
++	if objdump -f /bin/sh | grep -q elf32-x86-64; then
++	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
++	else
++	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
++	fi
+ 	exit ;;
+     xtensa*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     i*86:DYNIX/ptx:4*:*)
+ 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+@@ -1053,34 +1067,34 @@ EOF
+ 	# 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.
+-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
++	echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
+ 	exit ;;
+     i*86:OS/2:*:*)
+ 	# If we were able to find `uname', then EMX Unix compatibility
+ 	# is probably installed.
+-	echo ${UNAME_MACHINE}-pc-os2-emx
++	echo "$UNAME_MACHINE"-pc-os2-emx
+ 	exit ;;
+     i*86:XTS-300:*:STOP)
+-	echo ${UNAME_MACHINE}-unknown-stop
++	echo "$UNAME_MACHINE"-unknown-stop
+ 	exit ;;
+     i*86:atheos:*:*)
+-	echo ${UNAME_MACHINE}-unknown-atheos
++	echo "$UNAME_MACHINE"-unknown-atheos
+ 	exit ;;
+     i*86:syllable:*:*)
+-	echo ${UNAME_MACHINE}-pc-syllable
++	echo "$UNAME_MACHINE"-pc-syllable
+ 	exit ;;
+     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+-	echo i386-unknown-lynxos${UNAME_RELEASE}
++	echo i386-unknown-lynxos"$UNAME_RELEASE"
+ 	exit ;;
+     i*86:*DOS:*:*)
+-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
++	echo "$UNAME_MACHINE"-pc-msdosdjgpp
+ 	exit ;;
+     i*86:*:4.*:*)
+-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
++	UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
+ 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
++		echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
+ 	else
+-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
++		echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
+ 	fi
+ 	exit ;;
+     i*86:*:5:[678]*)
+@@ -1090,12 +1104,12 @@ EOF
+ 	    *Pentium)	     UNAME_MACHINE=i586 ;;
+ 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+ 	esac
+-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
++	echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
+ 	exit ;;
+     i*86:*:3.2:*)
+ 	if test -f /usr/options/cb.name; then
+ 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
++		echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
+ 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+ 		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+ 		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+@@ -1105,9 +1119,9 @@ EOF
+ 			&& UNAME_MACHINE=i686
+ 		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+ 			&& UNAME_MACHINE=i686
+-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
++		echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
+ 	else
+-		echo ${UNAME_MACHINE}-pc-sysv32
++		echo "$UNAME_MACHINE"-pc-sysv32
+ 	fi
+ 	exit ;;
+     pc:*:*:*)
+@@ -1127,9 +1141,9 @@ EOF
+ 	exit ;;
+     i860:*:4.*:*) # i860-SVR4
+ 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
++	  echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
+ 	else # Add other i860-SVR4 vendors below as they are discovered.
+-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
++	  echo i860-unknown-sysv"$UNAME_RELEASE"  # Unknown i860-SVR4
+ 	fi
+ 	exit ;;
+     mini*:CTIX:SYS*5:*)
+@@ -1149,9 +1163,9 @@ EOF
+ 	test -r /etc/.relid \
+ 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
++	  && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
+ 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
++	  && { 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; } ;;
+@@ -1160,28 +1174,28 @@ EOF
+ 	test -r /etc/.relid \
+ 	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+-	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
++	    && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
+ 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
++	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
+ 	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
++	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
+     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+-	echo m68k-unknown-lynxos${UNAME_RELEASE}
++	echo m68k-unknown-lynxos"$UNAME_RELEASE"
+ 	exit ;;
+     mc68030:UNIX_System_V:4.*:*)
+ 	echo m68k-atari-sysv4
+ 	exit ;;
+     TSUNAMI:LynxOS:2.*:*)
+-	echo sparc-unknown-lynxos${UNAME_RELEASE}
++	echo sparc-unknown-lynxos"$UNAME_RELEASE"
+ 	exit ;;
+     rs6000:LynxOS:2.*:*)
+-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
++	echo rs6000-unknown-lynxos"$UNAME_RELEASE"
+ 	exit ;;
+     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
++	echo powerpc-unknown-lynxos"$UNAME_RELEASE"
+ 	exit ;;
+     SM[BE]S:UNIX_SV:*:*)
+-	echo mips-dde-sysv${UNAME_RELEASE}
++	echo mips-dde-sysv"$UNAME_RELEASE"
+ 	exit ;;
+     RM*:ReliantUNIX-*:*:*)
+ 	echo mips-sni-sysv4
+@@ -1192,7 +1206,7 @@ EOF
+     *:SINIX-*:*:*)
+ 	if uname -p 2>/dev/null >/dev/null ; then
+ 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+-		echo ${UNAME_MACHINE}-sni-sysv4
++		echo "$UNAME_MACHINE"-sni-sysv4
+ 	else
+ 		echo ns32k-sni-sysv
+ 	fi
+@@ -1212,23 +1226,23 @@ EOF
+ 	exit ;;
+     i*86:VOS:*:*)
+ 	# From Paul.Green@stratus.com.
+-	echo ${UNAME_MACHINE}-stratus-vos
++	echo "$UNAME_MACHINE"-stratus-vos
+ 	exit ;;
+     *:VOS:*:*)
+ 	# From Paul.Green@stratus.com.
+ 	echo hppa1.1-stratus-vos
+ 	exit ;;
+     mc68*:A/UX:*:*)
+-	echo m68k-apple-aux${UNAME_RELEASE}
++	echo m68k-apple-aux"$UNAME_RELEASE"
+ 	exit ;;
+     news*:NEWS-OS:6*:*)
+ 	echo mips-sony-newsos6
+ 	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 ;;
+     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+@@ -1247,39 +1261,39 @@ EOF
+ 	echo x86_64-unknown-haiku
+ 	exit ;;
+     SX-4:SUPER-UX:*:*)
+-	echo sx4-nec-superux${UNAME_RELEASE}
++	echo sx4-nec-superux"$UNAME_RELEASE"
+ 	exit ;;
+     SX-5:SUPER-UX:*:*)
+-	echo sx5-nec-superux${UNAME_RELEASE}
++	echo sx5-nec-superux"$UNAME_RELEASE"
+ 	exit ;;
+     SX-6:SUPER-UX:*:*)
+-	echo sx6-nec-superux${UNAME_RELEASE}
++	echo sx6-nec-superux"$UNAME_RELEASE"
+ 	exit ;;
+     SX-7:SUPER-UX:*:*)
+-	echo sx7-nec-superux${UNAME_RELEASE}
++	echo sx7-nec-superux"$UNAME_RELEASE"
+ 	exit ;;
+     SX-8:SUPER-UX:*:*)
+-	echo sx8-nec-superux${UNAME_RELEASE}
++	echo sx8-nec-superux"$UNAME_RELEASE"
+ 	exit ;;
+     SX-8R:SUPER-UX:*:*)
+-	echo sx8r-nec-superux${UNAME_RELEASE}
++	echo sx8r-nec-superux"$UNAME_RELEASE"
+ 	exit ;;
+     SX-ACE:SUPER-UX:*:*)
+-	echo sxace-nec-superux${UNAME_RELEASE}
++	echo sxace-nec-superux"$UNAME_RELEASE"
+ 	exit ;;
+     Power*:Rhapsody:*:*)
+-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
++	echo powerpc-apple-rhapsody"$UNAME_RELEASE"
+ 	exit ;;
+     *:Rhapsody:*:*)
+-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
++	echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
+ 	exit ;;
+     *:Darwin:*:*)
+ 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+-	eval $set_cc_for_build
++	eval "$set_cc_for_build"
+ 	if test "$UNAME_PROCESSOR" = unknown ; then
+ 	    UNAME_PROCESSOR=powerpc
+ 	fi
+-	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
++	if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
+ 	    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) | \
+@@ -1307,7 +1321,7 @@ EOF
+ 	    # that Apple uses in portable devices.
+ 	    UNAME_PROCESSOR=x86_64
+ 	fi
+-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
++	echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
+ 	exit ;;
+     *:procnto*:*:* | *:QNX:[0123456789]*:*)
+ 	UNAME_PROCESSOR=`uname -p`
+@@ -1315,22 +1329,25 @@ EOF
+ 		UNAME_PROCESSOR=i386
+ 		UNAME_MACHINE=pc
+ 	fi
+-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
++	echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
+ 	exit ;;
+     *:QNX:*:4*)
+ 	echo i386-pc-qnx
+ 	exit ;;
+     NEO-*:NONSTOP_KERNEL:*:*)
+-	echo neo-tandem-nsk${UNAME_RELEASE}
++	echo neo-tandem-nsk"$UNAME_RELEASE"
+ 	exit ;;
+     NSE-*:NONSTOP_KERNEL:*:*)
+-	echo nse-tandem-nsk${UNAME_RELEASE}
++	echo nse-tandem-nsk"$UNAME_RELEASE"
+ 	exit ;;
+     NSR-*:NONSTOP_KERNEL:*:*)
+-	echo nsr-tandem-nsk${UNAME_RELEASE}
++	echo nsr-tandem-nsk"$UNAME_RELEASE"
++	exit ;;
++    NSV-*:NONSTOP_KERNEL:*:*)
++	echo nsv-tandem-nsk"$UNAME_RELEASE"
+ 	exit ;;
+     NSX-*:NONSTOP_KERNEL:*:*)
+-	echo nsx-tandem-nsk${UNAME_RELEASE}
++	echo nsx-tandem-nsk"$UNAME_RELEASE"
+ 	exit ;;
+     *:NonStop-UX:*:*)
+ 	echo mips-compaq-nonstopux
+@@ -1339,7 +1356,7 @@ EOF
+ 	echo bs2000-siemens-sysv
+ 	exit ;;
+     DS/*:UNIX_System_V:*:*)
+-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
++	echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
+ 	exit ;;
+     *:Plan9:*:*)
+ 	# "uname -m" is not consistent, so use $cputype instead. 386
+@@ -1350,7 +1367,7 @@ EOF
+ 	else
+ 	    UNAME_MACHINE="$cputype"
+ 	fi
+-	echo ${UNAME_MACHINE}-unknown-plan9
++	echo "$UNAME_MACHINE"-unknown-plan9
+ 	exit ;;
+     *:TOPS-10:*:*)
+ 	echo pdp10-unknown-tops10
+@@ -1371,14 +1388,14 @@ 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/[-(].*//'`
++	echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
+ 	exit ;;
+     *:*VMS:*:*)
+ 	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+-	case "${UNAME_MACHINE}" in
++	case "$UNAME_MACHINE" in
+ 	    A*) echo alpha-dec-vms ; exit ;;
+ 	    I*) echo ia64-dec-vms ; exit ;;
+ 	    V*) echo vax-dec-vms ; exit ;;
+@@ -1387,16 +1404,16 @@ EOF
+ 	echo i386-pc-xenix
+ 	exit ;;
+     i*86:skyos:*:*)
+-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
++	echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
+ 	exit ;;
+     i*86:rdos:*:*)
+-	echo ${UNAME_MACHINE}-pc-rdos
++	echo "$UNAME_MACHINE"-pc-rdos
+ 	exit ;;
+     i*86:AROS:*:*)
+-	echo ${UNAME_MACHINE}-pc-aros
++	echo "$UNAME_MACHINE"-pc-aros
+ 	exit ;;
+     x86_64:VMkernel:*:*)
+-	echo ${UNAME_MACHINE}-unknown-esx
++	echo "$UNAME_MACHINE"-unknown-esx
+ 	exit ;;
+     amd64:Isilon\ OneFS:*:*)
+ 	echo x86_64-unknown-onefs
+@@ -1405,7 +1422,7 @@ esac
+ 
+ echo "$0: unable to guess system type" >&2
+ 
+-case "${UNAME_MACHINE}:${UNAME_SYSTEM}" in
++case "$UNAME_MACHINE:$UNAME_SYSTEM" in
+     mips:Linux | mips64:Linux)
+ 	# If we got here on MIPS GNU/Linux, output extra information.
+ 	cat >&2 <<EOF
+@@ -1447,10 +1464,10 @@ hostinfo               = `(hostinfo) 2>/
+ /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+ /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+ 
+-UNAME_MACHINE = ${UNAME_MACHINE}
+-UNAME_RELEASE = ${UNAME_RELEASE}
+-UNAME_SYSTEM  = ${UNAME_SYSTEM}
+-UNAME_VERSION = ${UNAME_VERSION}
++UNAME_MACHINE = "$UNAME_MACHINE"
++UNAME_RELEASE = "$UNAME_RELEASE"
++UNAME_SYSTEM  = "$UNAME_SYSTEM"
++UNAME_VERSION = "$UNAME_VERSION"
+ EOF
+ 
+ exit 1
+--- firefox-esr-78.3.0esr.orig/intl/icu/source/config.sub
++++ firefox-esr-78.3.0esr/intl/icu/source/config.sub
+@@ -1,8 +1,8 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+-#   Copyright 1992-2017 Free Software Foundation, Inc.
++#   Copyright 1992-2018 Free Software Foundation, Inc.
+ 
+-timestamp='2017-11-04'
++timestamp='2018-02-22'
+ 
+ # 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
+@@ -67,7 +67,7 @@ Report bugs and patches to <config-patch
+ version="\
+ GNU config.sub ($timestamp)
+ 
+-Copyright 1992-2017 Free Software Foundation, Inc.
++Copyright 1992-2018 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."
+@@ -94,7 +94,7 @@ while test $# -gt 0 ; do
+ 
+     *local*)
+        # First pass through any local machine types.
+-       echo $1
++       echo "$1"
+        exit ;;
+ 
+     * )
+@@ -112,7 +112,7 @@ esac
+ 
+ # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+ # Here we must recognize all the valid KERNEL-OS combinations.
+-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
++maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+   linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+@@ -120,16 +120,16 @@ case $maybe_os in
+   kopensolaris*-gnu* | cloudabi*-eabi* | \
+   storm-chaos* | os2-emx* | rtmk-nova*)
+     os=-$maybe_os
+-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
++    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/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+     ;;
+   *)
+-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+-    if [ $basic_machine != $1 ]
+-    then os=`echo $1 | sed 's/.*-/-/'`
++    basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
++    if [ "$basic_machine" != "$1" ]
++    then os=`echo "$1" | sed 's/.*-/-/'`
+     else os=; fi
+     ;;
+ esac
+@@ -178,44 +178,44 @@ case $os in
+ 		;;
+ 	-sco6)
+ 		os=-sco5v6
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco5)
+ 		os=-sco3.2v5
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco4)
+ 		os=-sco3.2v4
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco3.2.[4-9]*)
+ 		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco3.2v[4-9]*)
+ 		# Don't forget version if it is 3.2v4 or newer.
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco5v6*)
+ 		# Don't forget version if it is 3.2v4 or newer.
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco*)
+ 		os=-sco3.2v2
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-udk*)
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-isc)
+ 		os=-isc2.2
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-clix*)
+ 		basic_machine=clipper-intergraph
+ 		;;
+ 	-isc*)
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-lynx*178)
+ 		os=-lynxos178
+@@ -227,7 +227,7 @@ case $os in
+ 		os=-lynxos
+ 		;;
+ 	-ptx*)
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
+ 		;;
+ 	-psos*)
+ 		os=-psos
+@@ -296,7 +296,7 @@ case $basic_machine in
+ 	| nios | nios2 | nios2eb | nios2el \
+ 	| ns16k | ns32k \
+ 	| open8 | or1k | or1knd | or32 \
+-	| pdp10 | pdp11 | pj | pjl \
++	| pdp10 | pj | pjl \
+ 	| powerpc | powerpc64 | powerpc64le | powerpcle \
+ 	| pru \
+ 	| pyramid \
+@@ -333,7 +333,7 @@ case $basic_machine in
+ 		basic_machine=$basic_machine-unknown
+ 		os=-none
+ 		;;
+-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
++	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
+ 		;;
+ 	ms1)
+ 		basic_machine=mt-unknown
+@@ -362,7 +362,7 @@ case $basic_machine in
+ 	  ;;
+ 	# Object if more than one company name word.
+ 	*-*-*)
+-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
++		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
+ 		exit 1
+ 		;;
+ 	# Recognize the basic CPU types with company name.
+@@ -457,7 +457,7 @@ case $basic_machine in
+ 	# Recognize the various machine names and aliases which stand
+ 	# for a CPU type and a company and sometimes even an OS.
+ 	386bsd)
+-		basic_machine=i386-unknown
++		basic_machine=i386-pc
+ 		os=-bsd
+ 		;;
+ 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+@@ -491,7 +491,7 @@ case $basic_machine in
+ 		basic_machine=x86_64-pc
+ 		;;
+ 	amd64-*)
+-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	amdahl)
+ 		basic_machine=580-amdahl
+@@ -536,7 +536,7 @@ case $basic_machine in
+ 		os=-linux
+ 		;;
+ 	blackfin-*)
+-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		os=-linux
+ 		;;
+ 	bluegene*)
+@@ -544,13 +544,13 @@ case $basic_machine in
+ 		os=-cnk
+ 		;;
+ 	c54x-*)
+-		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	c55x-*)
+-		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	c6x-*)
+-		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	c90)
+ 		basic_machine=c90-cray
+@@ -648,7 +648,7 @@ case $basic_machine in
+ 		os=$os"spe"
+ 		;;
+ 	e500v[12]-*)
+-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		os=$os"spe"
+ 		;;
+ 	ebmon29k)
+@@ -740,9 +740,6 @@ case $basic_machine in
+ 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+ 		basic_machine=hppa1.0-hp
+ 		;;
+-	hppa-next)
+-		os=-nextstep3
+-		;;
+ 	hppaosf)
+ 		basic_machine=hppa1.1-hp
+ 		os=-osf
+@@ -755,26 +752,26 @@ case $basic_machine in
+ 		basic_machine=i370-ibm
+ 		;;
+ 	i*86v32)
+-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv32
+ 		;;
+ 	i*86v4*)
+-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv4
+ 		;;
+ 	i*86v)
+-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv
+ 		;;
+ 	i*86sol2)
+-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+ 		os=-solaris2
+ 		;;
+ 	i386mach)
+ 		basic_machine=i386-mach
+ 		os=-mach
+ 		;;
+-	i386-vsta | vsta)
++	vsta)
+ 		basic_machine=i386-unknown
+ 		os=-vsta
+ 		;;
+@@ -793,19 +790,16 @@ case $basic_machine in
+ 		os=-sysv
+ 		;;
+ 	leon-*|leon[3-9]-*)
+-		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
++		basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
+ 		;;
+ 	m68knommu)
+ 		basic_machine=m68k-unknown
+ 		os=-linux
+ 		;;
+ 	m68knommu-*)
+-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		os=-linux
+ 		;;
+-	m88k-omron*)
+-		basic_machine=m88k-omron
+-		;;
+ 	magnum | m3230)
+ 		basic_machine=mips-mips
+ 		os=-sysv
+@@ -837,10 +831,10 @@ case $basic_machine in
+ 		os=-mint
+ 		;;
+ 	mips3*-*)
+-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
++		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
+ 		;;
+ 	mips3*)
+-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
++		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
+ 		;;
+ 	monitor)
+ 		basic_machine=m68k-rom68k
+@@ -859,7 +853,7 @@ case $basic_machine in
+ 		os=-msdos
+ 		;;
+ 	ms1-*)
+-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
++		basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
+ 		;;
+ 	msys)
+ 		basic_machine=i686-pc
+@@ -946,6 +940,9 @@ case $basic_machine in
+ 	nsr-tandem)
+ 		basic_machine=nsr-tandem
+ 		;;
++	nsv-tandem)
++		basic_machine=nsv-tandem
++		;;
+ 	nsx-tandem)
+ 		basic_machine=nsx-tandem
+ 		;;
+@@ -981,7 +978,7 @@ case $basic_machine in
+ 		os=-linux
+ 		;;
+ 	parisc-*)
+-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		os=-linux
+ 		;;
+ 	pbd)
+@@ -997,7 +994,7 @@ case $basic_machine in
+ 		basic_machine=i386-pc
+ 		;;
+ 	pc98-*)
+-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	pentium | p5 | k5 | k6 | nexgen | viac3)
+ 		basic_machine=i586-pc
+@@ -1012,16 +1009,16 @@ case $basic_machine in
+ 		basic_machine=i786-pc
+ 		;;
+ 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	pentium4-*)
+-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	pn)
+ 		basic_machine=pn-gould
+@@ -1031,23 +1028,23 @@ case $basic_machine in
+ 	ppc | ppcbe)	basic_machine=powerpc-unknown
+ 		;;
+ 	ppc-* | ppcbe-*)
+-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	ppcle | powerpclittle)
+ 		basic_machine=powerpcle-unknown
+ 		;;
+ 	ppcle-* | powerpclittle-*)
+-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	ppc64)	basic_machine=powerpc64-unknown
+ 		;;
+-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
++	ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	ppc64le | powerpc64little)
+ 		basic_machine=powerpc64le-unknown
+ 		;;
+ 	ppc64le-* | powerpc64little-*)
+-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	ps2)
+ 		basic_machine=i386-ibm
+@@ -1101,17 +1098,10 @@ case $basic_machine in
+ 	sequent)
+ 		basic_machine=i386-sequent
+ 		;;
+-	sh)
+-		basic_machine=sh-hitachi
+-		os=-hms
+-		;;
+ 	sh5el)
+ 		basic_machine=sh5le-unknown
+ 		;;
+-	sh64)
+-		basic_machine=sh64-unknown
+-		;;
+-	sparclite-wrs | simso-wrs)
++	simso-wrs)
+ 		basic_machine=sparclite-wrs
+ 		os=-vxworks
+ 		;;
+@@ -1130,7 +1120,7 @@ case $basic_machine in
+ 		os=-sysv4
+ 		;;
+ 	strongarm-* | thumb-*)
+-		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	sun2)
+ 		basic_machine=m68000-sun
+@@ -1244,9 +1234,6 @@ case $basic_machine in
+ 		basic_machine=a29k-wrs
+ 		os=-vxworks
+ 		;;
+-	wasm32)
+-		basic_machine=wasm32-unknown
+-		;;
+ 	w65*)
+ 		basic_machine=w65-wdc
+ 		os=-none
+@@ -1266,20 +1253,12 @@ case $basic_machine in
+ 		basic_machine=xps100-honeywell
+ 		;;
+ 	xscale-* | xscalee[bl]-*)
+-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
++		basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
+ 		;;
+ 	ymp)
+ 		basic_machine=ymp-cray
+ 		os=-unicos
+ 		;;
+-	z8k-*-coff)
+-		basic_machine=z8k-unknown
+-		os=-sim
+-		;;
+-	z80-*-coff)
+-		basic_machine=z80-unknown
+-		os=-sim
+-		;;
+ 	none)
+ 		basic_machine=none-none
+ 		os=-none
+@@ -1308,10 +1287,6 @@ case $basic_machine in
+ 	vax)
+ 		basic_machine=vax-dec
+ 		;;
+-	pdp10)
+-		# there are many clones, so DEC is not a safe bet
+-		basic_machine=pdp10-unknown
+-		;;
+ 	pdp11)
+ 		basic_machine=pdp11-dec
+ 		;;
+@@ -1321,9 +1296,6 @@ case $basic_machine in
+ 	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+ 		basic_machine=sh-unknown
+ 		;;
+-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+-		basic_machine=sparc-sun
+-		;;
+ 	cydra)
+ 		basic_machine=cydra-cydrome
+ 		;;
+@@ -1343,7 +1315,7 @@ case $basic_machine in
+ 		# Make sure to match an already-canonicalized machine name.
+ 		;;
+ 	*)
+-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
++		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
+ 		exit 1
+ 		;;
+ esac
+@@ -1351,10 +1323,10 @@ esac
+ # Here we canonicalize certain aliases for manufacturers.
+ case $basic_machine in
+ 	*-digital*)
+-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
++		basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
+ 		;;
+ 	*-commodore*)
+-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
++		basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
+ 		;;
+ 	*)
+ 		;;
+@@ -1377,15 +1349,16 @@ case $os in
+ 	-solaris)
+ 		os=-solaris2
+ 		;;
+-	-svr4*)
+-		os=-sysv4
+-		;;
+ 	-unixware*)
+ 		os=-sysv4.2uw
+ 		;;
+ 	-gnu/linux*)
+ 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+ 		;;
++	# es1800 is here to avoid being matched by es* (a different OS)
++	-es1800*)
++		os=-ose
++		;;
+ 	# Now accept the basic system types.
+ 	# The portable systems comes first.
+ 	# Each alternative MUST end in a * to match a version number.
+@@ -1398,7 +1371,7 @@ case $os in
+ 	      | -aos* | -aros* | -cloudabi* | -sortix* \
+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
++	      | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
+ 	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
+ 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+@@ -1409,14 +1382,15 @@ case $os in
+ 	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+ 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+ 	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
+-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
++	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+ 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
++	      | -morphos* | -superux* | -rtmk* | -windiss* \
+ 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+ 	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+-	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
++	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
++	      | -midnightbsd*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	-qnx*)
+@@ -1433,12 +1407,12 @@ case $os in
+ 	-nto*)
+ 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+ 		;;
+-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
++	-sim | -xray | -os68k* | -v88r* \
++	      | -windows* | -osx | -abug | -netware* | -os9* \
+ 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+ 		;;
+ 	-mac*)
+-		os=`echo $os | sed -e 's|mac|macos|'`
++		os=`echo "$os" | sed -e 's|mac|macos|'`
+ 		;;
+ 	-linux-dietlibc)
+ 		os=-linux-dietlibc
+@@ -1447,10 +1421,10 @@ case $os in
+ 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+ 		;;
+ 	-sunos5*)
+-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
++		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
+ 		;;
+ 	-sunos6*)
+-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
++		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
+ 		;;
+ 	-opened*)
+ 		os=-openedition
+@@ -1461,12 +1435,6 @@ case $os in
+ 	-wince*)
+ 		os=-wince
+ 		;;
+-	-osfrose*)
+-		os=-osfrose
+-		;;
+-	-osf*)
+-		os=-osf
+-		;;
+ 	-utek*)
+ 		os=-bsd
+ 		;;
+@@ -1513,7 +1481,7 @@ case $os in
+ 	-oss*)
+ 		os=-sysv3
+ 		;;
+-	-svr4)
++	-svr4*)
+ 		os=-sysv4
+ 		;;
+ 	-svr3)
+@@ -1528,24 +1496,28 @@ case $os in
+ 	-ose*)
+ 		os=-ose
+ 		;;
+-	-es1800*)
+-		os=-ose
+-		;;
+-	-xenix)
+-		os=-xenix
+-		;;
+ 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ 		os=-mint
+ 		;;
+-	-aros*)
+-		os=-aros
+-		;;
+ 	-zvmoe)
+ 		os=-zvmoe
+ 		;;
+ 	-dicos*)
+ 		os=-dicos
+ 		;;
++	-pikeos*)
++		# Until real need of OS specific support for
++		# particular features comes up, bare metal
++		# configurations are quite functional.
++		case $basic_machine in
++		    arm*)
++			os=-eabi
++			;;
++		    *)
++			os=-elf
++			;;
++		esac
++		;;
+ 	-nacl*)
+ 		;;
+ 	-ios)
+@@ -1555,7 +1527,7 @@ case $os in
+ 	*)
+ 		# Get rid of the `-' at the beginning of $os.
+ 		os=`echo $os | sed 's/[^-]*-//'`
+-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
++		echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
+ 		exit 1
+ 		;;
+ esac
+@@ -1651,9 +1623,6 @@ case $basic_machine in
+ 	*-be)
+ 		os=-beos
+ 		;;
+-	*-haiku)
+-		os=-haiku
+-		;;
+ 	*-ibm)
+ 		os=-aix
+ 		;;
+@@ -1708,9 +1677,6 @@ case $basic_machine in
+ 	i370-*)
+ 		os=-mvs
+ 		;;
+-	*-next)
+-		os=-nextstep3
+-		;;
+ 	*-gould)
+ 		os=-sysv
+ 		;;
+@@ -1820,11 +1786,11 @@ case $basic_machine in
+ 				vendor=stratus
+ 				;;
+ 		esac
+-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
++		basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
+ 		;;
+ esac
+ 
+-echo $basic_machine$os
++echo "$basic_machine$os"
+ exit
+ 
+ # Local variables:
+--- firefox-esr-78.3.0esr.orig/js/src/ctypes/libffi/config.guess
++++ firefox-esr-78.3.0esr/js/src/ctypes/libffi/config.guess
+@@ -1,8 +1,8 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-#   Copyright 1992-2013 Free Software Foundation, Inc.
++#   Copyright 1992-2018 Free Software Foundation, Inc.
+ 
+-timestamp='2013-06-10'
++timestamp='2018-02-24'
+ 
+ # 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
+@@ -15,7 +15,7 @@ timestamp='2013-06-10'
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, see <http://www.gnu.org/licenses/>.
++# along with this program; if not, see <https://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
+@@ -24,12 +24,12 @@ timestamp='2013-06-10'
+ # program.  This Exception is an additional permission under section 7
+ # of the GNU General Public License, version 3 ("GPLv3").
+ #
+-# Originally written by Per Bothner.
++# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
+ #
+ # 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
++# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+ #
+-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
++# Please send patches to <config-patches@gnu.org>.
+ 
+ 
+ me=`echo "$0" | sed -e 's,.*/,,'`
+@@ -39,7 +39,7 @@ Usage: $0 [OPTION]
+ 
+ Output the configuration name of the system \`$me' is run on.
+ 
+-Operation modes:
++Options:
+   -h, --help         print this help, then exit
+   -t, --time-stamp   print date of last modification, then exit
+   -v, --version      print version number, then exit
+@@ -50,7 +50,7 @@ version="\
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright 1992-2013 Free Software Foundation, Inc.
++Copyright 1992-2018 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."
+@@ -107,9 +107,9 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdi
+ dummy=$tmp/dummy ;
+ tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+ case $CC_FOR_BUILD,$HOST_CC,$CC in
+- ,,)    echo "int x;" > $dummy.c ;
++ ,,)    echo "int x;" > "$dummy.c" ;
+ 	for c in cc gcc c89 c99 ; do
+-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
++	  if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+ 	     CC_FOR_BUILD="$c"; break ;
+ 	  fi ;
+ 	done ;
+@@ -132,14 +132,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+ 
+-case "${UNAME_SYSTEM}" in
++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
++	eval "$set_cc_for_build"
++	cat <<-EOF > "$dummy.c"
+ 	#include <features.h>
+ 	#if defined(__UCLIBC__)
+ 	LIBC=uclibc
+@@ -149,13 +149,20 @@ Linux|GNU|GNU/*)
+ 	LIBC=gnu
+ 	#endif
+ 	EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
++
++	# If ldd exists, use it to detect musl libc.
++	if command -v ldd >/dev/null && \
++		ldd --version 2>&1 | grep -q ^musl
++	then
++	    LIBC=musl
++	fi
+ 	;;
+ esac
+ 
+ # Note: order is significant - the case branches are not exclusive.
+ 
+-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
++case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
+     *:NetBSD:*:*)
+ 	# NetBSD (nbsd) targets should (where applicable) match one or
+ 	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+@@ -168,21 +175,31 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 	# Note: NetBSD doesn't particularly care about the vendor
+ 	# portion of the name.  We always set it to "unknown".
+ 	sysctl="sysctl -n hw.machine_arch"
+-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+-	case "${UNAME_MACHINE_ARCH}" in
++	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
++	    "/sbin/$sysctl" 2>/dev/null || \
++	    "/usr/sbin/$sysctl" 2>/dev/null || \
++	    echo unknown)`
++	case "$UNAME_MACHINE_ARCH" in
+ 	    armeb) machine=armeb-unknown ;;
+ 	    arm*) machine=arm-unknown ;;
+ 	    sh3el) machine=shl-unknown ;;
+ 	    sh3eb) machine=sh-unknown ;;
+ 	    sh5el) machine=sh5le-unknown ;;
+-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
++	    earmv*)
++		arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
++		endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
++		machine="${arch}${endian}"-unknown
++		;;
++	    *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
+ 	esac
+ 	# The Operating System including object format, if it has switched
+-	# to ELF recently, or will in the future.
+-	case "${UNAME_MACHINE_ARCH}" in
++	# to ELF recently (or will in the future) and ABI.
++	case "$UNAME_MACHINE_ARCH" in
++	    earm*)
++		os=netbsdelf
++		;;
+ 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+-		eval $set_cc_for_build
++		eval "$set_cc_for_build"
+ 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ 			| grep -q __ELF__
+ 		then
+@@ -197,44 +214,67 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 		os=netbsd
+ 		;;
+ 	esac
++	# Determine ABI tags.
++	case "$UNAME_MACHINE_ARCH" in
++	    earm*)
++		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
++		abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
++		;;
++	esac
+ 	# The OS release
+ 	# Debian GNU/NetBSD machines have a different userland, and
+ 	# thus, need a distinct triplet. However, they do not need
+ 	# kernel version information, so it can be replaced with a
+ 	# suitable tag, in the style of linux-gnu.
+-	case "${UNAME_VERSION}" in
++	case "$UNAME_VERSION" in
+ 	    Debian*)
+ 		release='-gnu'
+ 		;;
+ 	    *)
+-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
++		release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
+ 		;;
+ 	esac
+ 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+ 	# contains redundant information, the shorter form:
+ 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+-	echo "${machine}-${os}${release}"
++	echo "$machine-${os}${release}${abi}"
+ 	exit ;;
+     *:Bitrig:*:*)
+ 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+-	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
++	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}
++	echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
++	exit ;;
++    *:LibertyBSD:*:*)
++	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
++	echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
++	exit ;;
++    *:MidnightBSD:*:*)
++	echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
+ 	exit ;;
+     *:ekkoBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
++	echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
+ 	exit ;;
+     *:SolidBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
++	echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
+ 	exit ;;
+     macppc:MirBSD:*:*)
+-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
++	echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
+ 	exit ;;
+     *:MirBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
++	echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
+ 	exit ;;
++    *:Sortix:*:*)
++	echo "$UNAME_MACHINE"-unknown-sortix
++	exit ;;
++    *:Redox:*:*)
++	echo "$UNAME_MACHINE"-unknown-redox
++	exit ;;
++    mips:OSF1:*.*)
++        echo mips-dec-osf1
++        exit ;;
+     alpha:OSF1:*:*)
+ 	case $UNAME_RELEASE in
+ 	*4.0)
+@@ -251,63 +291,54 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+ 	case "$ALPHA_CPU_TYPE" in
+ 	    "EV4 (21064)")
+-		UNAME_MACHINE="alpha" ;;
++		UNAME_MACHINE=alpha ;;
+ 	    "EV4.5 (21064)")
+-		UNAME_MACHINE="alpha" ;;
++		UNAME_MACHINE=alpha ;;
+ 	    "LCA4 (21066/21068)")
+-		UNAME_MACHINE="alpha" ;;
++		UNAME_MACHINE=alpha ;;
+ 	    "EV5 (21164)")
+-		UNAME_MACHINE="alphaev5" ;;
++		UNAME_MACHINE=alphaev5 ;;
+ 	    "EV5.6 (21164A)")
+-		UNAME_MACHINE="alphaev56" ;;
++		UNAME_MACHINE=alphaev56 ;;
+ 	    "EV5.6 (21164PC)")
+-		UNAME_MACHINE="alphapca56" ;;
++		UNAME_MACHINE=alphapca56 ;;
+ 	    "EV5.7 (21164PC)")
+-		UNAME_MACHINE="alphapca57" ;;
++		UNAME_MACHINE=alphapca57 ;;
+ 	    "EV6 (21264)")
+-		UNAME_MACHINE="alphaev6" ;;
++		UNAME_MACHINE=alphaev6 ;;
+ 	    "EV6.7 (21264A)")
+-		UNAME_MACHINE="alphaev67" ;;
++		UNAME_MACHINE=alphaev67 ;;
+ 	    "EV6.8CB (21264C)")
+-		UNAME_MACHINE="alphaev68" ;;
++		UNAME_MACHINE=alphaev68 ;;
+ 	    "EV6.8AL (21264B)")
+-		UNAME_MACHINE="alphaev68" ;;
++		UNAME_MACHINE=alphaev68 ;;
+ 	    "EV6.8CX (21264D)")
+-		UNAME_MACHINE="alphaev68" ;;
++		UNAME_MACHINE=alphaev68 ;;
+ 	    "EV6.9A (21264/EV69A)")
+-		UNAME_MACHINE="alphaev69" ;;
++		UNAME_MACHINE=alphaev69 ;;
+ 	    "EV7 (21364)")
+-		UNAME_MACHINE="alphaev7" ;;
++		UNAME_MACHINE=alphaev7 ;;
+ 	    "EV7.9 (21364A)")
+-		UNAME_MACHINE="alphaev79" ;;
++		UNAME_MACHINE=alphaev79 ;;
+ 	esac
+ 	# A Pn.n version is a patched version.
+ 	# A Vn.n version is a released version.
+ 	# A Tn.n version is a released field test version.
+ 	# 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'`
++	echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
+ 	# 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
+-	# of the specific Alpha model?
+-	echo alpha-pc-interix
+-	exit ;;
+-    21064:Windows_NT:50:3)
+-	echo alpha-dec-winnt3.5
+-	exit ;;
+     Amiga*:UNIX_System_V:4.0:*)
+ 	echo m68k-unknown-sysv4
+ 	exit ;;
+     *:[Aa]miga[Oo][Ss]:*:*)
+-	echo ${UNAME_MACHINE}-unknown-amigaos
++	echo "$UNAME_MACHINE"-unknown-amigaos
+ 	exit ;;
+     *:[Mm]orph[Oo][Ss]:*:*)
+-	echo ${UNAME_MACHINE}-unknown-morphos
++	echo "$UNAME_MACHINE"-unknown-morphos
+ 	exit ;;
+     *:OS/390:*:*)
+ 	echo i370-ibm-openedition
+@@ -319,7 +350,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 	echo powerpc-ibm-os400
+ 	exit ;;
+     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+-	echo arm-acorn-riscix${UNAME_RELEASE}
++	echo arm-acorn-riscix"$UNAME_RELEASE"
+ 	exit ;;
+     arm*:riscos:*:*|arm*:RISCOS:*:*)
+ 	echo arm-unknown-riscos
+@@ -346,38 +377,38 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 	    sparc) echo sparc-icl-nx7; exit ;;
+ 	esac ;;
+     s390x:SunOS:*:*)
+-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
+ 	exit ;;
+     sun4H:SunOS:5.*:*)
+-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+ 	exit ;;
+     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
+ 	exit ;;
+     i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+-	echo i386-pc-auroraux${UNAME_RELEASE}
++	echo i386-pc-auroraux"$UNAME_RELEASE"
+ 	exit ;;
+     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+-	eval $set_cc_for_build
+-	SUN_ARCH="i386"
++	eval "$set_cc_for_build"
++	SUN_ARCH=i386
+ 	# If there is a compiler, see if it is configured for 64-bit objects.
+ 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+ 	# This test works for both compilers.
+-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+ 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ 		grep IS_64BIT_ARCH >/dev/null
+ 	    then
+-		SUN_ARCH="x86_64"
++		SUN_ARCH=x86_64
+ 	    fi
+ 	fi
+-	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+ 	exit ;;
+     sun4*:SunOS:6*:*)
+ 	# According to config.sub, this is the proper way to canonicalize
+ 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+ 	# it's likely to be more like Solaris than SunOS4.
+-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+ 	exit ;;
+     sun4*:SunOS:*:*)
+ 	case "`/usr/bin/arch -k`" in
+@@ -386,25 +417,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 		;;
+ 	esac
+ 	# Japanese Language versions have a version number like `4.1.3-JL'.
+-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
++	echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
+ 	exit ;;
+     sun3*:SunOS:*:*)
+-	echo m68k-sun-sunos${UNAME_RELEASE}
++	echo m68k-sun-sunos"$UNAME_RELEASE"
+ 	exit ;;
+     sun*:*:4.2BSD:*)
+ 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
++	test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
+ 	case "`/bin/arch`" in
+ 	    sun3)
+-		echo m68k-sun-sunos${UNAME_RELEASE}
++		echo m68k-sun-sunos"$UNAME_RELEASE"
+ 		;;
+ 	    sun4)
+-		echo sparc-sun-sunos${UNAME_RELEASE}
++		echo sparc-sun-sunos"$UNAME_RELEASE"
+ 		;;
+ 	esac
+ 	exit ;;
+     aushp:SunOS:*:*)
+-	echo sparc-auspex-sunos${UNAME_RELEASE}
++	echo sparc-auspex-sunos"$UNAME_RELEASE"
+ 	exit ;;
+     # The situation for MiNT is a little confusing.  The machine name
+     # can be virtually everything (everything which is not
+@@ -415,44 +446,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+     # 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}
++	echo m68k-atari-mint"$UNAME_RELEASE"
+ 	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}
++	echo m68k-milan-mint"$UNAME_RELEASE"
+ 	exit ;;
+     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+-	echo m68k-hades-mint${UNAME_RELEASE}
++	echo m68k-hades-mint"$UNAME_RELEASE"
+ 	exit ;;
+     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+-	echo m68k-unknown-mint${UNAME_RELEASE}
++	echo m68k-unknown-mint"$UNAME_RELEASE"
+ 	exit ;;
+     m68k:machten:*:*)
+-	echo m68k-apple-machten${UNAME_RELEASE}
++	echo m68k-apple-machten"$UNAME_RELEASE"
+ 	exit ;;
+     powerpc:machten:*:*)
+-	echo powerpc-apple-machten${UNAME_RELEASE}
++	echo powerpc-apple-machten"$UNAME_RELEASE"
+ 	exit ;;
+     RISC*:Mach:*:*)
+ 	echo mips-dec-mach_bsd4.3
+ 	exit ;;
+     RISC*:ULTRIX:*:*)
+-	echo mips-dec-ultrix${UNAME_RELEASE}
++	echo mips-dec-ultrix"$UNAME_RELEASE"
+ 	exit ;;
+     VAX*:ULTRIX*:*:*)
+-	echo vax-dec-ultrix${UNAME_RELEASE}
++	echo vax-dec-ultrix"$UNAME_RELEASE"
+ 	exit ;;
+     2020:CLIX:*:* | 2430:CLIX:*:*)
+-	echo clipper-intergraph-clix${UNAME_RELEASE}
++	echo clipper-intergraph-clix"$UNAME_RELEASE"
+ 	exit ;;
+     mips:*:*:UMIPS | mips:*:*:RISCos)
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
++	eval "$set_cc_for_build"
++	sed 's/^	//' << EOF > "$dummy.c"
+ #ifdef __cplusplus
+ #include <stdio.h>  /* for printf() prototype */
+ 	int main (int argc, char *argv[]) {
+@@ -461,23 +492,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ #endif
+ 	#if defined (host_mips) && defined (MIPSEB)
+ 	#if defined (SYSTYPE_SYSV)
+-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
++	  printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
+ 	#endif
+ 	#if defined (SYSTYPE_SVR4)
+-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
++	  printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
+ 	#endif
+ 	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
++	  printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
+ 	#endif
+ 	#endif
+ 	  exit (-1);
+ 	}
+ EOF
+-	$CC_FOR_BUILD -o $dummy $dummy.c &&
+-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+-	  SYSTEM_NAME=`$dummy $dummyarg` &&
++	$CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
++	  dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
++	  SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
+ 	    { echo "$SYSTEM_NAME"; exit; }
+-	echo mips-mips-riscos${UNAME_RELEASE}
++	echo mips-mips-riscos"$UNAME_RELEASE"
+ 	exit ;;
+     Motorola:PowerMAX_OS:*:*)
+ 	echo powerpc-motorola-powermax
+@@ -503,17 +534,17 @@ EOF
+     AViiON:dgux:*:*)
+ 	# DG/UX returns AViiON for all architectures
+ 	UNAME_PROCESSOR=`/usr/bin/uname -p`
+-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
++	if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
+ 	then
+-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
++	    if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
++	       [ "$TARGET_BINARY_INTERFACE"x = x ]
+ 	    then
+-		echo m88k-dg-dgux${UNAME_RELEASE}
++		echo m88k-dg-dgux"$UNAME_RELEASE"
+ 	    else
+-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
++		echo m88k-dg-dguxbcs"$UNAME_RELEASE"
+ 	    fi
+ 	else
+-	    echo i586-dg-dgux${UNAME_RELEASE}
++	    echo i586-dg-dgux"$UNAME_RELEASE"
+ 	fi
+ 	exit ;;
+     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+@@ -530,7 +561,7 @@ EOF
+ 	echo m68k-tektronix-bsd
+ 	exit ;;
+     *:IRIX*:*:*)
+-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
++	echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
+ 	exit ;;
+     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+ 	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+@@ -542,14 +573,14 @@ EOF
+ 	if [ -x /usr/bin/oslevel ] ; then
+ 		IBM_REV=`/usr/bin/oslevel`
+ 	else
+-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
+ 	fi
+-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
++	echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
+ 	exit ;;
+     *:AIX:2:3)
+ 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+-		eval $set_cc_for_build
+-		sed 's/^		//' << EOF >$dummy.c
++		eval "$set_cc_for_build"
++		sed 's/^		//' << EOF > "$dummy.c"
+ 		#include <sys/systemcfg.h>
+ 
+ 		main()
+@@ -560,7 +591,7 @@ EOF
+ 			exit(0);
+ 			}
+ EOF
+-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
++		if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
+ 		then
+ 			echo "$SYSTEM_NAME"
+ 		else
+@@ -574,26 +605,27 @@ EOF
+ 	exit ;;
+     *: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
++	if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
+ 		IBM_ARCH=rs6000
+ 	else
+ 		IBM_ARCH=powerpc
+ 	fi
+-	if [ -x /usr/bin/oslevel ] ; then
+-		IBM_REV=`/usr/bin/oslevel`
++	if [ -x /usr/bin/lslpp ] ; then
++		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
++			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
+ 	else
+-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
+ 	fi
+-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
++	echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
+ 	exit ;;
+     *:AIX:*:*)
+ 	echo rs6000-ibm-aix
+ 	exit ;;
+-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
++    ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
+ 	echo romp-ibm-bsd4.4
+ 	exit ;;
+     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
++	echo romp-ibm-bsd"$UNAME_RELEASE"   # 4.3 with uname added to
+ 	exit ;;                             # report: romp-ibm BSD 4.3
+     *:BOSX:*:*)
+ 	echo rs6000-bull-bosx
+@@ -608,28 +640,28 @@ EOF
+ 	echo m68k-hp-bsd4.4
+ 	exit ;;
+     9000/[34678]??:HP-UX:*:*)
+-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+-	case "${UNAME_MACHINE}" in
+-	    9000/31? )            HP_ARCH=m68000 ;;
+-	    9000/[34]?? )         HP_ARCH=m68k ;;
++	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
++	case "$UNAME_MACHINE" in
++	    9000/31?)            HP_ARCH=m68000 ;;
++	    9000/[34]??)         HP_ARCH=m68k ;;
+ 	    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
++		    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
++			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
+ 		fi
+-		if [ "${HP_ARCH}" = "" ]; then
+-		    eval $set_cc_for_build
+-		    sed 's/^		//' << EOF >$dummy.c
++		if [ "$HP_ARCH" = "" ]; then
++		    eval "$set_cc_for_build"
++		    sed 's/^		//' << EOF > "$dummy.c"
+ 
+ 		#define _HPUX_SOURCE
+ 		#include <stdlib.h>
+@@ -662,13 +694,13 @@ EOF
+ 		    exit (0);
+ 		}
+ EOF
+-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
++		    (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
+ 		    test -z "$HP_ARCH" && HP_ARCH=hppa
+ 		fi ;;
+ 	esac
+-	if [ ${HP_ARCH} = "hppa2.0w" ]
++	if [ "$HP_ARCH" = hppa2.0w ]
+ 	then
+-	    eval $set_cc_for_build
++	    eval "$set_cc_for_build"
+ 
+ 	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+ 	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+@@ -679,23 +711,23 @@ EOF
+ 	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+ 	    # => hppa64-hp-hpux11.23
+ 
+-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
++	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
+ 		grep -q __LP64__
+ 	    then
+-		HP_ARCH="hppa2.0w"
++		HP_ARCH=hppa2.0w
+ 	    else
+-		HP_ARCH="hppa64"
++		HP_ARCH=hppa64
+ 	    fi
+ 	fi
+-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
++	echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
+ 	exit ;;
+     ia64:HP-UX:*:*)
+-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+-	echo ia64-hp-hpux${HPUX_REV}
++	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
++	echo ia64-hp-hpux"$HPUX_REV"
+ 	exit ;;
+     3050*:HI-UX:*:*)
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
++	eval "$set_cc_for_build"
++	sed 's/^	//' << EOF > "$dummy.c"
+ 	#include <unistd.h>
+ 	int
+ 	main ()
+@@ -720,11 +752,11 @@ EOF
+ 	  exit (0);
+ 	}
+ EOF
+-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
++	$CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
+ 		{ echo "$SYSTEM_NAME"; exit; }
+ 	echo unknown-hitachi-hiuxwe2
+ 	exit ;;
+-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
++    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
+ 	echo hppa1.1-hp-bsd
+ 	exit ;;
+     9000/8??:4.3bsd:*:*)
+@@ -733,7 +765,7 @@ EOF
+     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+ 	echo hppa1.0-hp-mpeix
+ 	exit ;;
+-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
++    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
+ 	echo hppa1.1-hp-osf
+ 	exit ;;
+     hp8??:OSF1:*:*)
+@@ -741,9 +773,9 @@ EOF
+ 	exit ;;
+     i*86:OSF1:*:*)
+ 	if [ -x /usr/sbin/sysversion ] ; then
+-	    echo ${UNAME_MACHINE}-unknown-osf1mk
++	    echo "$UNAME_MACHINE"-unknown-osf1mk
+ 	else
+-	    echo ${UNAME_MACHINE}-unknown-osf1
++	    echo "$UNAME_MACHINE"-unknown-osf1
+ 	fi
+ 	exit ;;
+     parisc*:Lites*:*:*)
+@@ -768,127 +800,109 @@ EOF
+ 	echo c4-convex-bsd
+ 	exit ;;
+     CRAY*Y-MP:*:*:*)
+-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+ 	exit ;;
+     CRAY*[A-Z]90:*:*:*)
+-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
++	echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
+ 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+ 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+ 	      -e 's/\.[^.]*$/.X/'
+ 	exit ;;
+     CRAY*TS:*:*:*)
+-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+ 	exit ;;
+     CRAY*T3E:*:*:*)
+-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+ 	exit ;;
+     CRAY*SV1:*:*:*)
+-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+ 	exit ;;
+     *:UNICOS/mp:*:*)
+-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+ 	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/ /_/'`
++	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 ;;
+     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/ /_/'`
++	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}
++	echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
+ 	exit ;;
+     sparc*:BSD/OS:*:*)
+-	echo sparc-unknown-bsdi${UNAME_RELEASE}
++	echo sparc-unknown-bsdi"$UNAME_RELEASE"
+ 	exit ;;
+     *:BSD/OS:*:*)
+-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
++	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
+ 	exit ;;
+     *:FreeBSD:*:*)
+ 	UNAME_PROCESSOR=`/usr/bin/uname -p`
+-	case ${UNAME_PROCESSOR} in
++	case "$UNAME_PROCESSOR" in
+ 	    amd64)
+-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+-	    *)
+-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++		UNAME_PROCESSOR=x86_64 ;;
++	    i386)
++		UNAME_PROCESSOR=i586 ;;
+ 	esac
++	echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
+ 	exit ;;
+     i*:CYGWIN*:*)
+-	echo ${UNAME_MACHINE}-pc-cygwin
++	echo "$UNAME_MACHINE"-pc-cygwin
+ 	exit ;;
+     *:MINGW64*:*)
+-	echo ${UNAME_MACHINE}-pc-mingw64
++	echo "$UNAME_MACHINE"-pc-mingw64
+ 	exit ;;
+     *:MINGW*:*)
+-	echo ${UNAME_MACHINE}-pc-mingw32
+-	exit ;;
+-    i*:MSYS*:*)
+-	echo ${UNAME_MACHINE}-pc-msys
++	echo "$UNAME_MACHINE"-pc-mingw32
+ 	exit ;;
+-    i*:windows32*:*)
+-	# uname -m includes "-pc" on this system.
+-	echo ${UNAME_MACHINE}-mingw32
++    *:MSYS*:*)
++	echo "$UNAME_MACHINE"-pc-msys
+ 	exit ;;
+     i*:PW*:*)
+-	echo ${UNAME_MACHINE}-pc-pw32
++	echo "$UNAME_MACHINE"-pc-pw32
+ 	exit ;;
+     *:Interix*:*)
+-	case ${UNAME_MACHINE} in
++	case "$UNAME_MACHINE" in
+ 	    x86)
+-		echo i586-pc-interix${UNAME_RELEASE}
++		echo i586-pc-interix"$UNAME_RELEASE"
+ 		exit ;;
+ 	    authenticamd | genuineintel | EM64T)
+-		echo x86_64-unknown-interix${UNAME_RELEASE}
++		echo x86_64-unknown-interix"$UNAME_RELEASE"
+ 		exit ;;
+ 	    IA64)
+-		echo ia64-unknown-interix${UNAME_RELEASE}
++		echo ia64-unknown-interix"$UNAME_RELEASE"
+ 		exit ;;
+ 	esac ;;
+-    [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
+-	# UNAME_MACHINE based on the output of uname instead of i386?
+-	echo i586-pc-interix
+-	exit ;;
+     i*:UWIN*:*)
+-	echo ${UNAME_MACHINE}-pc-uwin
++	echo "$UNAME_MACHINE"-pc-uwin
+ 	exit ;;
+     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ 	echo x86_64-unknown-cygwin
+ 	exit ;;
+-    p*:CYGWIN*:*)
+-	echo powerpcle-unknown-cygwin
+-	exit ;;
+     prep*:SunOS:5.*:*)
+-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+ 	exit ;;
+     *:GNU:*:*)
+ 	# the GNU system
+-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`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/[-(].*//'`-${LIBC}
++	echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
+ 	exit ;;
+     i*86:Minix:*:*)
+-	echo ${UNAME_MACHINE}-pc-minix
++	echo "$UNAME_MACHINE"-pc-minix
+ 	exit ;;
+     aarch64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     aarch64_be:Linux:*:*)
+ 	UNAME_MACHINE=aarch64_be
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     alpha:Linux:*:*)
+ 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+@@ -901,58 +915,64 @@ EOF
+ 	  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}
++	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     arc:Linux:*:* | arceb:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     arm*:Linux:*:*)
+-	eval $set_cc_for_build
++	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-${LIBC}
++	    echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	else
+ 	    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
++		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
+ 	    else
+-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
++		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
+ 	    fi
+ 	fi
+ 	exit ;;
+     avr32*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     cris:Linux:*:*)
+-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
++	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
+ 	exit ;;
+     crisv32:Linux:*:*)
+-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
++	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
++	exit ;;
++    e2k:Linux:*:*)
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     frv:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     hexagon:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     i*86:Linux:*:*)
+-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
++	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+ 	exit ;;
+     ia64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
++	exit ;;
++    k1om:Linux:*:*)
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     m32r*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     m68*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     mips:Linux:*:* | mips64:Linux:*:*)
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
++	eval "$set_cc_for_build"
++	sed 's/^	//' << EOF > "$dummy.c"
+ 	#undef CPU
+ 	#undef ${UNAME_MACHINE}
+ 	#undef ${UNAME_MACHINE}el
+@@ -966,64 +986,74 @@ EOF
+ 	#endif
+ 	#endif
+ EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
++	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
++	test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
+ 	;;
+-    or1k:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++    mips64el:Linux:*:*)
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+-    or32:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++    openrisc*:Linux:*:*)
++	echo or1k-unknown-linux-"$LIBC"
++	exit ;;
++    or32:Linux:*:* | or1k*:Linux:*:*)
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     padre:Linux:*:*)
+-	echo sparc-unknown-linux-${LIBC}
++	echo sparc-unknown-linux-"$LIBC"
+ 	exit ;;
+     parisc64:Linux:*:* | hppa64:Linux:*:*)
+-	echo hppa64-unknown-linux-${LIBC}
++	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-${LIBC} ;;
+-	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+-	  *)    echo hppa-unknown-linux-${LIBC} ;;
++	  PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
++	  PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
++	  *)    echo hppa-unknown-linux-"$LIBC" ;;
+ 	esac
+ 	exit ;;
+     ppc64:Linux:*:*)
+-	echo powerpc64-unknown-linux-${LIBC}
++	echo powerpc64-unknown-linux-"$LIBC"
+ 	exit ;;
+     ppc:Linux:*:*)
+-	echo powerpc-unknown-linux-${LIBC}
++	echo powerpc-unknown-linux-"$LIBC"
+ 	exit ;;
+     ppc64le:Linux:*:*)
+-	echo powerpc64le-unknown-linux-${LIBC}
++	echo powerpc64le-unknown-linux-"$LIBC"
+ 	exit ;;
+     ppcle:Linux:*:*)
+-	echo powerpcle-unknown-linux-${LIBC}
++	echo powerpcle-unknown-linux-"$LIBC"
++	exit ;;
++    riscv32:Linux:*:* | riscv64:Linux:*:*)
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     s390:Linux:*:* | s390x:Linux:*:*)
+-	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
++	echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
+ 	exit ;;
+     sh64*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     sh*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     sparc:Linux:*:* | sparc64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     tile*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     vax:Linux:*:*)
+-	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
++	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
+ 	exit ;;
+     x86_64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	if objdump -f /bin/sh | grep -q elf32-x86-64; then
++	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
++	else
++	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
++	fi
+ 	exit ;;
+     xtensa*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     i*86:DYNIX/ptx:4*:*)
+ 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+@@ -1037,34 +1067,34 @@ EOF
+ 	# 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.
+-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
++	echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
+ 	exit ;;
+     i*86:OS/2:*:*)
+ 	# If we were able to find `uname', then EMX Unix compatibility
+ 	# is probably installed.
+-	echo ${UNAME_MACHINE}-pc-os2-emx
++	echo "$UNAME_MACHINE"-pc-os2-emx
+ 	exit ;;
+     i*86:XTS-300:*:STOP)
+-	echo ${UNAME_MACHINE}-unknown-stop
++	echo "$UNAME_MACHINE"-unknown-stop
+ 	exit ;;
+     i*86:atheos:*:*)
+-	echo ${UNAME_MACHINE}-unknown-atheos
++	echo "$UNAME_MACHINE"-unknown-atheos
+ 	exit ;;
+     i*86:syllable:*:*)
+-	echo ${UNAME_MACHINE}-pc-syllable
++	echo "$UNAME_MACHINE"-pc-syllable
+ 	exit ;;
+     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+-	echo i386-unknown-lynxos${UNAME_RELEASE}
++	echo i386-unknown-lynxos"$UNAME_RELEASE"
+ 	exit ;;
+     i*86:*DOS:*:*)
+-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
++	echo "$UNAME_MACHINE"-pc-msdosdjgpp
+ 	exit ;;
+-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
++    i*86:*:4.*:*)
++	UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
+ 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
++		echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
+ 	else
+-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
++		echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
+ 	fi
+ 	exit ;;
+     i*86:*:5:[678]*)
+@@ -1074,12 +1104,12 @@ EOF
+ 	    *Pentium)	     UNAME_MACHINE=i586 ;;
+ 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+ 	esac
+-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
++	echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
+ 	exit ;;
+     i*86:*:3.2:*)
+ 	if test -f /usr/options/cb.name; then
+ 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
++		echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
+ 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+ 		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+ 		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+@@ -1089,9 +1119,9 @@ EOF
+ 			&& UNAME_MACHINE=i686
+ 		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+ 			&& UNAME_MACHINE=i686
+-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
++		echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
+ 	else
+-		echo ${UNAME_MACHINE}-pc-sysv32
++		echo "$UNAME_MACHINE"-pc-sysv32
+ 	fi
+ 	exit ;;
+     pc:*:*:*)
+@@ -1099,7 +1129,7 @@ EOF
+ 	# 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
++	# prints for the "djgpp" host, or else GDB configure will decide that
+ 	# this is a cross-build.
+ 	echo i586-pc-msdosdjgpp
+ 	exit ;;
+@@ -1111,9 +1141,9 @@ EOF
+ 	exit ;;
+     i860:*:4.*:*) # i860-SVR4
+ 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
++	  echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
+ 	else # Add other i860-SVR4 vendors below as they are discovered.
+-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
++	  echo i860-unknown-sysv"$UNAME_RELEASE"  # Unknown i860-SVR4
+ 	fi
+ 	exit ;;
+     mini*:CTIX:SYS*5:*)
+@@ -1133,9 +1163,9 @@ EOF
+ 	test -r /etc/.relid \
+ 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
++	  && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
+ 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
++	  && { 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; } ;;
+@@ -1144,28 +1174,28 @@ EOF
+ 	test -r /etc/.relid \
+ 	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+-	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
++	    && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
+ 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
++	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
+ 	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
++	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
+     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+-	echo m68k-unknown-lynxos${UNAME_RELEASE}
++	echo m68k-unknown-lynxos"$UNAME_RELEASE"
+ 	exit ;;
+     mc68030:UNIX_System_V:4.*:*)
+ 	echo m68k-atari-sysv4
+ 	exit ;;
+     TSUNAMI:LynxOS:2.*:*)
+-	echo sparc-unknown-lynxos${UNAME_RELEASE}
++	echo sparc-unknown-lynxos"$UNAME_RELEASE"
+ 	exit ;;
+     rs6000:LynxOS:2.*:*)
+-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
++	echo rs6000-unknown-lynxos"$UNAME_RELEASE"
+ 	exit ;;
+     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
++	echo powerpc-unknown-lynxos"$UNAME_RELEASE"
+ 	exit ;;
+     SM[BE]S:UNIX_SV:*:*)
+-	echo mips-dde-sysv${UNAME_RELEASE}
++	echo mips-dde-sysv"$UNAME_RELEASE"
+ 	exit ;;
+     RM*:ReliantUNIX-*:*:*)
+ 	echo mips-sni-sysv4
+@@ -1176,7 +1206,7 @@ EOF
+     *:SINIX-*:*:*)
+ 	if uname -p 2>/dev/null >/dev/null ; then
+ 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+-		echo ${UNAME_MACHINE}-sni-sysv4
++		echo "$UNAME_MACHINE"-sni-sysv4
+ 	else
+ 		echo ns32k-sni-sysv
+ 	fi
+@@ -1196,23 +1226,23 @@ EOF
+ 	exit ;;
+     i*86:VOS:*:*)
+ 	# From Paul.Green@stratus.com.
+-	echo ${UNAME_MACHINE}-stratus-vos
++	echo "$UNAME_MACHINE"-stratus-vos
+ 	exit ;;
+     *:VOS:*:*)
+ 	# From Paul.Green@stratus.com.
+ 	echo hppa1.1-stratus-vos
+ 	exit ;;
+     mc68*:A/UX:*:*)
+-	echo m68k-apple-aux${UNAME_RELEASE}
++	echo m68k-apple-aux"$UNAME_RELEASE"
+ 	exit ;;
+     news*:NEWS-OS:6*:*)
+ 	echo mips-sony-newsos6
+ 	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 ;;
+     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+@@ -1231,67 +1261,93 @@ EOF
+ 	echo x86_64-unknown-haiku
+ 	exit ;;
+     SX-4:SUPER-UX:*:*)
+-	echo sx4-nec-superux${UNAME_RELEASE}
++	echo sx4-nec-superux"$UNAME_RELEASE"
+ 	exit ;;
+     SX-5:SUPER-UX:*:*)
+-	echo sx5-nec-superux${UNAME_RELEASE}
++	echo sx5-nec-superux"$UNAME_RELEASE"
+ 	exit ;;
+     SX-6:SUPER-UX:*:*)
+-	echo sx6-nec-superux${UNAME_RELEASE}
++	echo sx6-nec-superux"$UNAME_RELEASE"
+ 	exit ;;
+     SX-7:SUPER-UX:*:*)
+-	echo sx7-nec-superux${UNAME_RELEASE}
++	echo sx7-nec-superux"$UNAME_RELEASE"
+ 	exit ;;
+     SX-8:SUPER-UX:*:*)
+-	echo sx8-nec-superux${UNAME_RELEASE}
++	echo sx8-nec-superux"$UNAME_RELEASE"
+ 	exit ;;
+     SX-8R:SUPER-UX:*:*)
+-	echo sx8r-nec-superux${UNAME_RELEASE}
++	echo sx8r-nec-superux"$UNAME_RELEASE"
++	exit ;;
++    SX-ACE:SUPER-UX:*:*)
++	echo sxace-nec-superux"$UNAME_RELEASE"
+ 	exit ;;
+     Power*:Rhapsody:*:*)
+-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
++	echo powerpc-apple-rhapsody"$UNAME_RELEASE"
+ 	exit ;;
+     *:Rhapsody:*:*)
+-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
++	echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
+ 	exit ;;
+     *:Darwin:*:*)
+ 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+-	eval $set_cc_for_build
++	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
++	if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
++	    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
++		# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
++		if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
++		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
++		       grep IS_PPC >/dev/null
++		then
++		    UNAME_PROCESSOR=powerpc
++		fi
+ 	    fi
++	elif test "$UNAME_PROCESSOR" = i386 ; then
++	    # Avoid executing cc on OS X 10.9, as it ships with a stub
++	    # that puts up a graphical alert prompting to install
++	    # developer tools.  Any system running Mac OS X 10.7 or
++	    # later (Darwin 11 and later) is required to have a 64-bit
++	    # processor. This is not true of the ARM version of Darwin
++	    # that Apple uses in portable devices.
++	    UNAME_PROCESSOR=x86_64
+ 	fi
+-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
++	echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
+ 	exit ;;
+     *:procnto*:*:* | *:QNX:[0123456789]*:*)
+ 	UNAME_PROCESSOR=`uname -p`
+-	if test "$UNAME_PROCESSOR" = "x86"; then
++	if test "$UNAME_PROCESSOR" = x86; then
+ 		UNAME_PROCESSOR=i386
+ 		UNAME_MACHINE=pc
+ 	fi
+-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
++	echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
+ 	exit ;;
+     *:QNX:*:4*)
+ 	echo i386-pc-qnx
+ 	exit ;;
+-    NEO-?:NONSTOP_KERNEL:*:*)
+-	echo neo-tandem-nsk${UNAME_RELEASE}
++    NEO-*:NONSTOP_KERNEL:*:*)
++	echo neo-tandem-nsk"$UNAME_RELEASE"
+ 	exit ;;
+     NSE-*:NONSTOP_KERNEL:*:*)
+-	echo nse-tandem-nsk${UNAME_RELEASE}
++	echo nse-tandem-nsk"$UNAME_RELEASE"
+ 	exit ;;
+-    NSR-?:NONSTOP_KERNEL:*:*)
+-	echo nsr-tandem-nsk${UNAME_RELEASE}
++    NSR-*:NONSTOP_KERNEL:*:*)
++	echo nsr-tandem-nsk"$UNAME_RELEASE"
++	exit ;;
++    NSV-*:NONSTOP_KERNEL:*:*)
++	echo nsv-tandem-nsk"$UNAME_RELEASE"
++	exit ;;
++    NSX-*:NONSTOP_KERNEL:*:*)
++	echo nsx-tandem-nsk"$UNAME_RELEASE"
+ 	exit ;;
+     *:NonStop-UX:*:*)
+ 	echo mips-compaq-nonstopux
+@@ -1300,18 +1356,18 @@ EOF
+ 	echo bs2000-siemens-sysv
+ 	exit ;;
+     DS/*:UNIX_System_V:*:*)
+-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
++	echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
+ 	exit ;;
+     *:Plan9:*:*)
+ 	# "uname -m" is not consistent, so use $cputype instead. 386
+ 	# is converted to i386 for consistency with other x86
+ 	# operating systems.
+-	if test "$cputype" = "386"; then
++	if test "$cputype" = 386; then
+ 	    UNAME_MACHINE=i386
+ 	else
+ 	    UNAME_MACHINE="$cputype"
+ 	fi
+-	echo ${UNAME_MACHINE}-unknown-plan9
++	echo "$UNAME_MACHINE"-unknown-plan9
+ 	exit ;;
+     *:TOPS-10:*:*)
+ 	echo pdp10-unknown-tops10
+@@ -1332,14 +1388,14 @@ 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/[-(].*//'`
++	echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
+ 	exit ;;
+     *:*VMS:*:*)
+ 	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+-	case "${UNAME_MACHINE}" in
++	case "$UNAME_MACHINE" in
+ 	    A*) echo alpha-dec-vms ; exit ;;
+ 	    I*) echo ia64-dec-vms ; exit ;;
+ 	    V*) echo vax-dec-vms ; exit ;;
+@@ -1348,182 +1404,48 @@ EOF
+ 	echo i386-pc-xenix
+ 	exit ;;
+     i*86:skyos:*:*)
+-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
++	echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
+ 	exit ;;
+     i*86:rdos:*:*)
+-	echo ${UNAME_MACHINE}-pc-rdos
++	echo "$UNAME_MACHINE"-pc-rdos
+ 	exit ;;
+     i*86:AROS:*:*)
+-	echo ${UNAME_MACHINE}-pc-aros
++	echo "$UNAME_MACHINE"-pc-aros
+ 	exit ;;
+     x86_64:VMkernel:*:*)
+-	echo ${UNAME_MACHINE}-unknown-esx
++	echo "$UNAME_MACHINE"-unknown-esx
++	exit ;;
++    amd64:Isilon\ OneFS:*:*)
++	echo x86_64-unknown-onefs
+ 	exit ;;
+ esac
+ 
+-eval $set_cc_for_build
+-cat >$dummy.c <<EOF
+-#ifdef _SEQUENT_
+-# include <sys/types.h>
+-# include <sys/utsname.h>
+-#endif
+-main ()
+-{
+-#if defined (sony)
+-#if defined (MIPSEB)
+-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+-     I don't know....  */
+-  printf ("mips-sony-bsd\n"); exit (0);
+-#else
+-#include <sys/param.h>
+-  printf ("m68k-sony-newsos%s\n",
+-#ifdef NEWSOS4
+-	"4"
+-#else
+-	""
+-#endif
+-	); exit (0);
+-#endif
+-#endif
+-
+-#if defined (__arm) && defined (__acorn) && defined (__unix)
+-  printf ("arm-acorn-riscix\n"); exit (0);
+-#endif
+-
+-#if defined (hp300) && !defined (hpux)
+-  printf ("m68k-hp-bsd\n"); exit (0);
+-#endif
+-
+-#if defined (NeXT)
+-#if !defined (__ARCHITECTURE__)
+-#define __ARCHITECTURE__ "m68k"
+-#endif
+-  int version;
+-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+-  if (version < 4)
+-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+-  else
+-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+-  exit (0);
+-#endif
+-
+-#if defined (MULTIMAX) || defined (n16)
+-#if defined (UMAXV)
+-  printf ("ns32k-encore-sysv\n"); exit (0);
+-#else
+-#if defined (CMU)
+-  printf ("ns32k-encore-mach\n"); exit (0);
+-#else
+-  printf ("ns32k-encore-bsd\n"); exit (0);
+-#endif
+-#endif
+-#endif
+-
+-#if defined (__386BSD__)
+-  printf ("i386-pc-bsd\n"); exit (0);
+-#endif
+-
+-#if defined (sequent)
+-#if defined (i386)
+-  printf ("i386-sequent-dynix\n"); exit (0);
+-#endif
+-#if defined (ns32000)
+-  printf ("ns32k-sequent-dynix\n"); exit (0);
+-#endif
+-#endif
+-
+-#if defined (_SEQUENT_)
+-    struct utsname un;
+-
+-    uname(&un);
+-
+-    if (strncmp(un.version, "V2", 2) == 0) {
+-	printf ("i386-sequent-ptx2\n"); exit (0);
+-    }
+-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+-	printf ("i386-sequent-ptx1\n"); exit (0);
+-    }
+-    printf ("i386-sequent-ptx\n"); exit (0);
+-
+-#endif
+-
+-#if defined (vax)
+-# if !defined (ultrix)
+-#  include <sys/param.h>
+-#  if defined (BSD)
+-#   if BSD == 43
+-      printf ("vax-dec-bsd4.3\n"); exit (0);
+-#   else
+-#    if BSD == 199006
+-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+-#    else
+-      printf ("vax-dec-bsd\n"); exit (0);
+-#    endif
+-#   endif
+-#  else
+-    printf ("vax-dec-bsd\n"); exit (0);
+-#  endif
+-# else
+-    printf ("vax-dec-ultrix\n"); exit (0);
+-# endif
+-#endif
++echo "$0: unable to guess system type" >&2
+ 
+-#if defined (alliant) && defined (i860)
+-  printf ("i860-alliant-bsd\n"); exit (0);
+-#endif
++case "$UNAME_MACHINE:$UNAME_SYSTEM" in
++    mips:Linux | mips64:Linux)
++	# If we got here on MIPS GNU/Linux, output extra information.
++	cat >&2 <<EOF
+ 
+-  exit (1);
+-}
++NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
++the system type. Please install a C compiler and try again.
+ EOF
+-
+-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+-	{ echo "$SYSTEM_NAME"; exit; }
+-
+-# Apollos put the system type in the environment.
+-
+-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+-
+-# Convex versions that predate uname can use getsysinfo(1)
+-
+-if [ -x /usr/convex/getsysinfo ]
+-then
+-    case `getsysinfo -f cpu_type` in
+-    c1*)
+-	echo c1-convex-bsd
+-	exit ;;
+-    c2*)
+-	if getsysinfo -f scalar_acc
+-	then echo c32-convex-bsd
+-	else echo c2-convex-bsd
+-	fi
+-	exit ;;
+-    c34*)
+-	echo c34-convex-bsd
+-	exit ;;
+-    c38*)
+-	echo c38-convex-bsd
+-	exit ;;
+-    c4*)
+-	echo c4-convex-bsd
+-	exit ;;
+-    esac
+-fi
++	;;
++esac
+ 
+ cat >&2 <<EOF
+-$0: unable to guess system type
+ 
+-This script, last modified $timestamp, has failed to recognize
+-the operating system you are using. It is advised that you
+-download the most up to date version of the config scripts from
++This script (version $timestamp), has failed to recognize the
++operating system you are using. If your script is old, overwrite *all*
++copies of config.guess and config.sub with the latest versions from:
+ 
+-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
++  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+ and
+-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
++  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+ 
+-If the version you run ($0) is already up to date, please
+-send the following data and any information you think might be
+-pertinent to <config-patches@gnu.org> in order to provide the needed
+-information to handle your system.
++If $0 has already been updated, send the following data and any
++information you think might be pertinent to config-patches@gnu.org to
++provide the necessary information to handle your system.
+ 
+ config.guess timestamp = $timestamp
+ 
+@@ -1542,16 +1464,16 @@ hostinfo               = `(hostinfo) 2>/
+ /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+ /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+ 
+-UNAME_MACHINE = ${UNAME_MACHINE}
+-UNAME_RELEASE = ${UNAME_RELEASE}
+-UNAME_SYSTEM  = ${UNAME_SYSTEM}
+-UNAME_VERSION = ${UNAME_VERSION}
++UNAME_MACHINE = "$UNAME_MACHINE"
++UNAME_RELEASE = "$UNAME_RELEASE"
++UNAME_SYSTEM  = "$UNAME_SYSTEM"
++UNAME_VERSION = "$UNAME_VERSION"
+ EOF
+ 
+ exit 1
+ 
+ # Local variables:
+-# eval: (add-hook 'write-file-hooks 'time-stamp)
++# eval: (add-hook 'write-file-functions 'time-stamp)
+ # time-stamp-start: "timestamp='"
+ # time-stamp-format: "%:y-%02m-%02d"
+ # time-stamp-end: "'"
+--- firefox-esr-78.3.0esr.orig/js/src/ctypes/libffi/config.sub
++++ firefox-esr-78.3.0esr/js/src/ctypes/libffi/config.sub
+@@ -1,8 +1,8 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+-#   Copyright 1992-2013 Free Software Foundation, Inc.
++#   Copyright 1992-2018 Free Software Foundation, Inc.
+ 
+-timestamp='2013-08-10'
++timestamp='2018-02-22'
+ 
+ # 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
+@@ -15,7 +15,7 @@ timestamp='2013-08-10'
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, see <http://www.gnu.org/licenses/>.
++# along with this program; if not, see <https://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
+@@ -25,7 +25,7 @@ timestamp='2013-08-10'
+ # of the GNU General Public License, version 3 ("GPLv3").
+ 
+ 
+-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
++# Please send patches to <config-patches@gnu.org>.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+@@ -33,7 +33,7 @@ timestamp='2013-08-10'
+ # 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
++# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+ 
+ # This file is supposed to be the same for all GNU packages
+ # and recognize all the CPU types, system types and aliases
+@@ -53,12 +53,11 @@ timestamp='2013-08-10'
+ me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+ usage="\
+-Usage: $0 [OPTION] CPU-MFR-OPSYS
+-       $0 [OPTION] ALIAS
++Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
+ 
+ Canonicalize a configuration name.
+ 
+-Operation modes:
++Options:
+   -h, --help         print this help, then exit
+   -t, --time-stamp   print date of last modification, then exit
+   -v, --version      print version number, then exit
+@@ -68,7 +67,7 @@ Report bugs and patches to <config-patch
+ version="\
+ GNU config.sub ($timestamp)
+ 
+-Copyright 1992-2013 Free Software Foundation, Inc.
++Copyright 1992-2018 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."
+@@ -95,7 +94,7 @@ while test $# -gt 0 ; do
+ 
+     *local*)
+        # First pass through any local machine types.
+-       echo $1
++       echo "$1"
+        exit ;;
+ 
+     * )
+@@ -113,24 +112,24 @@ esac
+ 
+ # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+ # Here we must recognize all the valid KERNEL-OS combinations.
+-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
++maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+   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* | \
++  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
++  kopensolaris*-gnu* | cloudabi*-eabi* | \
+   storm-chaos* | os2-emx* | rtmk-nova*)
+     os=-$maybe_os
+-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
++    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/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+     ;;
+   *)
+-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+-    if [ $basic_machine != $1 ]
+-    then os=`echo $1 | sed 's/.*-/-/'`
++    basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
++    if [ "$basic_machine" != "$1" ]
++    then os=`echo "$1" | sed 's/.*-/-/'`
+     else os=; fi
+     ;;
+ esac
+@@ -179,44 +178,44 @@ case $os in
+ 		;;
+ 	-sco6)
+ 		os=-sco5v6
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco5)
+ 		os=-sco3.2v5
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco4)
+ 		os=-sco3.2v4
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco3.2.[4-9]*)
+ 		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco3.2v[4-9]*)
+ 		# Don't forget version if it is 3.2v4 or newer.
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco5v6*)
+ 		# Don't forget version if it is 3.2v4 or newer.
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco*)
+ 		os=-sco3.2v2
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-udk*)
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-isc)
+ 		os=-isc2.2
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-clix*)
+ 		basic_machine=clipper-intergraph
+ 		;;
+ 	-isc*)
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-lynx*178)
+ 		os=-lynxos178
+@@ -228,10 +227,7 @@ case $os in
+ 		os=-lynxos
+ 		;;
+ 	-ptx*)
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+-		;;
+-	-windowsnt*)
+-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
+ 		;;
+ 	-psos*)
+ 		os=-psos
+@@ -255,16 +251,18 @@ case $basic_machine in
+ 	| arc | arceb \
+ 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+ 	| avr | avr32 \
++	| ba \
+ 	| be32 | be64 \
+ 	| bfin \
+ 	| c4x | c8051 | clipper \
+ 	| d10v | d30v | dlx | dsp16xx \
+-	| epiphany \
+-	| fido | fr30 | frv \
++	| e2k | epiphany \
++	| fido | fr30 | frv | ft32 \
+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ 	| hexagon \
+-	| i370 | i860 | i960 | ia64 \
++	| i370 | i860 | i960 | ia16 | ia64 \
+ 	| ip2k | iq2000 \
++	| k1om \
+ 	| le32 | le64 \
+ 	| lm32 \
+ 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+@@ -282,8 +280,10 @@ case $basic_machine in
+ 	| mips64vr5900 | mips64vr5900el \
+ 	| mipsisa32 | mipsisa32el \
+ 	| mipsisa32r2 | mipsisa32r2el \
++	| mipsisa32r6 | mipsisa32r6el \
+ 	| mipsisa64 | mipsisa64el \
+ 	| mipsisa64r2 | mipsisa64r2el \
++	| mipsisa64r6 | mipsisa64r6el \
+ 	| mipsisa64sb1 | mipsisa64sb1el \
+ 	| mipsisa64sr71k | mipsisa64sr71kel \
+ 	| mipsr5900 | mipsr5900el \
+@@ -295,14 +295,15 @@ case $basic_machine in
+ 	| nds32 | nds32le | nds32be \
+ 	| nios | nios2 | nios2eb | nios2el \
+ 	| ns16k | ns32k \
+-	| open8 \
+-	| or1k | or32 \
+-	| pdp10 | pdp11 | pj | pjl \
++	| open8 | or1k | or1knd | or32 \
++	| pdp10 | pj | pjl \
+ 	| powerpc | powerpc64 | powerpc64le | powerpcle \
++	| pru \
+ 	| pyramid \
++	| riscv32 | riscv64 \
+ 	| 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 \
++	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ 	| sh64 | sh64le \
+ 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+ 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+@@ -310,7 +311,8 @@ case $basic_machine in
+ 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+ 	| ubicom32 \
+ 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+-	| we32k \
++	| visium \
++	| wasm32 \
+ 	| x86 | xc16x | xstormy16 | xtensa \
+ 	| z8k | z80)
+ 		basic_machine=$basic_machine-unknown
+@@ -324,11 +326,14 @@ case $basic_machine in
+ 	c6x)
+ 		basic_machine=tic6x-unknown
+ 		;;
+-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
++	leon|leon[3-9])
++		basic_machine=sparc-$basic_machine
++		;;
++	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
+ 		basic_machine=$basic_machine-unknown
+ 		os=-none
+ 		;;
+-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
++	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
+ 		;;
+ 	ms1)
+ 		basic_machine=mt-unknown
+@@ -357,7 +362,7 @@ case $basic_machine in
+ 	  ;;
+ 	# Object if more than one company name word.
+ 	*-*-*)
+-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
++		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
+ 		exit 1
+ 		;;
+ 	# Recognize the basic CPU types with company name.
+@@ -369,18 +374,20 @@ case $basic_machine in
+ 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+ 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+ 	| avr-* | avr32-* \
++	| ba-* \
+ 	| be32-* | be64-* \
+ 	| bfin-* | bs2000-* \
+ 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+ 	| c8051-* | clipper-* | craynv-* | cydra-* \
+ 	| d10v-* | d30v-* | dlx-* \
+-	| elxsi-* \
++	| e2k-* | 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-* \
++	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
+ 	| ip2k-* | iq2000-* \
++	| k1om-* \
+ 	| le32-* | le64-* \
+ 	| lm32-* \
+ 	| m32c-* | m32r-* | m32rle-* \
+@@ -400,8 +407,10 @@ case $basic_machine in
+ 	| mips64vr5900-* | mips64vr5900el-* \
+ 	| mipsisa32-* | mipsisa32el-* \
+ 	| mipsisa32r2-* | mipsisa32r2el-* \
++	| mipsisa32r6-* | mipsisa32r6el-* \
+ 	| mipsisa64-* | mipsisa64el-* \
+ 	| mipsisa64r2-* | mipsisa64r2el-* \
++	| mipsisa64r6-* | mipsisa64r6el-* \
+ 	| mipsisa64sb1-* | mipsisa64sb1el-* \
+ 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ 	| mipsr5900-* | mipsr5900el-* \
+@@ -413,16 +422,19 @@ case $basic_machine in
+ 	| nios-* | nios2-* | nios2eb-* | nios2el-* \
+ 	| none-* | np1-* | ns16k-* | ns32k-* \
+ 	| open8-* \
++	| or1k*-* \
+ 	| orion-* \
+ 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
++	| pru-* \
+ 	| pyramid-* \
++	| riscv32-* | riscv64-* \
+ 	| 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-* | sv1-* | sx?-* \
++	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
+ 	| tahoe-* \
+ 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ 	| tile*-* \
+@@ -430,6 +442,8 @@ case $basic_machine in
+ 	| ubicom32-* \
+ 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+ 	| vax-* \
++	| visium-* \
++	| wasm32-* \
+ 	| we32k-* \
+ 	| x86-* | x86_64-* | xc16x-* | xps100-* \
+ 	| xstormy16-* | xtensa*-* \
+@@ -443,7 +457,7 @@ case $basic_machine in
+ 	# Recognize the various machine names and aliases which stand
+ 	# for a CPU type and a company and sometimes even an OS.
+ 	386bsd)
+-		basic_machine=i386-unknown
++		basic_machine=i386-pc
+ 		os=-bsd
+ 		;;
+ 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+@@ -477,7 +491,7 @@ case $basic_machine in
+ 		basic_machine=x86_64-pc
+ 		;;
+ 	amd64-*)
+-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	amdahl)
+ 		basic_machine=580-amdahl
+@@ -506,6 +520,9 @@ case $basic_machine in
+ 		basic_machine=i386-pc
+ 		os=-aros
+ 		;;
++	asmjs)
++		basic_machine=asmjs-unknown
++		;;
+ 	aux)
+ 		basic_machine=m68k-apple
+ 		os=-aux
+@@ -519,7 +536,7 @@ case $basic_machine in
+ 		os=-linux
+ 		;;
+ 	blackfin-*)
+-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		os=-linux
+ 		;;
+ 	bluegene*)
+@@ -527,13 +544,13 @@ case $basic_machine in
+ 		os=-cnk
+ 		;;
+ 	c54x-*)
+-		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	c55x-*)
+-		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	c6x-*)
+-		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	c90)
+ 		basic_machine=c90-cray
+@@ -622,10 +639,18 @@ case $basic_machine in
+ 		basic_machine=rs6000-bull
+ 		os=-bosx
+ 		;;
+-	dpx2* | dpx2*-bull)
++	dpx2*)
+ 		basic_machine=m68k-bull
+ 		os=-sysv3
+ 		;;
++	e500v[12])
++		basic_machine=powerpc-unknown
++		os=$os"spe"
++		;;
++	e500v[12]-*)
++		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++		os=$os"spe"
++		;;
+ 	ebmon29k)
+ 		basic_machine=a29k-amd
+ 		os=-ebmon
+@@ -715,9 +740,6 @@ case $basic_machine in
+ 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+ 		basic_machine=hppa1.0-hp
+ 		;;
+-	hppa-next)
+-		os=-nextstep3
+-		;;
+ 	hppaosf)
+ 		basic_machine=hppa1.1-hp
+ 		os=-osf
+@@ -730,26 +752,26 @@ case $basic_machine in
+ 		basic_machine=i370-ibm
+ 		;;
+ 	i*86v32)
+-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv32
+ 		;;
+ 	i*86v4*)
+-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv4
+ 		;;
+ 	i*86v)
+-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv
+ 		;;
+ 	i*86sol2)
+-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+ 		os=-solaris2
+ 		;;
+ 	i386mach)
+ 		basic_machine=i386-mach
+ 		os=-mach
+ 		;;
+-	i386-vsta | vsta)
++	vsta)
+ 		basic_machine=i386-unknown
+ 		os=-vsta
+ 		;;
+@@ -767,17 +789,17 @@ case $basic_machine in
+ 		basic_machine=m68k-isi
+ 		os=-sysv
+ 		;;
++	leon-*|leon[3-9]-*)
++		basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
++		;;
+ 	m68knommu)
+ 		basic_machine=m68k-unknown
+ 		os=-linux
+ 		;;
+ 	m68knommu-*)
+-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		os=-linux
+ 		;;
+-	m88k-omron*)
+-		basic_machine=m88k-omron
+-		;;
+ 	magnum | m3230)
+ 		basic_machine=mips-mips
+ 		os=-sysv
+@@ -809,10 +831,10 @@ case $basic_machine in
+ 		os=-mint
+ 		;;
+ 	mips3*-*)
+-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
++		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
+ 		;;
+ 	mips3*)
+-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
++		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
+ 		;;
+ 	monitor)
+ 		basic_machine=m68k-rom68k
+@@ -822,12 +844,16 @@ case $basic_machine in
+ 		basic_machine=powerpc-unknown
+ 		os=-morphos
+ 		;;
++	moxiebox)
++		basic_machine=moxie-unknown
++		os=-moxiebox
++		;;
+ 	msdos)
+ 		basic_machine=i386-pc
+ 		os=-msdos
+ 		;;
+ 	ms1-*)
+-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
++		basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
+ 		;;
+ 	msys)
+ 		basic_machine=i686-pc
+@@ -869,7 +895,7 @@ case $basic_machine in
+ 		basic_machine=v70-nec
+ 		os=-sysv
+ 		;;
+-	next | m*-next )
++	next | m*-next)
+ 		basic_machine=m68k-next
+ 		case $os in
+ 		    -nextstep* )
+@@ -914,6 +940,12 @@ case $basic_machine in
+ 	nsr-tandem)
+ 		basic_machine=nsr-tandem
+ 		;;
++	nsv-tandem)
++		basic_machine=nsv-tandem
++		;;
++	nsx-tandem)
++		basic_machine=nsx-tandem
++		;;
+ 	op50n-* | op60c-*)
+ 		basic_machine=hppa1.1-oki
+ 		os=-proelf
+@@ -946,7 +978,7 @@ case $basic_machine in
+ 		os=-linux
+ 		;;
+ 	parisc-*)
+-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		os=-linux
+ 		;;
+ 	pbd)
+@@ -962,7 +994,7 @@ case $basic_machine in
+ 		basic_machine=i386-pc
+ 		;;
+ 	pc98-*)
+-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	pentium | p5 | k5 | k6 | nexgen | viac3)
+ 		basic_machine=i586-pc
+@@ -977,16 +1009,16 @@ case $basic_machine in
+ 		basic_machine=i786-pc
+ 		;;
+ 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	pentium4-*)
+-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	pn)
+ 		basic_machine=pn-gould
+@@ -996,23 +1028,23 @@ case $basic_machine in
+ 	ppc | ppcbe)	basic_machine=powerpc-unknown
+ 		;;
+ 	ppc-* | ppcbe-*)
+-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+-	ppcle | powerpclittle | ppc-le | powerpc-little)
++	ppcle | powerpclittle)
+ 		basic_machine=powerpcle-unknown
+ 		;;
+ 	ppcle-* | powerpclittle-*)
+-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	ppc64)	basic_machine=powerpc64-unknown
+ 		;;
+-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
++	ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
++	ppc64le | powerpc64little)
+ 		basic_machine=powerpc64le-unknown
+ 		;;
+ 	ppc64le-* | powerpc64little-*)
+-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	ps2)
+ 		basic_machine=i386-ibm
+@@ -1066,17 +1098,10 @@ case $basic_machine in
+ 	sequent)
+ 		basic_machine=i386-sequent
+ 		;;
+-	sh)
+-		basic_machine=sh-hitachi
+-		os=-hms
+-		;;
+ 	sh5el)
+ 		basic_machine=sh5le-unknown
+ 		;;
+-	sh64)
+-		basic_machine=sh64-unknown
+-		;;
+-	sparclite-wrs | simso-wrs)
++	simso-wrs)
+ 		basic_machine=sparclite-wrs
+ 		os=-vxworks
+ 		;;
+@@ -1095,7 +1120,7 @@ case $basic_machine in
+ 		os=-sysv4
+ 		;;
+ 	strongarm-* | thumb-*)
+-		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	sun2)
+ 		basic_machine=m68000-sun
+@@ -1217,6 +1242,9 @@ case $basic_machine in
+ 		basic_machine=hppa1.1-winbond
+ 		os=-proelf
+ 		;;
++	x64)
++		basic_machine=x86_64-pc
++		;;
+ 	xbox)
+ 		basic_machine=i686-pc
+ 		os=-mingw32
+@@ -1225,20 +1253,12 @@ case $basic_machine in
+ 		basic_machine=xps100-honeywell
+ 		;;
+ 	xscale-* | xscalee[bl]-*)
+-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
++		basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
+ 		;;
+ 	ymp)
+ 		basic_machine=ymp-cray
+ 		os=-unicos
+ 		;;
+-	z8k-*-coff)
+-		basic_machine=z8k-unknown
+-		os=-sim
+-		;;
+-	z80-*-coff)
+-		basic_machine=z80-unknown
+-		os=-sim
+-		;;
+ 	none)
+ 		basic_machine=none-none
+ 		os=-none
+@@ -1267,10 +1287,6 @@ case $basic_machine in
+ 	vax)
+ 		basic_machine=vax-dec
+ 		;;
+-	pdp10)
+-		# there are many clones, so DEC is not a safe bet
+-		basic_machine=pdp10-unknown
+-		;;
+ 	pdp11)
+ 		basic_machine=pdp11-dec
+ 		;;
+@@ -1280,9 +1296,6 @@ case $basic_machine in
+ 	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+ 		basic_machine=sh-unknown
+ 		;;
+-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+-		basic_machine=sparc-sun
+-		;;
+ 	cydra)
+ 		basic_machine=cydra-cydrome
+ 		;;
+@@ -1302,7 +1315,7 @@ case $basic_machine in
+ 		# Make sure to match an already-canonicalized machine name.
+ 		;;
+ 	*)
+-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
++		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
+ 		exit 1
+ 		;;
+ esac
+@@ -1310,10 +1323,10 @@ esac
+ # Here we canonicalize certain aliases for manufacturers.
+ case $basic_machine in
+ 	*-digital*)
+-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
++		basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
+ 		;;
+ 	*-commodore*)
+-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
++		basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
+ 		;;
+ 	*)
+ 		;;
+@@ -1324,8 +1337,8 @@ 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
+@@ -1336,45 +1349,48 @@ case $os in
+ 	-solaris)
+ 		os=-solaris2
+ 		;;
+-	-svr4*)
+-		os=-sysv4
+-		;;
+ 	-unixware*)
+ 		os=-sysv4.2uw
+ 		;;
+ 	-gnu/linux*)
+ 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+ 		;;
+-	# First accept the basic system types.
++	# es1800 is here to avoid being matched by es* (a different OS)
++	-es1800*)
++		os=-ose
++		;;
++	# Now accept the basic system types.
+ 	# The portable systems comes first.
+-	# Each alternative MUST END IN A *, to match a version number.
++	# 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* | -cnk* | -sunos | -sunos[34]*\
+ 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+ 	      | -sym* | -kopensolaris* | -plan9* \
+ 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+-	      | -aos* | -aros* \
++	      | -aos* | -aros* | -cloudabi* | -sortix* \
+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+-	      | -bitrig* | -openbsd* | -solidbsd* \
++	      | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
++	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
+ 	      | -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* \
++	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
+ 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
++	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+ 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+-	      | -uxpv* | -beos* | -mpeix* | -udk* \
+-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
++	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
++	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+ 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
++	      | -morphos* | -superux* | -rtmk* | -windiss* \
+ 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
++	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
++	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
++	      | -midnightbsd*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	-qnx*)
+@@ -1391,12 +1407,12 @@ case $os in
+ 	-nto*)
+ 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+ 		;;
+-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
++	-sim | -xray | -os68k* | -v88r* \
++	      | -windows* | -osx | -abug | -netware* | -os9* \
+ 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+ 		;;
+ 	-mac*)
+-		os=`echo $os | sed -e 's|mac|macos|'`
++		os=`echo "$os" | sed -e 's|mac|macos|'`
+ 		;;
+ 	-linux-dietlibc)
+ 		os=-linux-dietlibc
+@@ -1405,10 +1421,10 @@ case $os in
+ 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+ 		;;
+ 	-sunos5*)
+-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
++		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
+ 		;;
+ 	-sunos6*)
+-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
++		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
+ 		;;
+ 	-opened*)
+ 		os=-openedition
+@@ -1419,12 +1435,6 @@ case $os in
+ 	-wince*)
+ 		os=-wince
+ 		;;
+-	-osfrose*)
+-		os=-osfrose
+-		;;
+-	-osf*)
+-		os=-osf
+-		;;
+ 	-utek*)
+ 		os=-bsd
+ 		;;
+@@ -1449,7 +1459,7 @@ case $os in
+ 	-nova*)
+ 		os=-rtmk-nova
+ 		;;
+-	-ns2 )
++	-ns2)
+ 		os=-nextstep2
+ 		;;
+ 	-nsk*)
+@@ -1471,7 +1481,7 @@ case $os in
+ 	-oss*)
+ 		os=-sysv3
+ 		;;
+-	-svr4)
++	-svr4*)
+ 		os=-sysv4
+ 		;;
+ 	-svr3)
+@@ -1486,32 +1496,38 @@ case $os in
+ 	-ose*)
+ 		os=-ose
+ 		;;
+-	-es1800*)
+-		os=-ose
+-		;;
+-	-xenix)
+-		os=-xenix
+-		;;
+ 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ 		os=-mint
+ 		;;
+-	-aros*)
+-		os=-aros
+-		;;
+ 	-zvmoe)
+ 		os=-zvmoe
+ 		;;
+ 	-dicos*)
+ 		os=-dicos
+ 		;;
++	-pikeos*)
++		# Until real need of OS specific support for
++		# particular features comes up, bare metal
++		# configurations are quite functional.
++		case $basic_machine in
++		    arm*)
++			os=-eabi
++			;;
++		    *)
++			os=-elf
++			;;
++		esac
++		;;
+ 	-nacl*)
+ 		;;
++	-ios)
++		;;
+ 	-none)
+ 		;;
+ 	*)
+ 		# Get rid of the `-' at the beginning of $os.
+ 		os=`echo $os | sed 's/[^-]*-//'`
+-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
++		echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
+ 		exit 1
+ 		;;
+ esac
+@@ -1592,9 +1608,6 @@ case $basic_machine in
+ 	mips*-*)
+ 		os=-elf
+ 		;;
+-	or1k-*)
+-		os=-elf
+-		;;
+ 	or32-*)
+ 		os=-coff
+ 		;;
+@@ -1604,12 +1617,12 @@ case $basic_machine in
+ 	sparc-* | *-sun)
+ 		os=-sunos4.1.1
+ 		;;
++	pru-*)
++		os=-elf
++		;;
+ 	*-be)
+ 		os=-beos
+ 		;;
+-	*-haiku)
+-		os=-haiku
+-		;;
+ 	*-ibm)
+ 		os=-aix
+ 		;;
+@@ -1649,7 +1662,7 @@ case $basic_machine in
+ 	m88k-omron*)
+ 		os=-luna
+ 		;;
+-	*-next )
++	*-next)
+ 		os=-nextstep
+ 		;;
+ 	*-sequent)
+@@ -1664,9 +1677,6 @@ case $basic_machine in
+ 	i370-*)
+ 		os=-mvs
+ 		;;
+-	*-next)
+-		os=-nextstep3
+-		;;
+ 	*-gould)
+ 		os=-sysv
+ 		;;
+@@ -1776,15 +1786,15 @@ case $basic_machine in
+ 				vendor=stratus
+ 				;;
+ 		esac
+-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
++		basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
+ 		;;
+ esac
+ 
+-echo $basic_machine$os
++echo "$basic_machine$os"
+ exit
+ 
+ # Local variables:
+-# eval: (add-hook 'write-file-hooks 'time-stamp)
++# eval: (add-hook 'write-file-functions 'time-stamp)
+ # time-stamp-start: "timestamp='"
+ # time-stamp-format: "%:y-%02m-%02d"
+ # time-stamp-end: "'"
+--- firefox-esr-78.3.0esr.orig/modules/freetype2/builds/unix/config.guess
++++ firefox-esr-78.3.0esr/modules/freetype2/builds/unix/config.guess
+@@ -1095,7 +1095,11 @@ EOF
+ 	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
+ 	exit ;;
+     x86_64:Linux:*:*)
+-	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
++	if objdump -f /bin/sh | grep -q elf32-x86-64; then
++	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
++	else
++	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
++	fi
+ 	exit ;;
+     xtensa*:Linux:*:*)
+ 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+@@ -1667,7 +1671,7 @@ fi
+ exit 1
+ 
+ # Local variables:
+-# eval: (add-hook 'before-save-hook 'time-stamp)
++# eval: (add-hook 'write-file-functions 'time-stamp)
+ # time-stamp-start: "timestamp='"
+ # time-stamp-format: "%:y-%02m-%02d"
+ # time-stamp-end: "'"
+--- firefox-esr-78.3.0esr.orig/nsprpub/build/autoconf/config.guess
++++ firefox-esr-78.3.0esr/nsprpub/build/autoconf/config.guess
+@@ -1,8 +1,8 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-#   Copyright 1992-2014 Free Software Foundation, Inc.
++#   Copyright 1992-2018 Free Software Foundation, Inc.
+ 
+-timestamp='2014-02-12'
++timestamp='2018-02-24'
+ 
+ # 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
+@@ -15,7 +15,7 @@ timestamp='2014-02-12'
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, see <http://www.gnu.org/licenses/>.
++# along with this program; if not, see <https://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
+@@ -24,12 +24,12 @@ timestamp='2014-02-12'
+ # program.  This Exception is an additional permission under section 7
+ # of the GNU General Public License, version 3 ("GPLv3").
+ #
+-# Originally written by Per Bothner.
++# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
+ #
+ # 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
++# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+ #
+-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
++# Please send patches to <config-patches@gnu.org>.
+ 
+ 
+ me=`echo "$0" | sed -e 's,.*/,,'`
+@@ -39,7 +39,7 @@ Usage: $0 [OPTION]
+ 
+ Output the configuration name of the system \`$me' is run on.
+ 
+-Operation modes:
++Options:
+   -h, --help         print this help, then exit
+   -t, --time-stamp   print date of last modification, then exit
+   -v, --version      print version number, then exit
+@@ -50,7 +50,7 @@ version="\
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright 1992-2014 Free Software Foundation, Inc.
++Copyright 1992-2018 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."
+@@ -107,9 +107,9 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdi
+ dummy=$tmp/dummy ;
+ tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+ case $CC_FOR_BUILD,$HOST_CC,$CC in
+- ,,)    echo "int x;" > $dummy.c ;
++ ,,)    echo "int x;" > "$dummy.c" ;
+ 	for c in cc gcc c89 c99 ; do
+-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
++	  if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+ 	     CC_FOR_BUILD="$c"; break ;
+ 	  fi ;
+ 	done ;
+@@ -132,14 +132,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+ 
+-case "${UNAME_SYSTEM}" in
++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
++	eval "$set_cc_for_build"
++	cat <<-EOF > "$dummy.c"
+ 	#include <features.h>
+ 	#if defined(__UCLIBC__)
+ 	LIBC=uclibc
+@@ -149,13 +149,20 @@ Linux|GNU|GNU/*)
+ 	LIBC=gnu
+ 	#endif
+ 	EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
++	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
++
++	# If ldd exists, use it to detect musl libc.
++	if command -v ldd >/dev/null && \
++		ldd --version 2>&1 | grep -q ^musl
++	then
++	    LIBC=musl
++	fi
+ 	;;
+ esac
+ 
+ # Note: order is significant - the case branches are not exclusive.
+ 
+-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
++case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
+     *:NetBSD:*:*)
+ 	# NetBSD (nbsd) targets should (where applicable) match one or
+ 	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+@@ -168,21 +175,31 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 	# Note: NetBSD doesn't particularly care about the vendor
+ 	# portion of the name.  We always set it to "unknown".
+ 	sysctl="sysctl -n hw.machine_arch"
+-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+-	case "${UNAME_MACHINE_ARCH}" in
++	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
++	    "/sbin/$sysctl" 2>/dev/null || \
++	    "/usr/sbin/$sysctl" 2>/dev/null || \
++	    echo unknown)`
++	case "$UNAME_MACHINE_ARCH" in
+ 	    armeb) machine=armeb-unknown ;;
+ 	    arm*) machine=arm-unknown ;;
+ 	    sh3el) machine=shl-unknown ;;
+ 	    sh3eb) machine=sh-unknown ;;
+ 	    sh5el) machine=sh5le-unknown ;;
+-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
++	    earmv*)
++		arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
++		endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
++		machine="${arch}${endian}"-unknown
++		;;
++	    *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
+ 	esac
+ 	# The Operating System including object format, if it has switched
+-	# to ELF recently, or will in the future.
+-	case "${UNAME_MACHINE_ARCH}" in
++	# to ELF recently (or will in the future) and ABI.
++	case "$UNAME_MACHINE_ARCH" in
++	    earm*)
++		os=netbsdelf
++		;;
+ 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+-		eval $set_cc_for_build
++		eval "$set_cc_for_build"
+ 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ 			| grep -q __ELF__
+ 		then
+@@ -197,44 +214,67 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 		os=netbsd
+ 		;;
+ 	esac
++	# Determine ABI tags.
++	case "$UNAME_MACHINE_ARCH" in
++	    earm*)
++		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
++		abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
++		;;
++	esac
+ 	# The OS release
+ 	# Debian GNU/NetBSD machines have a different userland, and
+ 	# thus, need a distinct triplet. However, they do not need
+ 	# kernel version information, so it can be replaced with a
+ 	# suitable tag, in the style of linux-gnu.
+-	case "${UNAME_VERSION}" in
++	case "$UNAME_VERSION" in
+ 	    Debian*)
+ 		release='-gnu'
+ 		;;
+ 	    *)
+-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
++		release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
+ 		;;
+ 	esac
+ 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+ 	# contains redundant information, the shorter form:
+ 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+-	echo "${machine}-${os}${release}"
++	echo "$machine-${os}${release}${abi}"
+ 	exit ;;
+     *:Bitrig:*:*)
+ 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+-	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
++	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}
++	echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
++	exit ;;
++    *:LibertyBSD:*:*)
++	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
++	echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
++	exit ;;
++    *:MidnightBSD:*:*)
++	echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
+ 	exit ;;
+     *:ekkoBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
++	echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
+ 	exit ;;
+     *:SolidBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
++	echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
+ 	exit ;;
+     macppc:MirBSD:*:*)
+-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
++	echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
+ 	exit ;;
+     *:MirBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
++	echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
++	exit ;;
++    *:Sortix:*:*)
++	echo "$UNAME_MACHINE"-unknown-sortix
+ 	exit ;;
++    *:Redox:*:*)
++	echo "$UNAME_MACHINE"-unknown-redox
++	exit ;;
++    mips:OSF1:*.*)
++        echo mips-dec-osf1
++        exit ;;
+     alpha:OSF1:*:*)
+ 	case $UNAME_RELEASE in
+ 	*4.0)
+@@ -251,63 +291,54 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+ 	case "$ALPHA_CPU_TYPE" in
+ 	    "EV4 (21064)")
+-		UNAME_MACHINE="alpha" ;;
++		UNAME_MACHINE=alpha ;;
+ 	    "EV4.5 (21064)")
+-		UNAME_MACHINE="alpha" ;;
++		UNAME_MACHINE=alpha ;;
+ 	    "LCA4 (21066/21068)")
+-		UNAME_MACHINE="alpha" ;;
++		UNAME_MACHINE=alpha ;;
+ 	    "EV5 (21164)")
+-		UNAME_MACHINE="alphaev5" ;;
++		UNAME_MACHINE=alphaev5 ;;
+ 	    "EV5.6 (21164A)")
+-		UNAME_MACHINE="alphaev56" ;;
++		UNAME_MACHINE=alphaev56 ;;
+ 	    "EV5.6 (21164PC)")
+-		UNAME_MACHINE="alphapca56" ;;
++		UNAME_MACHINE=alphapca56 ;;
+ 	    "EV5.7 (21164PC)")
+-		UNAME_MACHINE="alphapca57" ;;
++		UNAME_MACHINE=alphapca57 ;;
+ 	    "EV6 (21264)")
+-		UNAME_MACHINE="alphaev6" ;;
++		UNAME_MACHINE=alphaev6 ;;
+ 	    "EV6.7 (21264A)")
+-		UNAME_MACHINE="alphaev67" ;;
++		UNAME_MACHINE=alphaev67 ;;
+ 	    "EV6.8CB (21264C)")
+-		UNAME_MACHINE="alphaev68" ;;
++		UNAME_MACHINE=alphaev68 ;;
+ 	    "EV6.8AL (21264B)")
+-		UNAME_MACHINE="alphaev68" ;;
++		UNAME_MACHINE=alphaev68 ;;
+ 	    "EV6.8CX (21264D)")
+-		UNAME_MACHINE="alphaev68" ;;
++		UNAME_MACHINE=alphaev68 ;;
+ 	    "EV6.9A (21264/EV69A)")
+-		UNAME_MACHINE="alphaev69" ;;
++		UNAME_MACHINE=alphaev69 ;;
+ 	    "EV7 (21364)")
+-		UNAME_MACHINE="alphaev7" ;;
++		UNAME_MACHINE=alphaev7 ;;
+ 	    "EV7.9 (21364A)")
+-		UNAME_MACHINE="alphaev79" ;;
++		UNAME_MACHINE=alphaev79 ;;
+ 	esac
+ 	# A Pn.n version is a patched version.
+ 	# A Vn.n version is a released version.
+ 	# A Tn.n version is a released field test version.
+ 	# 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'`
++	echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
+ 	# 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
+-	# of the specific Alpha model?
+-	echo alpha-pc-interix
+-	exit ;;
+-    21064:Windows_NT:50:3)
+-	echo alpha-dec-winnt3.5
+-	exit ;;
+     Amiga*:UNIX_System_V:4.0:*)
+ 	echo m68k-unknown-sysv4
+ 	exit ;;
+     *:[Aa]miga[Oo][Ss]:*:*)
+-	echo ${UNAME_MACHINE}-unknown-amigaos
++	echo "$UNAME_MACHINE"-unknown-amigaos
+ 	exit ;;
+     *:[Mm]orph[Oo][Ss]:*:*)
+-	echo ${UNAME_MACHINE}-unknown-morphos
++	echo "$UNAME_MACHINE"-unknown-morphos
+ 	exit ;;
+     *:OS/390:*:*)
+ 	echo i370-ibm-openedition
+@@ -319,7 +350,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 	echo powerpc-ibm-os400
+ 	exit ;;
+     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+-	echo arm-acorn-riscix${UNAME_RELEASE}
++	echo arm-acorn-riscix"$UNAME_RELEASE"
+ 	exit ;;
+     arm*:riscos:*:*|arm*:RISCOS:*:*)
+ 	echo arm-unknown-riscos
+@@ -346,38 +377,38 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 	    sparc) echo sparc-icl-nx7; exit ;;
+ 	esac ;;
+     s390x:SunOS:*:*)
+-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
+ 	exit ;;
+     sun4H:SunOS:5.*:*)
+-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+ 	exit ;;
+     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
+ 	exit ;;
+     i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+-	echo i386-pc-auroraux${UNAME_RELEASE}
++	echo i386-pc-auroraux"$UNAME_RELEASE"
+ 	exit ;;
+     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+-	eval $set_cc_for_build
+-	SUN_ARCH="i386"
++	eval "$set_cc_for_build"
++	SUN_ARCH=i386
+ 	# If there is a compiler, see if it is configured for 64-bit objects.
+ 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+ 	# This test works for both compilers.
+-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+ 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ 		grep IS_64BIT_ARCH >/dev/null
+ 	    then
+-		SUN_ARCH="x86_64"
++		SUN_ARCH=x86_64
+ 	    fi
+ 	fi
+-	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+ 	exit ;;
+     sun4*:SunOS:6*:*)
+ 	# According to config.sub, this is the proper way to canonicalize
+ 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+ 	# it's likely to be more like Solaris than SunOS4.
+-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+ 	exit ;;
+     sun4*:SunOS:*:*)
+ 	case "`/usr/bin/arch -k`" in
+@@ -386,25 +417,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 		;;
+ 	esac
+ 	# Japanese Language versions have a version number like `4.1.3-JL'.
+-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
++	echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
+ 	exit ;;
+     sun3*:SunOS:*:*)
+-	echo m68k-sun-sunos${UNAME_RELEASE}
++	echo m68k-sun-sunos"$UNAME_RELEASE"
+ 	exit ;;
+     sun*:*:4.2BSD:*)
+ 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
++	test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
+ 	case "`/bin/arch`" in
+ 	    sun3)
+-		echo m68k-sun-sunos${UNAME_RELEASE}
++		echo m68k-sun-sunos"$UNAME_RELEASE"
+ 		;;
+ 	    sun4)
+-		echo sparc-sun-sunos${UNAME_RELEASE}
++		echo sparc-sun-sunos"$UNAME_RELEASE"
+ 		;;
+ 	esac
+ 	exit ;;
+     aushp:SunOS:*:*)
+-	echo sparc-auspex-sunos${UNAME_RELEASE}
++	echo sparc-auspex-sunos"$UNAME_RELEASE"
+ 	exit ;;
+     # The situation for MiNT is a little confusing.  The machine name
+     # can be virtually everything (everything which is not
+@@ -415,44 +446,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+     # 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}
++	echo m68k-atari-mint"$UNAME_RELEASE"
+ 	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}
++	echo m68k-milan-mint"$UNAME_RELEASE"
+ 	exit ;;
+     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+-	echo m68k-hades-mint${UNAME_RELEASE}
++	echo m68k-hades-mint"$UNAME_RELEASE"
+ 	exit ;;
+     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+-	echo m68k-unknown-mint${UNAME_RELEASE}
++	echo m68k-unknown-mint"$UNAME_RELEASE"
+ 	exit ;;
+     m68k:machten:*:*)
+-	echo m68k-apple-machten${UNAME_RELEASE}
++	echo m68k-apple-machten"$UNAME_RELEASE"
+ 	exit ;;
+     powerpc:machten:*:*)
+-	echo powerpc-apple-machten${UNAME_RELEASE}
++	echo powerpc-apple-machten"$UNAME_RELEASE"
+ 	exit ;;
+     RISC*:Mach:*:*)
+ 	echo mips-dec-mach_bsd4.3
+ 	exit ;;
+     RISC*:ULTRIX:*:*)
+-	echo mips-dec-ultrix${UNAME_RELEASE}
++	echo mips-dec-ultrix"$UNAME_RELEASE"
+ 	exit ;;
+     VAX*:ULTRIX*:*:*)
+-	echo vax-dec-ultrix${UNAME_RELEASE}
++	echo vax-dec-ultrix"$UNAME_RELEASE"
+ 	exit ;;
+     2020:CLIX:*:* | 2430:CLIX:*:*)
+-	echo clipper-intergraph-clix${UNAME_RELEASE}
++	echo clipper-intergraph-clix"$UNAME_RELEASE"
+ 	exit ;;
+     mips:*:*:UMIPS | mips:*:*:RISCos)
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
++	eval "$set_cc_for_build"
++	sed 's/^	//' << EOF > "$dummy.c"
+ #ifdef __cplusplus
+ #include <stdio.h>  /* for printf() prototype */
+ 	int main (int argc, char *argv[]) {
+@@ -461,23 +492,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ #endif
+ 	#if defined (host_mips) && defined (MIPSEB)
+ 	#if defined (SYSTYPE_SYSV)
+-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
++	  printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
+ 	#endif
+ 	#if defined (SYSTYPE_SVR4)
+-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
++	  printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
+ 	#endif
+ 	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
++	  printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
+ 	#endif
+ 	#endif
+ 	  exit (-1);
+ 	}
+ EOF
+-	$CC_FOR_BUILD -o $dummy $dummy.c &&
+-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+-	  SYSTEM_NAME=`$dummy $dummyarg` &&
++	$CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
++	  dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
++	  SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
+ 	    { echo "$SYSTEM_NAME"; exit; }
+-	echo mips-mips-riscos${UNAME_RELEASE}
++	echo mips-mips-riscos"$UNAME_RELEASE"
+ 	exit ;;
+     Motorola:PowerMAX_OS:*:*)
+ 	echo powerpc-motorola-powermax
+@@ -503,17 +534,17 @@ EOF
+     AViiON:dgux:*:*)
+ 	# DG/UX returns AViiON for all architectures
+ 	UNAME_PROCESSOR=`/usr/bin/uname -p`
+-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
++	if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
+ 	then
+-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
++	    if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
++	       [ "$TARGET_BINARY_INTERFACE"x = x ]
+ 	    then
+-		echo m88k-dg-dgux${UNAME_RELEASE}
++		echo m88k-dg-dgux"$UNAME_RELEASE"
+ 	    else
+-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
++		echo m88k-dg-dguxbcs"$UNAME_RELEASE"
+ 	    fi
+ 	else
+-	    echo i586-dg-dgux${UNAME_RELEASE}
++	    echo i586-dg-dgux"$UNAME_RELEASE"
+ 	fi
+ 	exit ;;
+     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+@@ -530,7 +561,7 @@ EOF
+ 	echo m68k-tektronix-bsd
+ 	exit ;;
+     *:IRIX*:*:*)
+-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
++	echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
+ 	exit ;;
+     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+ 	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+@@ -542,14 +573,14 @@ EOF
+ 	if [ -x /usr/bin/oslevel ] ; then
+ 		IBM_REV=`/usr/bin/oslevel`
+ 	else
+-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
+ 	fi
+-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
++	echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
+ 	exit ;;
+     *:AIX:2:3)
+ 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+-		eval $set_cc_for_build
+-		sed 's/^		//' << EOF >$dummy.c
++		eval "$set_cc_for_build"
++		sed 's/^		//' << EOF > "$dummy.c"
+ 		#include <sys/systemcfg.h>
+ 
+ 		main()
+@@ -560,7 +591,7 @@ EOF
+ 			exit(0);
+ 			}
+ EOF
+-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
++		if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
+ 		then
+ 			echo "$SYSTEM_NAME"
+ 		else
+@@ -574,26 +605,27 @@ EOF
+ 	exit ;;
+     *: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
++	if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
+ 		IBM_ARCH=rs6000
+ 	else
+ 		IBM_ARCH=powerpc
+ 	fi
+-	if [ -x /usr/bin/oslevel ] ; then
+-		IBM_REV=`/usr/bin/oslevel`
++	if [ -x /usr/bin/lslpp ] ; then
++		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
++			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
+ 	else
+-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
+ 	fi
+-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
++	echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
+ 	exit ;;
+     *:AIX:*:*)
+ 	echo rs6000-ibm-aix
+ 	exit ;;
+-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
++    ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
+ 	echo romp-ibm-bsd4.4
+ 	exit ;;
+     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
++	echo romp-ibm-bsd"$UNAME_RELEASE"   # 4.3 with uname added to
+ 	exit ;;                             # report: romp-ibm BSD 4.3
+     *:BOSX:*:*)
+ 	echo rs6000-bull-bosx
+@@ -608,28 +640,28 @@ EOF
+ 	echo m68k-hp-bsd4.4
+ 	exit ;;
+     9000/[34678]??:HP-UX:*:*)
+-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+-	case "${UNAME_MACHINE}" in
+-	    9000/31? )            HP_ARCH=m68000 ;;
+-	    9000/[34]?? )         HP_ARCH=m68k ;;
++	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
++	case "$UNAME_MACHINE" in
++	    9000/31?)            HP_ARCH=m68000 ;;
++	    9000/[34]??)         HP_ARCH=m68k ;;
+ 	    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
++		    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
++			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
+ 		fi
+-		if [ "${HP_ARCH}" = "" ]; then
+-		    eval $set_cc_for_build
+-		    sed 's/^		//' << EOF >$dummy.c
++		if [ "$HP_ARCH" = "" ]; then
++		    eval "$set_cc_for_build"
++		    sed 's/^		//' << EOF > "$dummy.c"
+ 
+ 		#define _HPUX_SOURCE
+ 		#include <stdlib.h>
+@@ -662,13 +694,13 @@ EOF
+ 		    exit (0);
+ 		}
+ EOF
+-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
++		    (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
+ 		    test -z "$HP_ARCH" && HP_ARCH=hppa
+ 		fi ;;
+ 	esac
+-	if [ ${HP_ARCH} = "hppa2.0w" ]
++	if [ "$HP_ARCH" = hppa2.0w ]
+ 	then
+-	    eval $set_cc_for_build
++	    eval "$set_cc_for_build"
+ 
+ 	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+ 	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+@@ -679,23 +711,23 @@ EOF
+ 	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+ 	    # => hppa64-hp-hpux11.23
+ 
+-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
++	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
+ 		grep -q __LP64__
+ 	    then
+-		HP_ARCH="hppa2.0w"
++		HP_ARCH=hppa2.0w
+ 	    else
+-		HP_ARCH="hppa64"
++		HP_ARCH=hppa64
+ 	    fi
+ 	fi
+-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
++	echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
+ 	exit ;;
+     ia64:HP-UX:*:*)
+-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+-	echo ia64-hp-hpux${HPUX_REV}
++	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
++	echo ia64-hp-hpux"$HPUX_REV"
+ 	exit ;;
+     3050*:HI-UX:*:*)
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
++	eval "$set_cc_for_build"
++	sed 's/^	//' << EOF > "$dummy.c"
+ 	#include <unistd.h>
+ 	int
+ 	main ()
+@@ -720,11 +752,11 @@ EOF
+ 	  exit (0);
+ 	}
+ EOF
+-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
++	$CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
+ 		{ echo "$SYSTEM_NAME"; exit; }
+ 	echo unknown-hitachi-hiuxwe2
+ 	exit ;;
+-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
++    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
+ 	echo hppa1.1-hp-bsd
+ 	exit ;;
+     9000/8??:4.3bsd:*:*)
+@@ -733,7 +765,7 @@ EOF
+     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+ 	echo hppa1.0-hp-mpeix
+ 	exit ;;
+-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
++    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
+ 	echo hppa1.1-hp-osf
+ 	exit ;;
+     hp8??:OSF1:*:*)
+@@ -741,9 +773,9 @@ EOF
+ 	exit ;;
+     i*86:OSF1:*:*)
+ 	if [ -x /usr/sbin/sysversion ] ; then
+-	    echo ${UNAME_MACHINE}-unknown-osf1mk
++	    echo "$UNAME_MACHINE"-unknown-osf1mk
+ 	else
+-	    echo ${UNAME_MACHINE}-unknown-osf1
++	    echo "$UNAME_MACHINE"-unknown-osf1
+ 	fi
+ 	exit ;;
+     parisc*:Lites*:*:*)
+@@ -768,127 +800,109 @@ EOF
+ 	echo c4-convex-bsd
+ 	exit ;;
+     CRAY*Y-MP:*:*:*)
+-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+ 	exit ;;
+     CRAY*[A-Z]90:*:*:*)
+-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
++	echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
+ 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+ 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+ 	      -e 's/\.[^.]*$/.X/'
+ 	exit ;;
+     CRAY*TS:*:*:*)
+-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+ 	exit ;;
+     CRAY*T3E:*:*:*)
+-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+ 	exit ;;
+     CRAY*SV1:*:*:*)
+-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+ 	exit ;;
+     *:UNICOS/mp:*:*)
+-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+ 	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/ /_/'`
++	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 ;;
+     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/ /_/'`
++	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}
++	echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
+ 	exit ;;
+     sparc*:BSD/OS:*:*)
+-	echo sparc-unknown-bsdi${UNAME_RELEASE}
++	echo sparc-unknown-bsdi"$UNAME_RELEASE"
+ 	exit ;;
+     *:BSD/OS:*:*)
+-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
++	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
+ 	exit ;;
+     *:FreeBSD:*:*)
+ 	UNAME_PROCESSOR=`/usr/bin/uname -p`
+-	case ${UNAME_PROCESSOR} in
++	case "$UNAME_PROCESSOR" in
+ 	    amd64)
+-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+-	    *)
+-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++		UNAME_PROCESSOR=x86_64 ;;
++	    i386)
++		UNAME_PROCESSOR=i586 ;;
+ 	esac
++	echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
+ 	exit ;;
+     i*:CYGWIN*:*)
+-	echo ${UNAME_MACHINE}-pc-cygwin
++	echo "$UNAME_MACHINE"-pc-cygwin
+ 	exit ;;
+     *:MINGW64*:*)
+-	echo ${UNAME_MACHINE}-pc-mingw64
++	echo "$UNAME_MACHINE"-pc-mingw64
+ 	exit ;;
+     *:MINGW*:*)
+-	echo ${UNAME_MACHINE}-pc-mingw32
+-	exit ;;
+-    i*:MSYS*:*)
+-	echo ${UNAME_MACHINE}-pc-msys
++	echo "$UNAME_MACHINE"-pc-mingw32
+ 	exit ;;
+-    i*:windows32*:*)
+-	# uname -m includes "-pc" on this system.
+-	echo ${UNAME_MACHINE}-mingw32
++    *:MSYS*:*)
++	echo "$UNAME_MACHINE"-pc-msys
+ 	exit ;;
+     i*:PW*:*)
+-	echo ${UNAME_MACHINE}-pc-pw32
++	echo "$UNAME_MACHINE"-pc-pw32
+ 	exit ;;
+     *:Interix*:*)
+-	case ${UNAME_MACHINE} in
++	case "$UNAME_MACHINE" in
+ 	    x86)
+-		echo i586-pc-interix${UNAME_RELEASE}
++		echo i586-pc-interix"$UNAME_RELEASE"
+ 		exit ;;
+ 	    authenticamd | genuineintel | EM64T)
+-		echo x86_64-unknown-interix${UNAME_RELEASE}
++		echo x86_64-unknown-interix"$UNAME_RELEASE"
+ 		exit ;;
+ 	    IA64)
+-		echo ia64-unknown-interix${UNAME_RELEASE}
++		echo ia64-unknown-interix"$UNAME_RELEASE"
+ 		exit ;;
+ 	esac ;;
+-    [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
+-	# UNAME_MACHINE based on the output of uname instead of i386?
+-	echo i586-pc-interix
+-	exit ;;
+     i*:UWIN*:*)
+-	echo ${UNAME_MACHINE}-pc-uwin
++	echo "$UNAME_MACHINE"-pc-uwin
+ 	exit ;;
+     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ 	echo x86_64-unknown-cygwin
+ 	exit ;;
+-    p*:CYGWIN*:*)
+-	echo powerpcle-unknown-cygwin
+-	exit ;;
+     prep*:SunOS:5.*:*)
+-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+ 	exit ;;
+     *:GNU:*:*)
+ 	# the GNU system
+-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`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/[-(].*//'`-${LIBC}
++	echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
+ 	exit ;;
+     i*86:Minix:*:*)
+-	echo ${UNAME_MACHINE}-pc-minix
++	echo "$UNAME_MACHINE"-pc-minix
+ 	exit ;;
+     aarch64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     aarch64_be:Linux:*:*)
+ 	UNAME_MACHINE=aarch64_be
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     alpha:Linux:*:*)
+ 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+@@ -901,58 +915,64 @@ EOF
+ 	  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}
++	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     arc:Linux:*:* | arceb:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     arm*:Linux:*:*)
+-	eval $set_cc_for_build
++	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-${LIBC}
++	    echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	else
+ 	    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
++		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
+ 	    else
+-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
++		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
+ 	    fi
+ 	fi
+ 	exit ;;
+     avr32*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     cris:Linux:*:*)
+-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
++	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
+ 	exit ;;
+     crisv32:Linux:*:*)
+-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
++	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
++	exit ;;
++    e2k:Linux:*:*)
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     frv:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     hexagon:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     i*86:Linux:*:*)
+-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
++	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+ 	exit ;;
+     ia64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
++	exit ;;
++    k1om:Linux:*:*)
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     m32r*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     m68*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     mips:Linux:*:* | mips64:Linux:*:*)
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
++	eval "$set_cc_for_build"
++	sed 's/^	//' << EOF > "$dummy.c"
+ 	#undef CPU
+ 	#undef ${UNAME_MACHINE}
+ 	#undef ${UNAME_MACHINE}el
+@@ -966,64 +986,74 @@ EOF
+ 	#endif
+ 	#endif
+ EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
++	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
++	test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
+ 	;;
+-    or1k:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++    mips64el:Linux:*:*)
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+-    or32:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++    openrisc*:Linux:*:*)
++	echo or1k-unknown-linux-"$LIBC"
++	exit ;;
++    or32:Linux:*:* | or1k*:Linux:*:*)
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     padre:Linux:*:*)
+-	echo sparc-unknown-linux-${LIBC}
++	echo sparc-unknown-linux-"$LIBC"
+ 	exit ;;
+     parisc64:Linux:*:* | hppa64:Linux:*:*)
+-	echo hppa64-unknown-linux-${LIBC}
++	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-${LIBC} ;;
+-	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+-	  *)    echo hppa-unknown-linux-${LIBC} ;;
++	  PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
++	  PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
++	  *)    echo hppa-unknown-linux-"$LIBC" ;;
+ 	esac
+ 	exit ;;
+     ppc64:Linux:*:*)
+-	echo powerpc64-unknown-linux-${LIBC}
++	echo powerpc64-unknown-linux-"$LIBC"
+ 	exit ;;
+     ppc:Linux:*:*)
+-	echo powerpc-unknown-linux-${LIBC}
++	echo powerpc-unknown-linux-"$LIBC"
+ 	exit ;;
+     ppc64le:Linux:*:*)
+-	echo powerpc64le-unknown-linux-${LIBC}
++	echo powerpc64le-unknown-linux-"$LIBC"
+ 	exit ;;
+     ppcle:Linux:*:*)
+-	echo powerpcle-unknown-linux-${LIBC}
++	echo powerpcle-unknown-linux-"$LIBC"
++	exit ;;
++    riscv32:Linux:*:* | riscv64:Linux:*:*)
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     s390:Linux:*:* | s390x:Linux:*:*)
+-	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
++	echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
+ 	exit ;;
+     sh64*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     sh*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     sparc:Linux:*:* | sparc64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     tile*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     vax:Linux:*:*)
+-	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
++	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
+ 	exit ;;
+     x86_64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	if objdump -f /bin/sh | grep -q elf32-x86-64; then
++	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
++	else
++	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
++	fi
+ 	exit ;;
+     xtensa*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ 	exit ;;
+     i*86:DYNIX/ptx:4*:*)
+ 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+@@ -1037,34 +1067,34 @@ EOF
+ 	# 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.
+-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
++	echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
+ 	exit ;;
+     i*86:OS/2:*:*)
+ 	# If we were able to find `uname', then EMX Unix compatibility
+ 	# is probably installed.
+-	echo ${UNAME_MACHINE}-pc-os2-emx
++	echo "$UNAME_MACHINE"-pc-os2-emx
+ 	exit ;;
+     i*86:XTS-300:*:STOP)
+-	echo ${UNAME_MACHINE}-unknown-stop
++	echo "$UNAME_MACHINE"-unknown-stop
+ 	exit ;;
+     i*86:atheos:*:*)
+-	echo ${UNAME_MACHINE}-unknown-atheos
++	echo "$UNAME_MACHINE"-unknown-atheos
+ 	exit ;;
+     i*86:syllable:*:*)
+-	echo ${UNAME_MACHINE}-pc-syllable
++	echo "$UNAME_MACHINE"-pc-syllable
+ 	exit ;;
+     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+-	echo i386-unknown-lynxos${UNAME_RELEASE}
++	echo i386-unknown-lynxos"$UNAME_RELEASE"
+ 	exit ;;
+     i*86:*DOS:*:*)
+-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
++	echo "$UNAME_MACHINE"-pc-msdosdjgpp
+ 	exit ;;
+-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
++    i*86:*:4.*:*)
++	UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
+ 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
++		echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
+ 	else
+-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
++		echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
+ 	fi
+ 	exit ;;
+     i*86:*:5:[678]*)
+@@ -1074,12 +1104,12 @@ EOF
+ 	    *Pentium)	     UNAME_MACHINE=i586 ;;
+ 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+ 	esac
+-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
++	echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
+ 	exit ;;
+     i*86:*:3.2:*)
+ 	if test -f /usr/options/cb.name; then
+ 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
++		echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
+ 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+ 		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+ 		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+@@ -1089,9 +1119,9 @@ EOF
+ 			&& UNAME_MACHINE=i686
+ 		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+ 			&& UNAME_MACHINE=i686
+-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
++		echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
+ 	else
+-		echo ${UNAME_MACHINE}-pc-sysv32
++		echo "$UNAME_MACHINE"-pc-sysv32
+ 	fi
+ 	exit ;;
+     pc:*:*:*)
+@@ -1099,7 +1129,7 @@ EOF
+ 	# 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
++	# prints for the "djgpp" host, or else GDB configure will decide that
+ 	# this is a cross-build.
+ 	echo i586-pc-msdosdjgpp
+ 	exit ;;
+@@ -1111,9 +1141,9 @@ EOF
+ 	exit ;;
+     i860:*:4.*:*) # i860-SVR4
+ 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
++	  echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
+ 	else # Add other i860-SVR4 vendors below as they are discovered.
+-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
++	  echo i860-unknown-sysv"$UNAME_RELEASE"  # Unknown i860-SVR4
+ 	fi
+ 	exit ;;
+     mini*:CTIX:SYS*5:*)
+@@ -1133,9 +1163,9 @@ EOF
+ 	test -r /etc/.relid \
+ 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
++	  && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
+ 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
++	  && { 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; } ;;
+@@ -1144,28 +1174,28 @@ EOF
+ 	test -r /etc/.relid \
+ 	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+-	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
++	    && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
+ 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
++	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
+ 	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
++	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
+     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+-	echo m68k-unknown-lynxos${UNAME_RELEASE}
++	echo m68k-unknown-lynxos"$UNAME_RELEASE"
+ 	exit ;;
+     mc68030:UNIX_System_V:4.*:*)
+ 	echo m68k-atari-sysv4
+ 	exit ;;
+     TSUNAMI:LynxOS:2.*:*)
+-	echo sparc-unknown-lynxos${UNAME_RELEASE}
++	echo sparc-unknown-lynxos"$UNAME_RELEASE"
+ 	exit ;;
+     rs6000:LynxOS:2.*:*)
+-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
++	echo rs6000-unknown-lynxos"$UNAME_RELEASE"
+ 	exit ;;
+     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
++	echo powerpc-unknown-lynxos"$UNAME_RELEASE"
+ 	exit ;;
+     SM[BE]S:UNIX_SV:*:*)
+-	echo mips-dde-sysv${UNAME_RELEASE}
++	echo mips-dde-sysv"$UNAME_RELEASE"
+ 	exit ;;
+     RM*:ReliantUNIX-*:*:*)
+ 	echo mips-sni-sysv4
+@@ -1176,7 +1206,7 @@ EOF
+     *:SINIX-*:*:*)
+ 	if uname -p 2>/dev/null >/dev/null ; then
+ 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+-		echo ${UNAME_MACHINE}-sni-sysv4
++		echo "$UNAME_MACHINE"-sni-sysv4
+ 	else
+ 		echo ns32k-sni-sysv
+ 	fi
+@@ -1196,23 +1226,23 @@ EOF
+ 	exit ;;
+     i*86:VOS:*:*)
+ 	# From Paul.Green@stratus.com.
+-	echo ${UNAME_MACHINE}-stratus-vos
++	echo "$UNAME_MACHINE"-stratus-vos
+ 	exit ;;
+     *:VOS:*:*)
+ 	# From Paul.Green@stratus.com.
+ 	echo hppa1.1-stratus-vos
+ 	exit ;;
+     mc68*:A/UX:*:*)
+-	echo m68k-apple-aux${UNAME_RELEASE}
++	echo m68k-apple-aux"$UNAME_RELEASE"
+ 	exit ;;
+     news*:NEWS-OS:6*:*)
+ 	echo mips-sony-newsos6
+ 	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 ;;
+     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+@@ -1231,46 +1261,56 @@ EOF
+ 	echo x86_64-unknown-haiku
+ 	exit ;;
+     SX-4:SUPER-UX:*:*)
+-	echo sx4-nec-superux${UNAME_RELEASE}
++	echo sx4-nec-superux"$UNAME_RELEASE"
+ 	exit ;;
+     SX-5:SUPER-UX:*:*)
+-	echo sx5-nec-superux${UNAME_RELEASE}
++	echo sx5-nec-superux"$UNAME_RELEASE"
+ 	exit ;;
+     SX-6:SUPER-UX:*:*)
+-	echo sx6-nec-superux${UNAME_RELEASE}
++	echo sx6-nec-superux"$UNAME_RELEASE"
+ 	exit ;;
+     SX-7:SUPER-UX:*:*)
+-	echo sx7-nec-superux${UNAME_RELEASE}
++	echo sx7-nec-superux"$UNAME_RELEASE"
+ 	exit ;;
+     SX-8:SUPER-UX:*:*)
+-	echo sx8-nec-superux${UNAME_RELEASE}
++	echo sx8-nec-superux"$UNAME_RELEASE"
+ 	exit ;;
+     SX-8R:SUPER-UX:*:*)
+-	echo sx8r-nec-superux${UNAME_RELEASE}
++	echo sx8r-nec-superux"$UNAME_RELEASE"
++	exit ;;
++    SX-ACE:SUPER-UX:*:*)
++	echo sxace-nec-superux"$UNAME_RELEASE"
+ 	exit ;;
+     Power*:Rhapsody:*:*)
+-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
++	echo powerpc-apple-rhapsody"$UNAME_RELEASE"
+ 	exit ;;
+     *:Rhapsody:*:*)
+-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
++	echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
+ 	exit ;;
+     *:Darwin:*:*)
+ 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+-	eval $set_cc_for_build
++	eval "$set_cc_for_build"
+ 	if test "$UNAME_PROCESSOR" = unknown ; then
+ 	    UNAME_PROCESSOR=powerpc
+ 	fi
+-	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+-	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++	if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
++	    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
++		       (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
++		# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
++		if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
++		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
++		       grep IS_PPC >/dev/null
++		then
++		    UNAME_PROCESSOR=powerpc
++		fi
+ 	    fi
+ 	elif test "$UNAME_PROCESSOR" = i386 ; then
+ 	    # Avoid executing cc on OS X 10.9, as it ships with a stub
+@@ -1281,27 +1321,33 @@ EOF
+ 	    # that Apple uses in portable devices.
+ 	    UNAME_PROCESSOR=x86_64
+ 	fi
+-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
++	echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
+ 	exit ;;
+     *:procnto*:*:* | *:QNX:[0123456789]*:*)
+ 	UNAME_PROCESSOR=`uname -p`
+-	if test "$UNAME_PROCESSOR" = "x86"; then
++	if test "$UNAME_PROCESSOR" = x86; then
+ 		UNAME_PROCESSOR=i386
+ 		UNAME_MACHINE=pc
+ 	fi
+-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
++	echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
+ 	exit ;;
+     *:QNX:*:4*)
+ 	echo i386-pc-qnx
+ 	exit ;;
+-    NEO-?:NONSTOP_KERNEL:*:*)
+-	echo neo-tandem-nsk${UNAME_RELEASE}
++    NEO-*:NONSTOP_KERNEL:*:*)
++	echo neo-tandem-nsk"$UNAME_RELEASE"
+ 	exit ;;
+     NSE-*:NONSTOP_KERNEL:*:*)
+-	echo nse-tandem-nsk${UNAME_RELEASE}
++	echo nse-tandem-nsk"$UNAME_RELEASE"
+ 	exit ;;
+-    NSR-?:NONSTOP_KERNEL:*:*)
+-	echo nsr-tandem-nsk${UNAME_RELEASE}
++    NSR-*:NONSTOP_KERNEL:*:*)
++	echo nsr-tandem-nsk"$UNAME_RELEASE"
++	exit ;;
++    NSV-*:NONSTOP_KERNEL:*:*)
++	echo nsv-tandem-nsk"$UNAME_RELEASE"
++	exit ;;
++    NSX-*:NONSTOP_KERNEL:*:*)
++	echo nsx-tandem-nsk"$UNAME_RELEASE"
+ 	exit ;;
+     *:NonStop-UX:*:*)
+ 	echo mips-compaq-nonstopux
+@@ -1310,18 +1356,18 @@ EOF
+ 	echo bs2000-siemens-sysv
+ 	exit ;;
+     DS/*:UNIX_System_V:*:*)
+-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
++	echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
+ 	exit ;;
+     *:Plan9:*:*)
+ 	# "uname -m" is not consistent, so use $cputype instead. 386
+ 	# is converted to i386 for consistency with other x86
+ 	# operating systems.
+-	if test "$cputype" = "386"; then
++	if test "$cputype" = 386; then
+ 	    UNAME_MACHINE=i386
+ 	else
+ 	    UNAME_MACHINE="$cputype"
+ 	fi
+-	echo ${UNAME_MACHINE}-unknown-plan9
++	echo "$UNAME_MACHINE"-unknown-plan9
+ 	exit ;;
+     *:TOPS-10:*:*)
+ 	echo pdp10-unknown-tops10
+@@ -1342,14 +1388,14 @@ 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/[-(].*//'`
++	echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
+ 	exit ;;
+     *:*VMS:*:*)
+ 	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+-	case "${UNAME_MACHINE}" in
++	case "$UNAME_MACHINE" in
+ 	    A*) echo alpha-dec-vms ; exit ;;
+ 	    I*) echo ia64-dec-vms ; exit ;;
+ 	    V*) echo vax-dec-vms ; exit ;;
+@@ -1358,34 +1404,48 @@ EOF
+ 	echo i386-pc-xenix
+ 	exit ;;
+     i*86:skyos:*:*)
+-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
++	echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
+ 	exit ;;
+     i*86:rdos:*:*)
+-	echo ${UNAME_MACHINE}-pc-rdos
++	echo "$UNAME_MACHINE"-pc-rdos
+ 	exit ;;
+     i*86:AROS:*:*)
+-	echo ${UNAME_MACHINE}-pc-aros
++	echo "$UNAME_MACHINE"-pc-aros
+ 	exit ;;
+     x86_64:VMkernel:*:*)
+-	echo ${UNAME_MACHINE}-unknown-esx
++	echo "$UNAME_MACHINE"-unknown-esx
++	exit ;;
++    amd64:Isilon\ OneFS:*:*)
++	echo x86_64-unknown-onefs
+ 	exit ;;
+ esac
+ 
++echo "$0: unable to guess system type" >&2
++
++case "$UNAME_MACHINE:$UNAME_SYSTEM" in
++    mips:Linux | mips64:Linux)
++	# If we got here on MIPS GNU/Linux, output extra information.
++	cat >&2 <<EOF
++
++NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
++the system type. Please install a C compiler and try again.
++EOF
++	;;
++esac
++
+ cat >&2 <<EOF
+-$0: unable to guess system type
+ 
+-This script, last modified $timestamp, has failed to recognize
+-the operating system you are using. It is advised that you
+-download the most up to date version of the config scripts from
++This script (version $timestamp), has failed to recognize the
++operating system you are using. If your script is old, overwrite *all*
++copies of config.guess and config.sub with the latest versions from:
+ 
+-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
++  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+ and
+-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
++  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+ 
+-If the version you run ($0) is already up to date, please
+-send the following data and any information you think might be
+-pertinent to <config-patches@gnu.org> in order to provide the needed
+-information to handle your system.
++If $0 has already been updated, send the following data and any
++information you think might be pertinent to config-patches@gnu.org to
++provide the necessary information to handle your system.
+ 
+ config.guess timestamp = $timestamp
+ 
+@@ -1404,16 +1464,16 @@ hostinfo               = `(hostinfo) 2>/
+ /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+ /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+ 
+-UNAME_MACHINE = ${UNAME_MACHINE}
+-UNAME_RELEASE = ${UNAME_RELEASE}
+-UNAME_SYSTEM  = ${UNAME_SYSTEM}
+-UNAME_VERSION = ${UNAME_VERSION}
++UNAME_MACHINE = "$UNAME_MACHINE"
++UNAME_RELEASE = "$UNAME_RELEASE"
++UNAME_SYSTEM  = "$UNAME_SYSTEM"
++UNAME_VERSION = "$UNAME_VERSION"
+ EOF
+ 
+ exit 1
+ 
+ # Local variables:
+-# eval: (add-hook 'write-file-hooks 'time-stamp)
++# eval: (add-hook 'write-file-functions 'time-stamp)
+ # time-stamp-start: "timestamp='"
+ # time-stamp-format: "%:y-%02m-%02d"
+ # time-stamp-end: "'"
+--- firefox-esr-78.3.0esr.orig/nsprpub/build/autoconf/config.sub
++++ firefox-esr-78.3.0esr/nsprpub/build/autoconf/config.sub
+@@ -1,8 +1,8 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+-#   Copyright 1992-2014 Free Software Foundation, Inc.
++#   Copyright 1992-2018 Free Software Foundation, Inc.
+ 
+-timestamp='2014-01-01'
++timestamp='2018-02-22'
+ 
+ # 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
+@@ -15,7 +15,7 @@ timestamp='2014-01-01'
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, see <http://www.gnu.org/licenses/>.
++# along with this program; if not, see <https://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
+@@ -25,7 +25,7 @@ timestamp='2014-01-01'
+ # of the GNU General Public License, version 3 ("GPLv3").
+ 
+ 
+-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
++# Please send patches to <config-patches@gnu.org>.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+@@ -33,7 +33,7 @@ timestamp='2014-01-01'
+ # 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
++# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+ 
+ # This file is supposed to be the same for all GNU packages
+ # and recognize all the CPU types, system types and aliases
+@@ -53,12 +53,11 @@ timestamp='2014-01-01'
+ me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+ usage="\
+-Usage: $0 [OPTION] CPU-MFR-OPSYS
+-       $0 [OPTION] ALIAS
++Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
+ 
+ Canonicalize a configuration name.
+ 
+-Operation modes:
++Options:
+   -h, --help         print this help, then exit
+   -t, --time-stamp   print date of last modification, then exit
+   -v, --version      print version number, then exit
+@@ -68,7 +67,7 @@ Report bugs and patches to <config-patch
+ version="\
+ GNU config.sub ($timestamp)
+ 
+-Copyright 1992-2014 Free Software Foundation, Inc.
++Copyright 1992-2018 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."
+@@ -95,7 +94,7 @@ while test $# -gt 0 ; do
+ 
+     *local*)
+        # First pass through any local machine types.
+-       echo $1
++       echo "$1"
+        exit ;;
+ 
+     * )
+@@ -113,20 +112,24 @@ esac
+ 
+ # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+ # Here we must recognize all the valid KERNEL-OS combinations.
+-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
++maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | \
++  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* | \
++  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
++  kopensolaris*-gnu* | cloudabi*-eabi* | \
+   storm-chaos* | os2-emx* | rtmk-nova*)
+     os=-$maybe_os
+-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
++    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 ]
+-    then os=`echo $1 | sed 's/.*-/-/'`
++    basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
++    if [ "$basic_machine" != "$1" ]
++    then os=`echo "$1" | sed 's/.*-/-/'`
+     else os=; fi
+     ;;
+ esac
+@@ -175,44 +178,44 @@ case $os in
+ 		;;
+ 	-sco6)
+ 		os=-sco5v6
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco5)
+ 		os=-sco3.2v5
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco4)
+ 		os=-sco3.2v4
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco3.2.[4-9]*)
+ 		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco3.2v[4-9]*)
+ 		# Don't forget version if it is 3.2v4 or newer.
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco5v6*)
+ 		# Don't forget version if it is 3.2v4 or newer.
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco*)
+ 		os=-sco3.2v2
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-udk*)
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-isc)
+ 		os=-isc2.2
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-clix*)
+ 		basic_machine=clipper-intergraph
+ 		;;
+ 	-isc*)
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-lynx*178)
+ 		os=-lynxos178
+@@ -224,10 +227,7 @@ case $os in
+ 		os=-lynxos
+ 		;;
+ 	-ptx*)
+-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+-		;;
+-	-windowsnt*)
+-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
++		basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
+ 		;;
+ 	-psos*)
+ 		os=-psos
+@@ -251,15 +251,16 @@ case $basic_machine in
+ 	| arc | arceb \
+ 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+ 	| avr | avr32 \
++	| ba \
+ 	| be32 | be64 \
+ 	| bfin \
+ 	| c4x | c8051 | clipper \
+ 	| d10v | d30v | dlx | dsp16xx \
+-	| epiphany \
+-	| fido | fr30 | frv \
++	| e2k | epiphany \
++	| fido | fr30 | frv | ft32 \
+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ 	| hexagon \
+-	| i370 | i860 | i960 | ia64 \
++	| i370 | i860 | i960 | ia16 | ia64 \
+ 	| ip2k | iq2000 \
+ 	| k1om \
+ 	| le32 | le64 \
+@@ -279,8 +280,10 @@ case $basic_machine in
+ 	| mips64vr5900 | mips64vr5900el \
+ 	| mipsisa32 | mipsisa32el \
+ 	| mipsisa32r2 | mipsisa32r2el \
++	| mipsisa32r6 | mipsisa32r6el \
+ 	| mipsisa64 | mipsisa64el \
+ 	| mipsisa64r2 | mipsisa64r2el \
++	| mipsisa64r6 | mipsisa64r6el \
+ 	| mipsisa64sb1 | mipsisa64sb1el \
+ 	| mipsisa64sr71k | mipsisa64sr71kel \
+ 	| mipsr5900 | mipsr5900el \
+@@ -292,14 +295,15 @@ case $basic_machine in
+ 	| nds32 | nds32le | nds32be \
+ 	| nios | nios2 | nios2eb | nios2el \
+ 	| ns16k | ns32k \
+-	| open8 \
+-	| or1k | or32 \
+-	| pdp10 | pdp11 | pj | pjl \
++	| open8 | or1k | or1knd | or32 \
++	| pdp10 | pj | pjl \
+ 	| powerpc | powerpc64 | powerpc64le | powerpcle \
++	| pru \
+ 	| pyramid \
++	| riscv32 | riscv64 \
+ 	| 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 \
++	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ 	| sh64 | sh64le \
+ 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+ 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+@@ -307,7 +311,8 @@ case $basic_machine in
+ 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+ 	| ubicom32 \
+ 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+-	| we32k \
++	| visium \
++	| wasm32 \
+ 	| x86 | xc16x | xstormy16 | xtensa \
+ 	| z8k | z80)
+ 		basic_machine=$basic_machine-unknown
+@@ -321,11 +326,14 @@ case $basic_machine in
+ 	c6x)
+ 		basic_machine=tic6x-unknown
+ 		;;
++	leon|leon[3-9])
++		basic_machine=sparc-$basic_machine
++		;;
+ 	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
+ 		basic_machine=$basic_machine-unknown
+ 		os=-none
+ 		;;
+-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
++	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
+ 		;;
+ 	ms1)
+ 		basic_machine=mt-unknown
+@@ -354,7 +362,7 @@ case $basic_machine in
+ 	  ;;
+ 	# Object if more than one company name word.
+ 	*-*-*)
+-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
++		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
+ 		exit 1
+ 		;;
+ 	# Recognize the basic CPU types with company name.
+@@ -366,17 +374,18 @@ case $basic_machine in
+ 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+ 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+ 	| avr-* | avr32-* \
++	| ba-* \
+ 	| be32-* | be64-* \
+ 	| bfin-* | bs2000-* \
+ 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+ 	| c8051-* | clipper-* | craynv-* | cydra-* \
+ 	| d10v-* | d30v-* | dlx-* \
+-	| elxsi-* \
++	| e2k-* | 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-* \
++	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
+ 	| ip2k-* | iq2000-* \
+ 	| k1om-* \
+ 	| le32-* | le64-* \
+@@ -398,8 +407,10 @@ case $basic_machine in
+ 	| mips64vr5900-* | mips64vr5900el-* \
+ 	| mipsisa32-* | mipsisa32el-* \
+ 	| mipsisa32r2-* | mipsisa32r2el-* \
++	| mipsisa32r6-* | mipsisa32r6el-* \
+ 	| mipsisa64-* | mipsisa64el-* \
+ 	| mipsisa64r2-* | mipsisa64r2el-* \
++	| mipsisa64r6-* | mipsisa64r6el-* \
+ 	| mipsisa64sb1-* | mipsisa64sb1el-* \
+ 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ 	| mipsr5900-* | mipsr5900el-* \
+@@ -411,16 +422,19 @@ case $basic_machine in
+ 	| nios-* | nios2-* | nios2eb-* | nios2el-* \
+ 	| none-* | np1-* | ns16k-* | ns32k-* \
+ 	| open8-* \
++	| or1k*-* \
+ 	| orion-* \
+ 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
++	| pru-* \
+ 	| pyramid-* \
++	| riscv32-* | riscv64-* \
+ 	| 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-* | sv1-* | sx?-* \
++	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
+ 	| tahoe-* \
+ 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ 	| tile*-* \
+@@ -428,6 +442,8 @@ case $basic_machine in
+ 	| ubicom32-* \
+ 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+ 	| vax-* \
++	| visium-* \
++	| wasm32-* \
+ 	| we32k-* \
+ 	| x86-* | x86_64-* | xc16x-* | xps100-* \
+ 	| xstormy16-* | xtensa*-* \
+@@ -441,7 +457,7 @@ case $basic_machine in
+ 	# Recognize the various machine names and aliases which stand
+ 	# for a CPU type and a company and sometimes even an OS.
+ 	386bsd)
+-		basic_machine=i386-unknown
++		basic_machine=i386-pc
+ 		os=-bsd
+ 		;;
+ 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+@@ -475,7 +491,7 @@ case $basic_machine in
+ 		basic_machine=x86_64-pc
+ 		;;
+ 	amd64-*)
+-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	amdahl)
+ 		basic_machine=580-amdahl
+@@ -504,6 +520,9 @@ case $basic_machine in
+ 		basic_machine=i386-pc
+ 		os=-aros
+ 		;;
++	asmjs)
++		basic_machine=asmjs-unknown
++		;;
+ 	aux)
+ 		basic_machine=m68k-apple
+ 		os=-aux
+@@ -517,7 +536,7 @@ case $basic_machine in
+ 		os=-linux
+ 		;;
+ 	blackfin-*)
+-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		os=-linux
+ 		;;
+ 	bluegene*)
+@@ -525,13 +544,13 @@ case $basic_machine in
+ 		os=-cnk
+ 		;;
+ 	c54x-*)
+-		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	c55x-*)
+-		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	c6x-*)
+-		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	c90)
+ 		basic_machine=c90-cray
+@@ -620,10 +639,18 @@ case $basic_machine in
+ 		basic_machine=rs6000-bull
+ 		os=-bosx
+ 		;;
+-	dpx2* | dpx2*-bull)
++	dpx2*)
+ 		basic_machine=m68k-bull
+ 		os=-sysv3
+ 		;;
++	e500v[12])
++		basic_machine=powerpc-unknown
++		os=$os"spe"
++		;;
++	e500v[12]-*)
++		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
++		os=$os"spe"
++		;;
+ 	ebmon29k)
+ 		basic_machine=a29k-amd
+ 		os=-ebmon
+@@ -713,9 +740,6 @@ case $basic_machine in
+ 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+ 		basic_machine=hppa1.0-hp
+ 		;;
+-	hppa-next)
+-		os=-nextstep3
+-		;;
+ 	hppaosf)
+ 		basic_machine=hppa1.1-hp
+ 		os=-osf
+@@ -728,26 +752,26 @@ case $basic_machine in
+ 		basic_machine=i370-ibm
+ 		;;
+ 	i*86v32)
+-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv32
+ 		;;
+ 	i*86v4*)
+-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv4
+ 		;;
+ 	i*86v)
+-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv
+ 		;;
+ 	i*86sol2)
+-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+ 		os=-solaris2
+ 		;;
+ 	i386mach)
+ 		basic_machine=i386-mach
+ 		os=-mach
+ 		;;
+-	i386-vsta | vsta)
++	vsta)
+ 		basic_machine=i386-unknown
+ 		os=-vsta
+ 		;;
+@@ -765,17 +789,17 @@ case $basic_machine in
+ 		basic_machine=m68k-isi
+ 		os=-sysv
+ 		;;
++	leon-*|leon[3-9]-*)
++		basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
++		;;
+ 	m68knommu)
+ 		basic_machine=m68k-unknown
+ 		os=-linux
+ 		;;
+ 	m68knommu-*)
+-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		os=-linux
+ 		;;
+-	m88k-omron*)
+-		basic_machine=m88k-omron
+-		;;
+ 	magnum | m3230)
+ 		basic_machine=mips-mips
+ 		os=-sysv
+@@ -807,10 +831,10 @@ case $basic_machine in
+ 		os=-mint
+ 		;;
+ 	mips3*-*)
+-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
++		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
+ 		;;
+ 	mips3*)
+-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
++		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
+ 		;;
+ 	monitor)
+ 		basic_machine=m68k-rom68k
+@@ -820,12 +844,16 @@ case $basic_machine in
+ 		basic_machine=powerpc-unknown
+ 		os=-morphos
+ 		;;
++	moxiebox)
++		basic_machine=moxie-unknown
++		os=-moxiebox
++		;;
+ 	msdos)
+ 		basic_machine=i386-pc
+ 		os=-msdos
+ 		;;
+ 	ms1-*)
+-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
++		basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
+ 		;;
+ 	msys)
+ 		basic_machine=i686-pc
+@@ -867,7 +895,7 @@ case $basic_machine in
+ 		basic_machine=v70-nec
+ 		os=-sysv
+ 		;;
+-	next | m*-next )
++	next | m*-next)
+ 		basic_machine=m68k-next
+ 		case $os in
+ 		    -nextstep* )
+@@ -912,6 +940,12 @@ case $basic_machine in
+ 	nsr-tandem)
+ 		basic_machine=nsr-tandem
+ 		;;
++	nsv-tandem)
++		basic_machine=nsv-tandem
++		;;
++	nsx-tandem)
++		basic_machine=nsx-tandem
++		;;
+ 	op50n-* | op60c-*)
+ 		basic_machine=hppa1.1-oki
+ 		os=-proelf
+@@ -944,7 +978,7 @@ case $basic_machine in
+ 		os=-linux
+ 		;;
+ 	parisc-*)
+-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		os=-linux
+ 		;;
+ 	pbd)
+@@ -960,7 +994,7 @@ case $basic_machine in
+ 		basic_machine=i386-pc
+ 		;;
+ 	pc98-*)
+-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	pentium | p5 | k5 | k6 | nexgen | viac3)
+ 		basic_machine=i586-pc
+@@ -975,16 +1009,16 @@ case $basic_machine in
+ 		basic_machine=i786-pc
+ 		;;
+ 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	pentium4-*)
+-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	pn)
+ 		basic_machine=pn-gould
+@@ -994,23 +1028,23 @@ case $basic_machine in
+ 	ppc | ppcbe)	basic_machine=powerpc-unknown
+ 		;;
+ 	ppc-* | ppcbe-*)
+-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+-	ppcle | powerpclittle | ppc-le | powerpc-little)
++	ppcle | powerpclittle)
+ 		basic_machine=powerpcle-unknown
+ 		;;
+ 	ppcle-* | powerpclittle-*)
+-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	ppc64)	basic_machine=powerpc64-unknown
+ 		;;
+-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
++	ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
++	ppc64le | powerpc64little)
+ 		basic_machine=powerpc64le-unknown
+ 		;;
+ 	ppc64le-* | powerpc64little-*)
+-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	ps2)
+ 		basic_machine=i386-ibm
+@@ -1064,17 +1098,10 @@ case $basic_machine in
+ 	sequent)
+ 		basic_machine=i386-sequent
+ 		;;
+-	sh)
+-		basic_machine=sh-hitachi
+-		os=-hms
+-		;;
+ 	sh5el)
+ 		basic_machine=sh5le-unknown
+ 		;;
+-	sh64)
+-		basic_machine=sh64-unknown
+-		;;
+-	sparclite-wrs | simso-wrs)
++	simso-wrs)
+ 		basic_machine=sparclite-wrs
+ 		os=-vxworks
+ 		;;
+@@ -1093,7 +1120,7 @@ case $basic_machine in
+ 		os=-sysv4
+ 		;;
+ 	strongarm-* | thumb-*)
+-		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ 		;;
+ 	sun2)
+ 		basic_machine=m68000-sun
+@@ -1215,6 +1242,9 @@ case $basic_machine in
+ 		basic_machine=hppa1.1-winbond
+ 		os=-proelf
+ 		;;
++	x64)
++		basic_machine=x86_64-pc
++		;;
+ 	xbox)
+ 		basic_machine=i686-pc
+ 		os=-mingw32
+@@ -1223,20 +1253,12 @@ case $basic_machine in
+ 		basic_machine=xps100-honeywell
+ 		;;
+ 	xscale-* | xscalee[bl]-*)
+-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
++		basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
+ 		;;
+ 	ymp)
+ 		basic_machine=ymp-cray
+ 		os=-unicos
+ 		;;
+-	z8k-*-coff)
+-		basic_machine=z8k-unknown
+-		os=-sim
+-		;;
+-	z80-*-coff)
+-		basic_machine=z80-unknown
+-		os=-sim
+-		;;
+ 	none)
+ 		basic_machine=none-none
+ 		os=-none
+@@ -1265,10 +1287,6 @@ case $basic_machine in
+ 	vax)
+ 		basic_machine=vax-dec
+ 		;;
+-	pdp10)
+-		# there are many clones, so DEC is not a safe bet
+-		basic_machine=pdp10-unknown
+-		;;
+ 	pdp11)
+ 		basic_machine=pdp11-dec
+ 		;;
+@@ -1278,9 +1296,6 @@ case $basic_machine in
+ 	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+ 		basic_machine=sh-unknown
+ 		;;
+-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+-		basic_machine=sparc-sun
+-		;;
+ 	cydra)
+ 		basic_machine=cydra-cydrome
+ 		;;
+@@ -1300,7 +1315,7 @@ case $basic_machine in
+ 		# Make sure to match an already-canonicalized machine name.
+ 		;;
+ 	*)
+-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
++		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
+ 		exit 1
+ 		;;
+ esac
+@@ -1308,10 +1323,10 @@ esac
+ # Here we canonicalize certain aliases for manufacturers.
+ case $basic_machine in
+ 	*-digital*)
+-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
++		basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
+ 		;;
+ 	*-commodore*)
+-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
++		basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
+ 		;;
+ 	*)
+ 		;;
+@@ -1322,8 +1337,8 @@ 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
+@@ -1334,45 +1349,48 @@ case $os in
+ 	-solaris)
+ 		os=-solaris2
+ 		;;
+-	-svr4*)
+-		os=-sysv4
+-		;;
+ 	-unixware*)
+ 		os=-sysv4.2uw
+ 		;;
+ 	-gnu/linux*)
+ 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+ 		;;
+-	# First accept the basic system types.
++	# es1800 is here to avoid being matched by es* (a different OS)
++	-es1800*)
++		os=-ose
++		;;
++	# Now accept the basic system types.
+ 	# The portable systems comes first.
+-	# Each alternative MUST END IN A *, to match a version number.
++	# 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* | -cnk* | -sunos | -sunos[34]*\
+ 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+ 	      | -sym* | -kopensolaris* | -plan9* \
+ 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+-	      | -aos* | -aros* \
++	      | -aos* | -aros* | -cloudabi* | -sortix* \
+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+-	      | -bitrig* | -openbsd* | -solidbsd* \
++	      | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
++	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
+ 	      | -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* \
++	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
+ 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-	      | -mingw32* | -mingw64* | -linux-gnu* \
++	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+ 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+-	      | -uxpv* | -beos* | -mpeix* | -udk* \
+-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
++	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
++	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+ 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
++	      | -morphos* | -superux* | -rtmk* | -windiss* \
+ 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
++	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
++	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
++	      | -midnightbsd*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	-qnx*)
+@@ -1389,12 +1407,12 @@ case $os in
+ 	-nto*)
+ 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+ 		;;
+-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
++	-sim | -xray | -os68k* | -v88r* \
++	      | -windows* | -osx | -abug | -netware* | -os9* \
+ 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+ 		;;
+ 	-mac*)
+-		os=`echo $os | sed -e 's|mac|macos|'`
++		os=`echo "$os" | sed -e 's|mac|macos|'`
+ 		;;
+ 	-linux-dietlibc)
+ 		os=-linux-dietlibc
+@@ -1403,10 +1421,10 @@ case $os in
+ 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+ 		;;
+ 	-sunos5*)
+-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
++		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
+ 		;;
+ 	-sunos6*)
+-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
++		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
+ 		;;
+ 	-opened*)
+ 		os=-openedition
+@@ -1417,12 +1435,6 @@ case $os in
+ 	-wince*)
+ 		os=-wince
+ 		;;
+-	-osfrose*)
+-		os=-osfrose
+-		;;
+-	-osf*)
+-		os=-osf
+-		;;
+ 	-utek*)
+ 		os=-bsd
+ 		;;
+@@ -1447,7 +1459,7 @@ case $os in
+ 	-nova*)
+ 		os=-rtmk-nova
+ 		;;
+-	-ns2 )
++	-ns2)
+ 		os=-nextstep2
+ 		;;
+ 	-nsk*)
+@@ -1469,7 +1481,7 @@ case $os in
+ 	-oss*)
+ 		os=-sysv3
+ 		;;
+-	-svr4)
++	-svr4*)
+ 		os=-sysv4
+ 		;;
+ 	-svr3)
+@@ -1484,35 +1496,38 @@ case $os in
+ 	-ose*)
+ 		os=-ose
+ 		;;
+-	-es1800*)
+-		os=-ose
+-		;;
+-	-xenix)
+-		os=-xenix
+-		;;
+ 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ 		os=-mint
+ 		;;
+-	-aros*)
+-		os=-aros
+-		;;
+ 	-zvmoe)
+ 		os=-zvmoe
+ 		;;
+ 	-dicos*)
+ 		os=-dicos
+ 		;;
++	-pikeos*)
++		# Until real need of OS specific support for
++		# particular features comes up, bare metal
++		# configurations are quite functional.
++		case $basic_machine in
++		    arm*)
++			os=-eabi
++			;;
++		    *)
++			os=-elf
++			;;
++		esac
++		;;
+ 	-nacl*)
+ 		;;
+-	-android*)
+-		os=-android
++	-ios)
+ 		;;
+ 	-none)
+ 		;;
+ 	*)
+ 		# Get rid of the `-' at the beginning of $os.
+ 		os=`echo $os | sed 's/[^-]*-//'`
+-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
++		echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
+ 		exit 1
+ 		;;
+ esac
+@@ -1593,9 +1608,6 @@ case $basic_machine in
+ 	mips*-*)
+ 		os=-elf
+ 		;;
+-	or1k-*)
+-		os=-elf
+-		;;
+ 	or32-*)
+ 		os=-coff
+ 		;;
+@@ -1605,12 +1617,12 @@ case $basic_machine in
+ 	sparc-* | *-sun)
+ 		os=-sunos4.1.1
+ 		;;
++	pru-*)
++		os=-elf
++		;;
+ 	*-be)
+ 		os=-beos
+ 		;;
+-	*-haiku)
+-		os=-haiku
+-		;;
+ 	*-ibm)
+ 		os=-aix
+ 		;;
+@@ -1650,7 +1662,7 @@ case $basic_machine in
+ 	m88k-omron*)
+ 		os=-luna
+ 		;;
+-	*-next )
++	*-next)
+ 		os=-nextstep
+ 		;;
+ 	*-sequent)
+@@ -1665,9 +1677,6 @@ case $basic_machine in
+ 	i370-*)
+ 		os=-mvs
+ 		;;
+-	*-next)
+-		os=-nextstep3
+-		;;
+ 	*-gould)
+ 		os=-sysv
+ 		;;
+@@ -1776,19 +1785,16 @@ case $basic_machine in
+ 			-vos*)
+ 				vendor=stratus
+ 				;;
+-			*-android*|*-linuxandroid*)
+-				vendor=linux-
+-				;;
+ 		esac
+-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
++		basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
+ 		;;
+ esac
+ 
+-echo $basic_machine$os
++echo "$basic_machine$os"
+ exit
+ 
+ # Local variables:
+-# eval: (add-hook 'write-file-hooks 'time-stamp)
++# eval: (add-hook 'write-file-functions 'time-stamp)
+ # time-stamp-start: "timestamp='"
+ # time-stamp-format: "%:y-%02m-%02d"
+ # time-stamp-end: "'"
+--- firefox-esr-78.3.0esr.orig/old-configure
++++ firefox-esr-78.3.0esr/old-configure
+@@ -23,11 +23,78 @@ ac_help=
+ ac_default_prefix=/usr/local
+ # Any additions from configure.in:
+ ac_help="$ac_help
++  --with-ios-sdk=TYPE
++                          Type of iOS SDK to use (iphonesimulator, iphoneos)
++                          and optionally version (like iphoneos8.2)"
++ac_help="$ac_help
++  --enable-ios-target=VER (default=8.0)
++                          Set the minimum iOS version needed at runtime"
++ac_help="$ac_help
+   --with-x                use the X Window System"
+ ac_help="$ac_help
++  --enable-memory-sanitizer       Enable Memory Sanitizer (default=no)"
++ac_help="$ac_help
++  --enable-thread-sanitizer       Enable Thread Sanitizer (default=no)"
++ac_help="$ac_help
++  --enable-signed-overflow-sanitizer       Enable UndefinedBehavior Sanitizer (Signed Integer Overflow Parts, default=no)"
++ac_help="$ac_help
++  --enable-unsigned-overflow-sanitizer       Enable UndefinedBehavior Sanitizer (Unsigned Integer Overflow Parts, default=no)"
++ac_help="$ac_help
++  --with-debug-label=LABELS
++                          Define DEBUG_<value> for each comma-separated
++                          value given."
++ac_help="$ac_help
++  --with-debug-label=LABELS
++                          Define DEBUG_<value> for each comma-separated
++                          value given."
++ac_help="$ac_help
++  --enable-cpp-rtti       Enable C++ RTTI "
++ac_help="$ac_help
++  --disable-icf          Disable Identical Code Folding"
++ac_help="$ac_help
++  --enable-dtrace         build with dtrace support if available (default=no)"
++ac_help="$ac_help
++  --with-nspr-cflags=FLAGS
++                          Pass FLAGS to CC when building code that uses NSPR.
++                          Use this when there's no accurate nspr-config
++                          script available.  This is the case when building
++                          SpiderMonkey as part of the Mozilla tree: the
++                          top-level configure script computes NSPR flags
++                          that accomodate the quirks of that environment."
++ac_help="$ac_help
++  --with-nspr-libs=LIBS   Pass LIBS to LD when linking code that uses NSPR.
++                          See --with-nspr-cflags for more details."
++ac_help="$ac_help
++  --enable-nspr-build     Build NSPR from source tree"
++ac_help="$ac_help
++  --with-system-nspr      Use an NSPR that is already built and installed.
++                          Use the 'nspr-config' script in the current path,
++                          or look for the script in the directories given with
++                          --with-nspr-exec-prefix or --with-nspr-prefix.
++                          (Those flags are only checked if you specify
++                          --with-system-nspr.)"
++ac_help="$ac_help
++  --enable-posix-nspr-emulation
++                          Enable emulation of NSPR for POSIX systems"
++ac_help="$ac_help
++  --with-nspr-prefix=PFX  Prefix where NSPR is installed"
++ac_help="$ac_help
++  --with-nspr-exec-prefix=PFX
++                          Exec prefix where NSPR is installed"
++ac_help="$ac_help
+   --with-system-libevent[=PFX]
+                           Use system libevent [installed at prefix PFX]"
+ ac_help="$ac_help
++  --with-system-nss       Use system installed NSS"
++ac_help="$ac_help
++  --with-nss-prefix=PFX   Prefix where NSS is installed"
++ac_help="$ac_help
++  --with-nss-exec-prefix=PFX
++                          Exec prefix where NSS is installed"
++ac_help="$ac_help
++  --with-system-zlib[=PFX]
++                          Use system libz [installed at prefix PFX]"
++ac_help="$ac_help
+   --with-system-png[=PFX]
+                           Use system libpng [installed at prefix PFX]"
+ ac_help="$ac_help
+@@ -49,6 +116,9 @@ ac_help="$ac_help
+ ac_help="$ac_help
+   --with-android-max-sdk=[VER]     Impose a maximum Firefox for Android SDK version"
+ ac_help="$ac_help
++  --enable-startup-notification
++                          Enable startup-notification support (default: disabled) "
++ac_help="$ac_help
+   --with-branding=dir     Use branding from the specified directory."
+ ac_help="$ac_help
+   --with-distribution-id=ID
+@@ -75,6 +145,8 @@ ac_help="$ac_help
+ ac_help="$ac_help
+   --enable-extensions     Enable extensions"
+ ac_help="$ac_help
++  --enable-signmar     Enable building the signmar program"
++ac_help="$ac_help
+   --disable-updater       Disable building of updater"
+ ac_help="$ac_help
+   --disable-parental-controls
+@@ -82,6 +154,8 @@ ac_help="$ac_help
+ ac_help="$ac_help
+   --disable-sandbox        Disable sandboxing support"
+ ac_help="$ac_help
++  --enable-system-sqlite  Use system sqlite (located with pkgconfig)"
++ac_help="$ac_help
+   --disable-zipwriter     Disable zipwriter component"
+ ac_help="$ac_help
+   --enable-mobile-optimize
+@@ -91,10 +165,22 @@ ac_help="$ac_help
+ ac_help="$ac_help
+   --enable-dump-painting          Enable paint debugging."
+ ac_help="$ac_help
++  --enable-strip          Enable stripping of libs & executables "
++ac_help="$ac_help
++  --enable-install-strip  Enable stripping of libs & executables when packaging "
++ac_help="$ac_help
+   --enable-debug-js-modules  Enable debug mode for frontend JS libraries"
+ ac_help="$ac_help
+   --disable-startupcache          Disable startup cache "
+ ac_help="$ac_help
++  --jitreport-granularity=N
++                           Default granularity at which to report JIT code
++                           to external tools
++                             0 - no info
++                             1 - code ranges for whole functions only
++                             2 - per-line information
++                             3 - per-op information"
++ac_help="$ac_help
+   --with-user-appdir=DIR  Set user-specific appdir (default=.mozilla)"
+ ac_help="$ac_help
+  --enable-system-cairo  Obsolete: do not use this option"
+@@ -105,8 +191,19 @@ ac_help="$ac_help
+ ac_help="$ac_help
+   --disable-necko-wifi    Disable necko wifi scanner"
+ ac_help="$ac_help
++  --disable-cookies       Disable cookie support"
++ac_help="$ac_help
+   --with-macbundlename-prefix=prefix
+                           Prefix for MOZ_MACBUNDLE_NAME"
++ac_help="$ac_help
++  --with-system-icu
++                          Use system ICU (located with pkgconfig)"
++ac_help="$ac_help
++  --with-intl-api, --with-intl-api=build, --without-intl-api
++    Determine the status of the ECMAScript Internationalization API.  The first
++    (or lack of any of these) builds and exposes the API.  The second builds it
++    but doesn't use ICU or expose the API to script.  The third doesn't build
++    ICU at all."
+ 
+ # Initialize some variables set by options.
+ # The variables have the same names as the options, with
+@@ -673,7 +770,7 @@ else { echo "configure: error: can not r
+ fi
+ 
+ echo $ac_n "checking host system type""... $ac_c" 1>&6
+-echo "configure:677: checking host system type" >&5
++echo "configure:774: checking host system type" >&5
+ 
+ host_alias=$host
+ case "$host_alias" in
+@@ -694,7 +791,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-
+ echo "$ac_t""$host" 1>&6
+ 
+ echo $ac_n "checking target system type""... $ac_c" 1>&6
+-echo "configure:698: checking target system type" >&5
++echo "configure:795: checking target system type" >&5
+ 
+ target_alias=$target
+ case "$target_alias" in
+@@ -712,7 +809,7 @@ target_os=`echo $target | sed 's/^\([^-]
+ echo "$ac_t""$target" 1>&6
+ 
+ echo $ac_n "checking build system type""... $ac_c" 1>&6
+-echo "configure:716: checking build system type" >&5
++echo "configure:813: checking build system type" >&5
+ 
+ build_alias=$build
+ case "$build_alias" in
+@@ -756,6 +853,9 @@ _SUBDIR_HOST_LDFLAGS="$HOST_LDFLAGS"
+ _SUBDIR_CONFIG_ARGS="$ac_configure_args"
+ 
+ MOZPNG=10635
++NSPR_VERSION=4
++NSPR_MINVER=4.21
++NSS_VERSION=3
+ 
+ GLIB_VERSION=2.22
+ # 2_26 is the earliest version we can set GLIB_VERSION_MIN_REQUIRED.
+@@ -766,7 +866,9 @@ GTK2_VERSION=2.18.0
+ GTK3_VERSION=3.4.0
+ GDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_4
+ W32API_VERSION=3.14
++STARTUP_NOTIFICATION_VERSION=0.8
+ DBUS_VERSION=0.60
++SQLITE_VERSION=3.28.0
+ 
+ MISSING_X=
+ 
+@@ -795,6 +897,17 @@ case "$target" in
+     ASFLAGS="$directory_include_args -DANDROID $ASFLAGS"
+ 
+     LDFLAGS="-L$android_platform/usr/lib -Wl,-rpath-link=$android_platform/usr/lib --sysroot=$android_platform $LDFLAGS"
++    ANDROID_PLATFORM="${android_platform}"
++
++    cat >> confdefs.pytmp <<\EOF
++    (''' ANDROID ''', ' 1 ')
++EOF
++cat >> confdefs.h <<\EOF
++#define ANDROID 1
++EOF
++
++    
++
+     ;;
+ esac
+ 
+@@ -803,12 +916,19 @@ fi # COMPILE_ENVIRONMENT
+ 
+ case "$target" in
+ *-android*|*-linuxandroid*)
++    cat >> confdefs.pytmp <<\EOF
++    (''' ANDROID ''', ' 1 ')
++EOF
++cat >> confdefs.h <<\EOF
++#define ANDROID 1
++EOF
++
+     ;;
+ *-linux*)
+     # Extract the first word of "objcopy", so it can be a program name with args.
+ set dummy objcopy; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:812: checking for $ac_word" >&5
++echo "configure:932: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_OBJCOPY'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -843,6 +963,225 @@ fi
+     ;;
+ esac
+ 
++case "$target" in
++*-apple-darwin*)
++    
++
++# Check whether --with-ios-sdk or --without-ios-sdk was given.
++if test "${with_ios_sdk+set}" = set; then
++  withval="$with_ios_sdk"
++  ios_sdk=$withval
++fi
++
++
++# Check whether --enable-ios-target or --disable-ios-target was given.
++if test "${enable_ios_target+set}" = set; then
++  enableval="$enable_ios_target"
++  _IOS_TARGET=$enableval
++fi
++
++_IOS_TARGET_DEFAULT=8.0
++
++case "$target" in
++arm*-apple-darwin*)
++    if test -z "$ios_sdk" -o "$ios_sdk" = "yes"; then
++       ios_sdk=iphoneos
++    fi
++    case "$ios_sdk" in
++         iphoneos*)
++                ios_target_arg="-miphoneos-version-min"
++                ;;
++         *)
++                { echo "configure: error: Only 'iphoneos' SDKs are valid when targeting iOS device, don't know what to do with '$ios_sdk'." 1>&2; echo "configure: error: Only 'iphoneos' SDKs are valid when targeting iOS device, don't know what to do with '$ios_sdk'." 1>&5; exit 1; }
++                ;;
++    esac
++    ;;
++*-apple-darwin*)
++    ios_target_arg="-mios-simulator-version-min"
++    case "$ios_sdk" in
++         # Empty SDK is okay, this might be an OS X desktop build.
++         ""|iphonesimulator*)
++                ;;
++         # Default to iphonesimulator
++         yes)
++                ios_sdk=iphonesimulator
++                ;;
++         *)
++                { echo "configure: error: Only 'iphonesimulator' SDKs are valid when targeting iOS simulator." 1>&2; echo "configure: error: Only 'iphonesimulator' SDKs are valid when targeting iOS simulator." 1>&5; exit 1; }
++                ;;
++    esac
++    ;;
++esac
++
++
++if test -n "$ios_sdk"; then
++   if test -z "$_IOS_TARGET"; then
++      _IOS_TARGET=$_IOS_TARGET_DEFAULT
++      ios_target_arg="${ios_target_arg}=${_IOS_TARGET}"
++   fi
++   # Ensure that xcrun knows where this SDK is.
++   ios_sdk_path=`xcrun --sdk $ios_sdk --show-sdk-path 2>/dev/null`
++   _ret=$?
++   if test $_ret -ne 0; then
++      { echo "configure: error: iOS SDK '$ios_sdk' could not be found." 1>&2; echo "configure: error: iOS SDK '$ios_sdk' could not be found." 1>&5; exit 1; }
++   fi
++   MOZ_IOS=1
++   export HOST_CC=clang
++   export HOST_CXX=clang++
++   # Add isysroot, arch, and ios target arguments
++   case "$target_cpu" in
++        arm*)
++                ARGS="-arch armv7"
++                ;;
++        *)
++                # Unfortunately simulator builds need this.
++                export CROSS_COMPILE=1
++                ;;
++   esac
++   ARGS=" $ARGS -isysroot $ios_sdk_path $ios_target_arg"
++   # Now find our tools
++   
++
++_prog_name=clang
++
++echo $ac_n "checking for $_prog_name in iOS SDK""... $ac_c" 1>&6
++echo "configure:1049: checking for $_prog_name in iOS SDK" >&5
++if eval "test \"`echo '$''{'ac_cv_ios_path_CC'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  
++_path=`xcrun --sdk $ios_sdk --find $_prog_name 2>/dev/null`
++_res=$?
++if test $_res -ne 0; then
++   { echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&2; echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&5; exit 1; }
++fi
++ac_cv_ios_path_CC=$_path
++
++fi
++
++echo "$ac_t""$ac_cv_ios_path_CC" 1>&6
++CC="${ac_cv_ios_path_CC}$ARGS"
++
++   
++
++_prog_name=clang++
++
++echo $ac_n "checking for $_prog_name in iOS SDK""... $ac_c" 1>&6
++echo "configure:1071: checking for $_prog_name in iOS SDK" >&5
++if eval "test \"`echo '$''{'ac_cv_ios_path_CXX'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  
++_path=`xcrun --sdk $ios_sdk --find $_prog_name 2>/dev/null`
++_res=$?
++if test $_res -ne 0; then
++   { echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&2; echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&5; exit 1; }
++fi
++ac_cv_ios_path_CXX=$_path
++
++fi
++
++echo "$ac_t""$ac_cv_ios_path_CXX" 1>&6
++CXX="${ac_cv_ios_path_CXX}$ARGS"
++
++   export CPP="$CC -E"
++   
++
++_prog_name=`echo AR | tr "[:upper:]" "[:lower:]"`
++
++echo $ac_n "checking for $_prog_name in iOS SDK""... $ac_c" 1>&6
++echo "configure:1094: checking for $_prog_name in iOS SDK" >&5
++if eval "test \"`echo '$''{'ac_cv_ios_path_AR'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  
++_path=`xcrun --sdk $ios_sdk --find $_prog_name 2>/dev/null`
++_res=$?
++if test $_res -ne 0; then
++   { echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&2; echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&5; exit 1; }
++fi
++ac_cv_ios_path_AR=$_path
++
++fi
++
++echo "$ac_t""$ac_cv_ios_path_AR" 1>&6
++AR="${ac_cv_ios_path_AR}"
++
++   
++
++_prog_name=as
++
++echo $ac_n "checking for $_prog_name in iOS SDK""... $ac_c" 1>&6
++echo "configure:1116: checking for $_prog_name in iOS SDK" >&5
++if eval "test \"`echo '$''{'ac_cv_ios_path_AS'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  
++_path=`xcrun --sdk $ios_sdk --find $_prog_name 2>/dev/null`
++_res=$?
++if test $_res -ne 0; then
++   { echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&2; echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&5; exit 1; }
++fi
++ac_cv_ios_path_AS=$_path
++
++fi
++
++echo "$ac_t""$ac_cv_ios_path_AS" 1>&6
++AS="${ac_cv_ios_path_AS}$ARGS"
++
++   
++
++_prog_name=`echo OTOOL | tr "[:upper:]" "[:lower:]"`
++
++echo $ac_n "checking for $_prog_name in iOS SDK""... $ac_c" 1>&6
++echo "configure:1138: checking for $_prog_name in iOS SDK" >&5
++if eval "test \"`echo '$''{'ac_cv_ios_path_OTOOL'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  
++_path=`xcrun --sdk $ios_sdk --find $_prog_name 2>/dev/null`
++_res=$?
++if test $_res -ne 0; then
++   { echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&2; echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&5; exit 1; }
++fi
++ac_cv_ios_path_OTOOL=$_path
++
++fi
++
++echo "$ac_t""$ac_cv_ios_path_OTOOL" 1>&6
++OTOOL="${ac_cv_ios_path_OTOOL}"
++
++   
++
++_prog_name=`echo STRIP | tr "[:upper:]" "[:lower:]"`
++
++echo $ac_n "checking for $_prog_name in iOS SDK""... $ac_c" 1>&6
++echo "configure:1160: checking for $_prog_name in iOS SDK" >&5
++if eval "test \"`echo '$''{'ac_cv_ios_path_STRIP'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  
++_path=`xcrun --sdk $ios_sdk --find $_prog_name 2>/dev/null`
++_res=$?
++if test $_res -ne 0; then
++   { echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&2; echo "configure: error: Could not find '$_prog_name' in the iOS SDK" 1>&5; exit 1; }
++fi
++ac_cv_ios_path_STRIP=$_path
++
++fi
++
++echo "$ac_t""$ac_cv_ios_path_STRIP" 1>&6
++STRIP="${ac_cv_ios_path_STRIP}"
++
++   export PKG_CONFIG_PATH=${ios_sdk_path}/usr/lib/pkgconfig/
++fi
++
++
++
++    ;;
++esac
++
++
+ 
+ 
+ 
+@@ -862,7 +1201,7 @@ esac
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:866: checking for $ac_word" >&5
++echo "configure:1205: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -892,7 +1231,7 @@ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:896: checking for $ac_word" >&5
++echo "configure:1235: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -943,7 +1282,7 @@ fi
+       # Extract the first word of "cl", so it can be a program name with args.
+ set dummy cl; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:947: checking for $ac_word" >&5
++echo "configure:1286: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -975,7 +1314,7 @@ fi
+ fi
+ 
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:979: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:1318: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+ 
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+@@ -993,12 +1332,12 @@ if eval "test \"`echo '$''{'ac_cv_prog_c
+ else
+   cat > conftest.$ac_ext << EOF
+ 
+-#line 997 "configure"
++#line 1336 "configure"
+ #include "confdefs.h"
+ 
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:1002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cc_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -1030,12 +1369,12 @@ if test $ac_cv_prog_cc_works = no; then
+   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&5; exit 1; }
+ fi
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:1034: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:1373: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+-echo "configure:1039: checking whether we are using GNU C" >&5
++echo "configure:1378: checking whether we are using GNU C" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1044,7 +1383,7 @@ else
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1048: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+   ac_cv_prog_gcc=yes
+ else
+   ac_cv_prog_gcc=no
+@@ -1063,7 +1402,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS=
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-echo "configure:1067: checking whether ${CC-cc} accepts -g" >&5
++echo "configure:1406: checking whether ${CC-cc} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1099,7 +1438,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1103: checking for $ac_word" >&5
++echo "configure:1442: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1131,7 +1470,7 @@ test -n "$CXX" || CXX="gcc"
+ 
+ 
+ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1135: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
++echo "configure:1474: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+ 
+ ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+@@ -1149,12 +1488,12 @@ if eval "test \"`echo '$''{'ac_cv_prog_c
+ else
+   cat > conftest.$ac_ext << EOF
+ 
+-#line 1153 "configure"
++#line 1492 "configure"
+ #include "confdefs.h"
+ 
+ int main(){return(0);}
+ EOF
+-if { (eval echo configure:1158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cxx_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -1186,12 +1525,12 @@ if test $ac_cv_prog_cxx_works = no; then
+   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&5; exit 1; }
+ fi
+ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:1190: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:1529: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
+-echo "configure:1195: checking whether we are using GNU C++" >&5
++echo "configure:1534: checking whether we are using GNU C++" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1200,7 +1539,7 @@ else
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1543: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+   ac_cv_prog_gxx=yes
+ else
+   ac_cv_prog_gxx=no
+@@ -1219,7 +1558,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS=
+ echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
+-echo "configure:1223: checking whether ${CXX-g++} accepts -g" >&5
++echo "configure:1562: checking whether ${CXX-g++} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1256,7 +1595,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1260: checking for $ac_word" >&5
++echo "configure:1599: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1291,7 +1630,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1295: checking for $ac_word" >&5
++echo "configure:1634: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1326,7 +1665,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1330: checking for $ac_word" >&5
++echo "configure:1669: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_LIPO'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1361,7 +1700,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1365: checking for $ac_word" >&5
++echo "configure:1704: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1396,7 +1735,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1400: checking for $ac_word" >&5
++echo "configure:1739: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_OTOOL'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1431,7 +1770,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1435: checking for $ac_word" >&5
++echo "configure:1774: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_INSTALL_NAME_TOOL'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1466,7 +1805,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1470: checking for $ac_word" >&5
++echo "configure:1809: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1502,7 +1841,7 @@ else
+     # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1506: checking for $ac_word" >&5
++echo "configure:1845: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1532,7 +1871,7 @@ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1536: checking for $ac_word" >&5
++echo "configure:1875: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1583,7 +1922,7 @@ fi
+       # Extract the first word of "cl", so it can be a program name with args.
+ set dummy cl; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1587: checking for $ac_word" >&5
++echo "configure:1926: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1615,7 +1954,7 @@ fi
+ fi
+ 
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1619: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:1958: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+ 
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+@@ -1633,12 +1972,12 @@ if eval "test \"`echo '$''{'ac_cv_prog_c
+ else
+   cat > conftest.$ac_ext << EOF
+ 
+-#line 1637 "configure"
++#line 1976 "configure"
+ #include "confdefs.h"
+ 
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:1642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cc_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -1670,12 +2009,12 @@ if test $ac_cv_prog_cc_works = no; then
+   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&5; exit 1; }
+ fi
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:1674: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:2013: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+-echo "configure:1679: checking whether we are using GNU C" >&5
++echo "configure:2018: checking whether we are using GNU C" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1684,7 +2023,7 @@ else
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1688: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+   ac_cv_prog_gcc=yes
+ else
+   ac_cv_prog_gcc=no
+@@ -1703,7 +2042,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS=
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-echo "configure:1707: checking whether ${CC-cc} accepts -g" >&5
++echo "configure:2046: checking whether ${CC-cc} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1744,7 +2083,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1748: checking for $ac_word" >&5
++echo "configure:2087: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1776,7 +2115,7 @@ test -n "$CXX" || CXX="gcc"
+ 
+ 
+ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1780: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
++echo "configure:2119: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+ 
+ ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+@@ -1794,12 +2133,12 @@ if eval "test \"`echo '$''{'ac_cv_prog_c
+ else
+   cat > conftest.$ac_ext << EOF
+ 
+-#line 1798 "configure"
++#line 2137 "configure"
+ #include "confdefs.h"
+ 
+ int main(){return(0);}
+ EOF
+-if { (eval echo configure:1803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cxx_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -1831,12 +2170,12 @@ if test $ac_cv_prog_cxx_works = no; then
+   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&5; exit 1; }
+ fi
+ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:1835: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:2174: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
+-echo "configure:1840: checking whether we are using GNU C++" >&5
++echo "configure:2179: checking whether we are using GNU C++" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1845,7 +2184,7 @@ else
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+   ac_cv_prog_gxx=yes
+ else
+   ac_cv_prog_gxx=no
+@@ -1864,7 +2203,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS=
+ echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
+-echo "configure:1868: checking whether ${CXX-g++} accepts -g" >&5
++echo "configure:2207: checking whether ${CXX-g++} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1898,7 +2237,7 @@ fi
+     # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1902: checking for $ac_word" >&5
++echo "configure:2241: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1930,7 +2269,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1934: checking for $ac_word" >&5
++echo "configure:2273: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1984,7 +2323,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1988: checking for $ac_word" >&5
++echo "configure:2327: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2019,7 +2358,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2023: checking for $ac_word" >&5
++echo "configure:2362: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_OTOOL'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2096,7 +2435,8 @@ case "$target" in
+         _WIN32_MSVC=1
+ 
+         # Make sure compilers are valid
+-        CXXFLAGS="$CXXFLAGS -TP"
++        CFLAGS="$CFLAGS -nologo"
++        CXXFLAGS="$CXXFLAGS -TP -nologo"
+         
+         ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+@@ -2110,14 +2450,14 @@ if test "$CC_TYPE" = "clang-cl"; then
+ fi
+ 
+         cat > conftest.$ac_ext <<EOF
+-#line 2114 "configure"
++#line 2454 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int main() {
+  printf("Hello World\n"); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2121: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2461: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+@@ -2139,14 +2479,14 @@ if test "$CC_TYPE" = "clang-cl"; then
+ fi
+ 
+         cat > conftest.$ac_ext <<EOF
+-#line 2143 "configure"
++#line 2483 "configure"
+ #include "confdefs.h"
+ #include <new.h>
+ int main() {
+  unsigned *test = new unsigned(42); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+@@ -2204,7 +2544,7 @@ EOF
+           if test ! -d "$WIN_UCRT_REDIST_DIR"; then
+             { echo "configure: error: Invalid Windows UCRT Redist directory: ${WIN_UCRT_REDIST_DIR}" 1>&2; echo "configure: error: Invalid Windows UCRT Redist directory: ${WIN_UCRT_REDIST_DIR}" 1>&5; exit 1; }
+           fi
+-          WIN_UCRT_REDIST_DIR=`cd "$WIN_UCRT_REDIST_DIR" && (pwd -W 2>/dev/null || pwd)`
++          WIN_UCRT_REDIST_DIR=`cd "$WIN_UCRT_REDIST_DIR" && pwd -W`
+         fi
+ 
+         
+@@ -2222,7 +2562,7 @@ EOF
+           if test ! -d "$WIN32_REDIST_DIR"; then
+             { echo "configure: error: Invalid Win32 Redist directory: ${WIN32_REDIST_DIR}" 1>&2; echo "configure: error: Invalid Win32 Redist directory: ${WIN32_REDIST_DIR}" 1>&5; exit 1; }
+           fi
+-          WIN32_REDIST_DIR=`cd "$WIN32_REDIST_DIR" && (pwd -W 2>/dev/null || pwd)`
++          WIN32_REDIST_DIR=`cd "$WIN32_REDIST_DIR" && pwd -W`
+         fi
+ 
+         # Check linker version, except in lld builds
+@@ -2244,14 +2584,16 @@ EOF
+ 
+         WRAP_STL_INCLUDES=1
+         STL_FLAGS="-I${DIST}/stl_wrappers"
++        CFLAGS="$CFLAGS -D_HAS_EXCEPTIONS=0"
++        CXXFLAGS="$CXXFLAGS -D_HAS_EXCEPTIONS=0"
+     else
+         # Check w32api version
+         _W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'`
+         _W32API_MINOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $2 }'`
+         echo $ac_n "checking for w32api version >= $W32API_VERSION""... $ac_c" 1>&6
+-echo "configure:2253: checking for w32api version >= $W32API_VERSION" >&5
++echo "configure:2595: checking for w32api version >= $W32API_VERSION" >&5
+         cat > conftest.$ac_ext <<EOF
+-#line 2255 "configure"
++#line 2597 "configure"
+ #include "confdefs.h"
+ #include <w32api.h>
+ int main() {
+@@ -2263,7 +2605,7 @@ int main() {
+             
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2267: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+    res=yes 
+ else
+@@ -2288,9 +2630,6 @@ EOF
+ 
+     fi # !GNU_CC
+ 
+-    CFLAGS="$CFLAGS -D_HAS_EXCEPTIONS=0"
+-    CXXFLAGS="$CXXFLAGS -D_HAS_EXCEPTIONS=0"
+-
+     cat >> confdefs.pytmp <<EOF
+     (''' WINVER ''', r''' 0x$WINVER ''')
+ EOF
+@@ -2357,7 +2696,7 @@ if test "$COMPILE_ENVIRONMENT"; then
+ # Uses ac_ vars as temps to allow command line to override cache and checks.
+ # --without-x overrides everything else, but does not touch the cache.
+ echo $ac_n "checking for X""... $ac_c" 1>&6
+-echo "configure:2361: checking for X" >&5
++echo "configure:2700: checking for X" >&5
+ 
+ # Check whether --with-x or --without-x was given.
+ if test "${with_x+set}" = set; then
+@@ -2419,12 +2758,12 @@ if test "$ac_x_includes" = NO; then
+ 
+   # First, try using that file with no special directory specified.
+ cat > conftest.$ac_ext <<EOF
+-#line 2423 "configure"
++#line 2762 "configure"
+ #include "confdefs.h"
+ #include <$x_direct_test_include>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2767: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2493,14 +2832,14 @@ if test "$ac_x_libraries" = NO; then
+   ac_save_LIBS="$LIBS"
+   LIBS="-l$x_direct_test_library $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2497 "configure"
++#line 2836 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ ${x_direct_test_function}()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   LIBS="$ac_save_LIBS"
+ # We can link X programs with no special library path.
+@@ -2609,17 +2948,17 @@ else
+     case "`(uname -sr) 2>/dev/null`" in
+     "SunOS 5"*)
+       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
+-echo "configure:2613: checking whether -R must be followed by a space" >&5
++echo "configure:2952: checking whether -R must be followed by a space" >&5
+       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
+       cat > conftest.$ac_ext <<EOF
+-#line 2616 "configure"
++#line 2955 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_R_nospace=yes
+ else
+@@ -2635,14 +2974,14 @@ rm -f conftest*
+       else
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+ 	cat > conftest.$ac_ext <<EOF
+-#line 2639 "configure"
++#line 2978 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_R_space=yes
+ else
+@@ -2674,7 +3013,7 @@ rm -f conftest*
+     # libraries were built with DECnet support.  And karl@cs.umb.edu says
+     # the Alpha needs dnet_stub (dnet does not exist).
+     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
+-echo "configure:2678: checking for dnet_ntoa in -ldnet" >&5
++echo "configure:3017: checking for dnet_ntoa in -ldnet" >&5
+ ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2682,7 +3021,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldnet  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2686 "configure"
++#line 3025 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -2693,7 +3032,7 @@ int main() {
+ dnet_ntoa()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2715,7 +3054,7 @@ fi
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
+-echo "configure:2719: checking for dnet_ntoa in -ldnet_stub" >&5
++echo "configure:3058: checking for dnet_ntoa in -ldnet_stub" >&5
+ ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2723,7 +3062,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldnet_stub  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2727 "configure"
++#line 3066 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -2734,7 +3073,7 @@ int main() {
+ dnet_ntoa()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2763,12 +3102,12 @@ fi
+     # The nsl library prevents programs from opening the X display
+     # on Irix 5.2, according to dickey@clark.net.
+     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
+-echo "configure:2767: checking for gethostbyname" >&5
++echo "configure:3106: checking for gethostbyname" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2772 "configure"
++#line 3111 "configure"
+ #define gethostbyname innocuous_gethostbyname
+ #include "confdefs.h"
+ #undef gethostbyname
+@@ -2795,7 +3134,7 @@ gethostbyname();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_gethostbyname=yes"
+ else
+@@ -2816,7 +3155,7 @@ fi
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+-echo "configure:2820: checking for gethostbyname in -lnsl" >&5
++echo "configure:3159: checking for gethostbyname in -lnsl" >&5
+ ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2824,7 +3163,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnsl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2828 "configure"
++#line 3167 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -2835,7 +3174,7 @@ int main() {
+ gethostbyname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2865,12 +3204,12 @@ fi
+     # -lsocket must be given before -lnsl if both are needed.
+     # We assume that if connect needs -lnsl, so does gethostbyname.
+     echo $ac_n "checking for connect""... $ac_c" 1>&6
+-echo "configure:2869: checking for connect" >&5
++echo "configure:3208: checking for connect" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2874 "configure"
++#line 3213 "configure"
+ #define connect innocuous_connect
+ #include "confdefs.h"
+ #undef connect
+@@ -2897,7 +3236,7 @@ connect();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_connect=yes"
+ else
+@@ -2918,7 +3257,7 @@ fi
+ 
+     if test $ac_cv_func_connect = no; then
+       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
+-echo "configure:2922: checking for connect in -lsocket" >&5
++echo "configure:3261: checking for connect in -lsocket" >&5
+ ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2926,7 +3265,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2930 "configure"
++#line 3269 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -2937,7 +3276,7 @@ int main() {
+ connect()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2961,12 +3300,12 @@ fi
+ 
+     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
+     echo $ac_n "checking for remove""... $ac_c" 1>&6
+-echo "configure:2965: checking for remove" >&5
++echo "configure:3304: checking for remove" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2970 "configure"
++#line 3309 "configure"
+ #define remove innocuous_remove
+ #include "confdefs.h"
+ #undef remove
+@@ -2993,7 +3332,7 @@ remove();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_remove=yes"
+ else
+@@ -3014,7 +3353,7 @@ fi
+ 
+     if test $ac_cv_func_remove = no; then
+       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
+-echo "configure:3018: checking for remove in -lposix" >&5
++echo "configure:3357: checking for remove in -lposix" >&5
+ ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3022,7 +3361,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lposix  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3026 "configure"
++#line 3365 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3033,7 +3372,7 @@ int main() {
+ remove()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3057,12 +3396,12 @@ fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+     echo $ac_n "checking for shmat""... $ac_c" 1>&6
+-echo "configure:3061: checking for shmat" >&5
++echo "configure:3400: checking for shmat" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3066 "configure"
++#line 3405 "configure"
+ #define shmat innocuous_shmat
+ #include "confdefs.h"
+ #undef shmat
+@@ -3089,7 +3428,7 @@ shmat();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_shmat=yes"
+ else
+@@ -3110,7 +3449,7 @@ fi
+ 
+     if test $ac_cv_func_shmat = no; then
+       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
+-echo "configure:3114: checking for shmat in -lipc" >&5
++echo "configure:3453: checking for shmat in -lipc" >&5
+ ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3118,7 +3457,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lipc  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3122 "configure"
++#line 3461 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3129,7 +3468,7 @@ int main() {
+ shmat()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3162,7 +3501,7 @@ fi
+   # libraries we check for below, so use a different variable.
+   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
+   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
+-echo "configure:3166: checking for IceConnectionNumber in -lICE" >&5
++echo "configure:3505: checking for IceConnectionNumber in -lICE" >&5
+ ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3170,7 +3509,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3174 "configure"
++#line 3513 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3181,7 +3520,7 @@ int main() {
+ IceConnectionNumber()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3306,7 +3645,7 @@ if test -n "$MOZ_ASAN"; then
+          # Extract the first word of "$MOZ_CLANG_RT_ASAN_LIB", so it can be a program name with args.
+ set dummy $MOZ_CLANG_RT_ASAN_LIB; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3310: checking for $ac_word" >&5
++echo "configure:3649: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_MOZ_CLANG_RT_ASAN_LIB_PATH'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3376,7 +3715,7 @@ EOF
+      # Extract the first word of "llvm-symbolizer", so it can be a program name with args.
+ set dummy llvm-symbolizer; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3380: checking for $ac_word" >&5
++echo "configure:3719: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_LLVM_SYMBOLIZER'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3424,6 +3763,18 @@ fi
+ fi
+ 
+ 
++# Check whether --enable-memory-sanitizer or --disable-memory-sanitizer was given.
++if test "${enable_memory_sanitizer+set}" = set; then
++  enableval="$enable_memory_sanitizer"
++  if test "$enableval" = "yes"; then
++    MOZ_MSAN=1
++  elif test "$enableval" = "no"; then
++    MOZ_MSAN= 
++  else
++    { echo "configure: error: Option, memory-sanitizer, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, memory-sanitizer, does not take an argument ($enableval)." 1>&5; exit 1; }
++  fi
++fi
++
+ if test -n "$MOZ_MSAN"; then
+     CFLAGS="-fsanitize=memory -fsanitize-memory-track-origins $CFLAGS"
+     CXXFLAGS="-fsanitize=memory -fsanitize-memory-track-origins $CXXFLAGS"
+@@ -3440,7 +3791,7 @@ EOF
+      # Extract the first word of "llvm-symbolizer", so it can be a program name with args.
+ set dummy llvm-symbolizer; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3444: checking for $ac_word" >&5
++echo "configure:3795: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_LLVM_SYMBOLIZER'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3488,6 +3839,18 @@ fi
+ fi
+ 
+ 
++# Check whether --enable-thread-sanitizer or --disable-thread-sanitizer was given.
++if test "${enable_thread_sanitizer+set}" = set; then
++  enableval="$enable_thread_sanitizer"
++  if test "$enableval" = "yes"; then
++    MOZ_TSAN=1
++  elif test "$enableval" = "no"; then
++    MOZ_TSAN= 
++  else
++    { echo "configure: error: Option, thread-sanitizer, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, thread-sanitizer, does not take an argument ($enableval)." 1>&5; exit 1; }
++  fi
++fi
++
+ if test -n "$MOZ_TSAN"; then
+     CFLAGS="-fsanitize=thread $CFLAGS"
+     CXXFLAGS="-fsanitize=thread $CXXFLAGS"
+@@ -3504,7 +3867,7 @@ EOF
+      # Extract the first word of "llvm-symbolizer", so it can be a program name with args.
+ set dummy llvm-symbolizer; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3508: checking for $ac_word" >&5
++echo "configure:3871: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_LLVM_SYMBOLIZER'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3572,7 +3935,7 @@ EOF
+      # Extract the first word of "llvm-symbolizer", so it can be a program name with args.
+ set dummy llvm-symbolizer; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3576: checking for $ac_word" >&5
++echo "configure:3939: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_LLVM_SYMBOLIZER'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3620,6 +3983,32 @@ fi
+ fi
+ 
+ 
++
++# Check whether --enable-signed-overflow-sanitizer or --disable-signed-overflow-sanitizer was given.
++if test "${enable_signed_overflow_sanitizer+set}" = set; then
++  enableval="$enable_signed_overflow_sanitizer"
++  if test "$enableval" = "yes"; then
++    MOZ_SIGNED_OVERFLOW_SANITIZE=1
++  elif test "$enableval" = "no"; then
++    MOZ_SIGNED_OVERFLOW_SANITIZE= 
++  else
++    { echo "configure: error: Option, signed-overflow-sanitizer, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, signed-overflow-sanitizer, does not take an argument ($enableval)." 1>&5; exit 1; }
++  fi
++fi
++
++# Check whether --enable-unsigned-overflow-sanitizer or --disable-unsigned-overflow-sanitizer was given.
++if test "${enable_unsigned_overflow_sanitizer+set}" = set; then
++  enableval="$enable_unsigned_overflow_sanitizer"
++  if test "$enableval" = "yes"; then
++    MOZ_UNSIGNED_OVERFLOW_SANITIZE=1
++  elif test "$enableval" = "no"; then
++    MOZ_UNSIGNED_OVERFLOW_SANITIZE= 
++  else
++    { echo "configure: error: Option, unsigned-overflow-sanitizer, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, unsigned-overflow-sanitizer, does not take an argument ($enableval)." 1>&5; exit 1; }
++  fi
++fi
++
++
+ if test -n "$MOZ_SIGNED_OVERFLOW_SANITIZE$MOZ_UNSIGNED_OVERFLOW_SANITIZE"; then
+     MOZ_UBSAN=1
+     SANITIZER_BLACKLISTS=""
+@@ -3665,7 +4054,7 @@ EOF
+      # Extract the first word of "llvm-symbolizer", so it can be a program name with args.
+ set dummy llvm-symbolizer; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3669: checking for $ac_word" >&5
++echo "configure:4058: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_LLVM_SYMBOLIZER'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3723,14 +4112,14 @@ fi
+ 
+ 
+ cat > conftest.$ac_ext <<EOF
+-#line 3727 "configure"
++#line 4116 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+@@ -3743,12 +4132,20 @@ rm -f conftest*
+ 
+ fi
+ 
++
++CFLAGS="$CFLAGS $MOZ_HARDENING_CFLAGS"
++CPPFLAGS="$CPPFLAGS $MOZ_HARDENING_CFLAGS"
++CXXFLAGS="$CXXFLAGS $MOZ_HARDENING_CFLAGS"
++LDFLAGS="$LDFLAGS $MOZ_HARDENING_LDFLAGS"
++
+ if test "$GNU_CC"; then
+     MMX_FLAGS="-mmmx"
+     SSE_FLAGS="-msse"
+     SSE2_FLAGS="-msse2"
+     SSSE3_FLAGS="-mssse3"
++    # FIXME: Let us build with strict aliasing. bug 414641.
+     CFLAGS="$CFLAGS -fno-strict-aliasing"
++    WARNINGS_AS_ERRORS='-Werror'
+     DSO_CFLAGS=''
+ 
+     if test "$OS_ARCH" != "WINNT" -o -z "$CLANG_CC"; then
+@@ -3757,18 +4154,18 @@ if test "$GNU_CC"; then
+     fi
+ 
+     echo $ac_n "checking for --noexecstack option to as""... $ac_c" 1>&6
+-echo "configure:3761: checking for --noexecstack option to as" >&5
++echo "configure:4158: checking for --noexecstack option to as" >&5
+     _SAVE_CFLAGS=$CFLAGS
+     CFLAGS="$CFLAGS -Wa,--noexecstack"
+     cat > conftest.$ac_ext <<EOF
+-#line 3765 "configure"
++#line 4162 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   echo "$ac_t""yes" 1>&6
+                      ASFLAGS="$ASFLAGS -Wa,--noexecstack"
+@@ -3781,18 +4178,18 @@ fi
+ rm -f conftest*
+     CFLAGS=$_SAVE_CFLAGS
+     echo $ac_n "checking for -z noexecstack option to ld""... $ac_c" 1>&6
+-echo "configure:3785: checking for -z noexecstack option to ld" >&5
++echo "configure:4182: checking for -z noexecstack option to ld" >&5
+     _SAVE_LDFLAGS=$LDFLAGS
+     LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
+     cat > conftest.$ac_ext <<EOF
+-#line 3789 "configure"
++#line 4186 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   echo "$ac_t""yes" 1>&6
+ else
+@@ -3805,18 +4202,18 @@ fi
+ rm -f conftest*
+ 
+     echo $ac_n "checking for -z text option to ld""... $ac_c" 1>&6
+-echo "configure:3809: checking for -z text option to ld" >&5
++echo "configure:4206: checking for -z text option to ld" >&5
+     _SAVE_LDFLAGS=$LDFLAGS
+     LDFLAGS="$LDFLAGS -Wl,-z,text"
+     cat > conftest.$ac_ext <<EOF
+-#line 3813 "configure"
++#line 4210 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   echo "$ac_t""yes" 1>&6
+ else
+@@ -3829,18 +4226,18 @@ fi
+ rm -f conftest*
+ 
+     echo $ac_n "checking for -z relro option to ld""... $ac_c" 1>&6
+-echo "configure:3833: checking for -z relro option to ld" >&5
++echo "configure:4230: checking for -z relro option to ld" >&5
+     _SAVE_LDFLAGS=$LDFLAGS
+     LDFLAGS="$LDFLAGS -Wl,-z,relro"
+     cat > conftest.$ac_ext <<EOF
+-#line 3837 "configure"
++#line 4234 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   echo "$ac_t""yes" 1>&6
+ else
+@@ -3853,18 +4250,18 @@ fi
+ rm -f conftest*
+ 
+     echo $ac_n "checking for -z nocopyreloc option to ld""... $ac_c" 1>&6
+-echo "configure:3857: checking for -z nocopyreloc option to ld" >&5
++echo "configure:4254: checking for -z nocopyreloc option to ld" >&5
+     _SAVE_LDFLAGS=$LDFLAGS
+     LDFLAGS="$LDFLAGS -Wl,-z,nocopyreloc"
+     cat > conftest.$ac_ext <<EOF
+-#line 3861 "configure"
++#line 4258 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   echo "$ac_t""yes" 1>&6
+ else
+@@ -3877,18 +4274,18 @@ fi
+ rm -f conftest*
+ 
+     echo $ac_n "checking for -Bsymbolic-functions option to ld""... $ac_c" 1>&6
+-echo "configure:3881: checking for -Bsymbolic-functions option to ld" >&5
++echo "configure:4278: checking for -Bsymbolic-functions option to ld" >&5
+     _SAVE_LDFLAGS=$LDFLAGS
+     LDFLAGS="$LDFLAGS -Wl,-Bsymbolic-functions"
+     cat > conftest.$ac_ext <<EOF
+-#line 3885 "configure"
++#line 4282 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   echo "$ac_t""yes" 1>&6
+ else
+@@ -3901,18 +4298,18 @@ fi
+ rm -f conftest*
+ 
+     echo $ac_n "checking for --build-id=sha1 option to ld""... $ac_c" 1>&6
+-echo "configure:3905: checking for --build-id=sha1 option to ld" >&5
++echo "configure:4302: checking for --build-id=sha1 option to ld" >&5
+     _SAVE_LDFLAGS=$LDFLAGS
+     LDFLAGS="$LDFLAGS -Wl,--build-id=sha1"
+     cat > conftest.$ac_ext <<EOF
+-#line 3909 "configure"
++#line 4306 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   echo "$ac_t""yes" 1>&6
+ else
+@@ -3925,19 +4322,19 @@ fi
+ rm -f conftest*
+ 
+     echo $ac_n "checking for --ignore-unresolved-symbol option to ld""... $ac_c" 1>&6
+-echo "configure:3929: checking for --ignore-unresolved-symbol option to ld" >&5
++echo "configure:4326: checking for --ignore-unresolved-symbol option to ld" >&5
+     HAVE_LINKER_SUPPORT_IGNORE_UNRESOLVED=
+     _SAVE_LDFLAGS=$LDFLAGS
+     LDFLAGS="$LDFLAGS -Wl,--ignore-unresolved-symbol,environ"
+     cat > conftest.$ac_ext <<EOF
+-#line 3934 "configure"
++#line 4331 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   echo "$ac_t""yes" 1>&6
+                   HAVE_LINKER_SUPPORT_IGNORE_UNRESOLVED=1
+@@ -3952,19 +4349,19 @@ rm -f conftest*
+ 
+     # Check for -mssse3 on $CC
+     echo $ac_n "checking if toolchain supports -mssse3 option""... $ac_c" 1>&6
+-echo "configure:3956: checking if toolchain supports -mssse3 option" >&5
++echo "configure:4353: checking if toolchain supports -mssse3 option" >&5
+     HAVE_TOOLCHAIN_SUPPORT_MSSSE3=
+     _SAVE_CFLAGS=$CFLAGS
+     CFLAGS="$CFLAGS -mssse3"
+     cat > conftest.$ac_ext <<EOF
+-#line 3961 "configure"
++#line 4358 "configure"
+ #include "confdefs.h"
+ asm ("pmaddubsw %xmm2,%xmm3");
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   echo "$ac_t""yes" 1>&6
+                      HAVE_TOOLCHAIN_SUPPORT_MSSSE3=1
+@@ -3979,19 +4376,19 @@ rm -f conftest*
+ 
+     # Check for -msse4.1 on $CC
+     echo $ac_n "checking if toolchain supports -msse4.1 option""... $ac_c" 1>&6
+-echo "configure:3983: checking if toolchain supports -msse4.1 option" >&5
++echo "configure:4380: checking if toolchain supports -msse4.1 option" >&5
+     HAVE_TOOLCHAIN_SUPPORT_MSSE4_1=
+     _SAVE_CFLAGS=$CFLAGS
+     CFLAGS="$CFLAGS -msse4.1"
+     cat > conftest.$ac_ext <<EOF
+-#line 3988 "configure"
++#line 4385 "configure"
+ #include "confdefs.h"
+ asm ("pmulld %xmm6,%xmm0");
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4392: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   echo "$ac_t""yes" 1>&6
+                      HAVE_TOOLCHAIN_SUPPORT_MSSE4_1=1
+@@ -4007,16 +4404,16 @@ rm -f conftest*
+     case "${CPU_ARCH}" in
+     x86 | x86_64)
+       echo $ac_n "checking for x86 AVX2 asm support in compiler""... $ac_c" 1>&6
+-echo "configure:4011: checking for x86 AVX2 asm support in compiler" >&5
++echo "configure:4408: checking for x86 AVX2 asm support in compiler" >&5
+       cat > conftest.$ac_ext <<EOF
+-#line 4013 "configure"
++#line 4410 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ asm volatile ("vpermq      \$0xd8,%ymm0,%ymm0 \n");
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4020: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4417: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   result="yes"
+ else
+@@ -4034,19 +4431,19 @@ rm -f conftest*
+ 
+     ppc*)
+       echo $ac_n "checking whether we can enable AltiVec support""... $ac_c" 1>&6
+-echo "configure:4038: checking whether we can enable AltiVec support" >&5
++echo "configure:4435: checking whether we can enable AltiVec support" >&5
+       HAVE_ALTIVEC=
+       _SAVE_CFLAGS=$CFLAGS
+       CFLAGS="$CFLAGS -maltivec"
+       cat > conftest.$ac_ext <<EOF
+-#line 4043 "configure"
++#line 4440 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   echo "$ac_t""yes" 1>&6
+                        HAVE_ALTIVEC=1
+@@ -4084,14 +4481,26 @@ rm -f conftest*
+     fi
+ 
+     _DEFINES_CFLAGS="-include $_objdir/mozilla-config.h -DMOZILLA_CLIENT"
++    _USE_CPP_INCLUDE_FLAG=1
+ 
+     ASFLAGS="$ASFLAGS $_DEFINES_CFLAGS"
+ fi
+ 
+ if test "$GNU_CXX"; then
++    # FIXME: Let us build with strict aliasing. bug 414641.
+     CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-strict-aliasing"
+ 
+     _DEFINES_CXXFLAGS="-DMOZILLA_CLIENT -include $_objdir/mozilla-config.h"
++    _USE_CPP_INCLUDE_FLAG=1
++fi
++
++# For profiling builds keep the symbol information
++if test "$MOZ_PROFILING" -a -z "$STRIP_FLAGS"; then
++    case "$OS_TARGET" in
++    Linux|DragonFly|FreeBSD|NetBSD|OpenBSD)
++        STRIP_FLAGS="--strip-debug"
++        ;;
++    esac
+ fi
+ 
+ 
+@@ -4105,7 +4514,7 @@ fi
+ case "$host" in
+ *mingw*)
+     if test -n "$_WIN32_MSVC"; then
+-        HOST_CFLAGS="$HOST_CFLAGS"
++        HOST_CFLAGS="$HOST_CFLAGS -nologo"
+     else
+         HOST_CFLAGS="$HOST_CFLAGS -mwindows"
+     fi
+@@ -4150,27 +4559,63 @@ case "$target" in
+     MOZ_OPTIMIZE_FLAGS="-O3"
+     CXXFLAGS="$CXXFLAGS -stdlib=libc++"
+     DSO_LDOPTS=''
+-    # The ExceptionHandling framework is needed for Objective-C exception
+-    # logging code in nsObjCExceptions.h. Currently we only use that in debug
+-    # builds.
+-    MOZ_DEBUG_LDFLAGS="$MOZ_DEBUG_LDFLAGS -framework ExceptionHandling";
++    STRIP_FLAGS="$STRIP_FLAGS -x -S"
++    # Ensure that if we're targeting iOS an SDK was provided.
++    echo $ac_n "checking for iOS target""... $ac_c" 1>&6
++echo "configure:4566: checking for iOS target" >&5
++if eval "test \"`echo '$''{'ac_cv_ios_target'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 4571 "configure"
++#include "confdefs.h"
++#include <TargetConditionals.h>
++#if !(TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
++#error not iOS
++#endif
++int main() {
++
++; return 0; }
++EOF
++if { (eval echo configure:4581: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  rm -rf conftest*
++  ac_cv_ios_target="yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  ac_cv_ios_target="no"
++fi
++rm -f conftest*
++fi
++
++echo "$ac_t""$ac_cv_ios_target" 1>&6
++    if test "$ac_cv_ios_target" = "yes" -a -z $MOZ_IOS; then
++       { echo "configure: error: targeting iOS but not using an iOS SDK?" 1>&2; echo "configure: error: targeting iOS but not using an iOS SDK?" 1>&5; exit 1; }
++    fi
++    if test -z "$MOZ_IOS"; then
++        # The ExceptionHandling framework is needed for Objective-C exception
++        # logging code in nsObjCExceptions.h. Currently we only use that in debug
++        # builds.
++        MOZ_DEBUG_LDFLAGS="$MOZ_DEBUG_LDFLAGS -framework ExceptionHandling";
++    fi
+ 
+             if test "x$enable_dtrace" = "xyes"; then
+         echo "Skipping -dead_strip because DTrace is enabled. See bug 403132."
+     else
+                 echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6
+-echo "configure:4163: checking for -dead_strip option to ld" >&5
++echo "configure:4608: checking for -dead_strip option to ld" >&5
+         _SAVE_LDFLAGS=$LDFLAGS
+         LDFLAGS="$LDFLAGS -Wl,-dead_strip"
+         cat > conftest.$ac_ext <<EOF
+-#line 4167 "configure"
++#line 4612 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ return 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   _HAVE_DEAD_STRIP=1
+ else
+@@ -4194,14 +4639,22 @@ rm -f conftest*
+     ;;
+ 
+ *-android*|*-linuxandroid*)
+-    if test "$COMPILE_ENVIRONMENT" -a -n "$MOZ_MEMORY"; then
++    cat >> confdefs.pytmp <<\EOF
++    (''' NO_PW_GECOS ''', ' 1 ')
++EOF
++cat >> confdefs.h <<\EOF
++#define NO_PW_GECOS 1
++EOF
++
++
++    if test "$COMPILE_ENVIRONMENT"; then
+         MOZ_LINKER=1
+     fi
+ 
+     MOZ_GFX_OPTIMIZE_MOBILE=1
+     if test -z "$CLANG_CC"; then
+         MOZ_OPTIMIZE_FLAGS="-freorder-blocks -fno-reorder-functions -Os"
+-    elif test -n "$RELEASE_OR_BETA"; then
++    else
+         # From https://github.com/android-ndk/ndk/issues/133#issuecomment-308549264
+         # -Oz is smaller than -Os on clang.
+         MOZ_OPTIMIZE_FLAGS="-Oz"
+@@ -4212,14 +4665,14 @@ rm -f conftest*
+             _SAVE_CFLAGS=$CFLAGS
+             CFLAGS="$CFLAGS $DISABLE_OUTLINER"
+             cat > conftest.$ac_ext <<EOF
+-#line 4216 "configure"
++#line 4669 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4223: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   MOZ_OPTIMIZE_FLAGS="$MOZ_OPTIMIZE_FLAGS $DISABLE_OUTLINER"
+ else
+@@ -4233,14 +4686,14 @@ rm -f conftest*
+             _SAVE_LDFLAGS=$LDFLAGS
+             LDFLAGS="$LDFLAGS $MOZ_LTO_LDFLAGS $DISABLE_OUTLINER"
+             cat > conftest.$ac_ext <<EOF
+-#line 4237 "configure"
++#line 4690 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   MOZ_OPTIMIZE_LDFLAGS="$MOZ_OPTIMIZE_LDFLAGS $DISABLE_OUTLINER"
+ else
+@@ -4250,8 +4703,6 @@ fi
+ rm -f conftest*
+             LDFLAGS="$_SAVE_LDFLAGS"
+         fi
+-    else
+-        MOZ_OPTIMIZE_FLAGS="-O2"
+     fi
+     ;;
+ 
+@@ -4281,11 +4732,11 @@ rm -f conftest*
+     # certain versions of cygwin's makedepend barf on the
+     # #include <string> vs -I./dist/include/string issue so don't use it
+     if test -n "$GNU_CC" -o -n "$CLANG_CC"; then
+-        # $GNU_CC will match gcc and clang; while $CLANG_CC will match only clang
+-        if test -z "$CLANG_CC"; then
+-            { echo "configure: error: Firefox cannot be built with mingw-gcc and requires a mingw-clang toolchain to work" 1>&2; echo "configure: error: Firefox cannot be built with mingw-gcc and requires a mingw-clang toolchain to work" 1>&5; exit 1; }
+-        fi
+-
++        CC="$CC -mwindows"
++        CXX="$CXX -mwindows"
++        CPP="$CPP -mwindows"
++        CFLAGS="$CFLAGS -mms-bitfields"
++        CXXFLAGS="$CXXFLAGS -mms-bitfields"
+         DSO_LDOPTS='-shared'
+         # Use temp file for windres (bug 213281)
+         RCFLAGS='-O coff --use-temp-file'
+@@ -4298,13 +4749,24 @@ rm -f conftest*
+         WIN32_CONSOLE_EXE_LDFLAGS=-mconsole
+         WIN32_GUI_EXE_LDFLAGS=-mwindows
+ 
+-        # Silence problematic clang warnings
+-        CXXFLAGS="$CXXFLAGS -Wno-incompatible-ms-struct"
+-        LDFLAGS="$LDFLAGS -Wl,--no-insert-timestamp"
++        if test -z "$CLANG_CC"; then
++            # Use static libgcc and libstdc++
++            LDFLAGS="$LDFLAGS -static"
++
++            # GCC/binutils can't link to a function if we try to include dllexport function
++            # in the same library as dllimport caller. To work around it, we build NSPR
++            # and NSS with -mnop-fun-dllimport flag. The drawback of this solution is that
++            # function thunks need to be generated for cross-DLL calls.
++            MOZ_FOLD_LIBS_FLAGS="-mnop-fun-dllimport"
++        else
++            # Silence problematic clang warnings
++            CXXFLAGS="$CXXFLAGS -Wno-incompatible-ms-struct"
++        fi
+     else
+         TARGET_COMPILER_ABI=msvc
+         RANLIB='echo not_ranlib'
+         STRIP='echo not_strip'
++        PKG_SKIP_STRIP=1
+         # aarch64 doesn't support subsystems below 6.02
+         if test "$CPU_ARCH" = "aarch64"; then
+             WIN32_SUBSYSTEM_VERSION=6.02
+@@ -4314,6 +4776,7 @@ rm -f conftest*
+         WIN32_CONSOLE_EXE_LDFLAGS=-SUBSYSTEM:CONSOLE,$WIN32_SUBSYSTEM_VERSION
+         WIN32_GUI_EXE_LDFLAGS=-SUBSYSTEM:WINDOWS,$WIN32_SUBSYSTEM_VERSION
+         DSO_LDOPTS=-SUBSYSTEM:WINDOWS,$WIN32_SUBSYSTEM_VERSION
++        _USE_CPP_INCLUDE_FLAG=1
+         _DEFINES_CFLAGS="-FI $_objdir/mozilla-config.h -DMOZILLA_CLIENT"
+         _DEFINES_CXXFLAGS="-FI $_objdir/mozilla-config.h -DMOZILLA_CLIENT"
+         CFLAGS="$CFLAGS -W3 -Gy -Zc:inline"
+@@ -4396,10 +4859,6 @@ rm -f conftest*
+             # declare |delete| differently.  Therefore, suppress this
+             # warning.
+             CXXFLAGS="$CXXFLAGS -Wno-implicit-exception-spec-mismatch"
+-            # Macros like STDMETHOD() and IFACEMETHOD() can declare
+-            # __attribute__((nothrow)) on their respective method declarations,
+-            # while the definitions are left without the matching attribute.
+-            CXXFLAGS="$CXXFLAGS -Wno-microsoft-exception-spec"
+             # At least one MSVC header and several headers in-tree have
+             # unused typedefs, so turn this on.
+             CXXFLAGS="$CXXFLAGS -Wno-unused-local-typedef"
+@@ -4415,8 +4874,9 @@ rm -f conftest*
+         fi
+         # Silence VS2017 15.5+ TR1 deprecation warnings hit by older gtest versions
+         CXXFLAGS="$CXXFLAGS -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING"
+-        LIBS="$LIBS user32.lib gdi32.lib winmm.lib wsock32.lib advapi32.lib secur32.lib"
++        LIBS="$LIBS kernel32.lib user32.lib gdi32.lib winmm.lib wsock32.lib advapi32.lib secur32.lib"
+         MOZ_DEBUG_LDFLAGS='-DEBUG'
++        WARNINGS_AS_ERRORS='-WX'
+         # Use a higher optimization level for clang-cl, so we can come closer
+         # to MSVC's performance numbers (see bug 1443590).
+         if test -n "$CLANG_CL"; then
+@@ -4457,12 +4917,20 @@ EOF
+         ;;
+     esac
+ 
++    if test -n "$GNU_CC" -a -z "$CLANG_CC"; then
++        CFLAGS="$CFLAGS -fno-keep-inline-dllexport"
++        CXXFLAGS="$CXXFLAGS -fno-keep-inline-dllexport"
++    fi
++
+     case "$target" in
+     i*86-*)
+         if test -n "$GNU_CC"; then
+             CFLAGS="$CFLAGS -mstackrealign"
+             CXXFLAGS="$CXXFLAGS -mstackrealign"
+             LDFLAGS="$LDFLAGS -Wl,--large-address-aware"
++            if test -z "$CLANG_CC"; then
++                LDFLAGS="$LDFLAGS -Wl,--enable-stdcall-fixup"
++            fi
+         else
+             DSO_LDOPTS="$DSO_LDOPTS -MACHINE:X86"
+             LDFLAGS="$LDFLAGS -SAFESEH"
+@@ -4573,7 +5041,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4577: checking for $ac_word" >&5
++echo "configure:5045: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_XZ'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4607,6 +5075,7 @@ fi
+ if test -z "$COMPILE_ENVIRONMENT"; then
+     SKIP_COMPILER_CHECKS=1
+     SKIP_LIBRARY_CHECKS=1
++    PKG_SKIP_STRIP=1
+     
+ 
+ if test -z "$MOZ_DEBUG" -o -n "$MOZ_ASAN"; then
+@@ -4615,21 +5084,31 @@ fi
+ 
+ 
+ 
++MOZ_DEBUG_ENABLE_DEFS="DEBUG"
++# Check whether --with-debug-label or --without-debug-label was given.
++if test "${with_debug_label+set}" = set; then
++  withval="$with_debug_label"
++   for option in `echo $withval | sed 's/,/ /g'`; do
++    MOZ_DEBUG_ENABLE_DEFS="$MOZ_DEBUG_ENABLE_DEFS DEBUG_${option}"
++done
++fi
++
++
+ if test -n "$MOZ_DEBUG"; then
+     if test -n "$COMPILE_ENVIRONMENT"; then
+         echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6
+-echo "configure:4622: checking for valid debug flags" >&5
++echo "configure:5101: checking for valid debug flags" >&5
+         _SAVE_CFLAGS=$CFLAGS
+         CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS"
+         cat > conftest.$ac_ext <<EOF
+-#line 4626 "configure"
++#line 5105 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int main() {
+ printf("Hello World\n");
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5112: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   _results=yes
+ else
+@@ -4645,8 +5124,15 @@ rm -f conftest*
+         fi
+         CFLAGS=$_SAVE_CFLAGS
+     fi
++
++    MOZ_DEBUG_DEFINES="$MOZ_DEBUG_ENABLE_DEFS"
++else
++    MOZ_DEBUG_DEFINES="NDEBUG TRIMMED"
+ fi
+ 
++
++
++
+ else
+     
+   
+@@ -4657,21 +5143,31 @@ fi
+ 
+ 
+ 
++MOZ_DEBUG_ENABLE_DEFS="DEBUG"
++# Check whether --with-debug-label or --without-debug-label was given.
++if test "${with_debug_label+set}" = set; then
++  withval="$with_debug_label"
++   for option in `echo $withval | sed 's/,/ /g'`; do
++    MOZ_DEBUG_ENABLE_DEFS="$MOZ_DEBUG_ENABLE_DEFS DEBUG_${option}"
++done
++fi
++
++
+ if test -n "$MOZ_DEBUG"; then
+     if test -n "$COMPILE_ENVIRONMENT"; then
+         echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6
+-echo "configure:4664: checking for valid debug flags" >&5
++echo "configure:5160: checking for valid debug flags" >&5
+         _SAVE_CFLAGS=$CFLAGS
+         CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS"
+         cat > conftest.$ac_ext <<EOF
+-#line 4668 "configure"
++#line 5164 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int main() {
+ printf("Hello World\n");
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4675: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   _results=yes
+ else
+@@ -4687,9 +5183,29 @@ rm -f conftest*
+         fi
+         CFLAGS=$_SAVE_CFLAGS
+     fi
++
++    MOZ_DEBUG_DEFINES="$MOZ_DEBUG_ENABLE_DEFS"
++else
++    MOZ_DEBUG_DEFINES="NDEBUG TRIMMED"
+ fi
+ 
++
++
++
+   
++# Check whether --enable-cpp-rtti or --disable-cpp-rtti was given.
++if test "${enable_cpp_rtti+set}" = set; then
++  enableval="$enable_cpp_rtti"
++  if test "$enableval" = "yes"; then
++     _MOZ_USE_RTTI=1 
++  elif test "$enableval" = "no"; then
++     _MOZ_USE_RTTI= 
++  else
++    { echo "configure: error: Option, cpp-rtti, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, cpp-rtti, does not take an argument ($enableval)." 1>&5; exit 1; }
++  fi
++fi
++
++
+ if test -z "$_MOZ_USE_RTTI"; then
+     if test "$GNU_CC"; then
+         CXXFLAGS="$CXXFLAGS -fno-rtti"
+@@ -4702,7 +5218,11 @@ if test -z "$_MOZ_USE_RTTI"; then
+ fi
+ 
+ if test "$CLANG_CXX"; then
+-    _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wno-unknown-warning-option"
++    ## We disable return-type-c-linkage because jsval is defined as a C++ type but is
++    ## returned by C functions. This is possible because we use knowledge about the ABI
++    ## to typedef it to a C type with the same layout when the headers are included
++    ## from C.
++    _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wno-unknown-warning-option -Wno-return-type-c-linkage"
+ fi
+ 
+ if test "$GNU_CC"; then
+@@ -4711,14 +5231,33 @@ if test "$GNU_CC"; then
+         CXXFLAGS="$CXXFLAGS -ffunction-sections -fdata-sections"
+     fi
+ 
++    # For MinGW, we need big-obj otherwise we create too many sections in Unified builds
++    if test "${OS_ARCH}" = "WINNT"; then
++        CFLAGS="$CFLAGS -Wa,-mbig-obj"
++        CXXFLAGS="$CXXFLAGS -Wa,-mbig-obj"
++    fi
++
+     CFLAGS="$CFLAGS -fno-math-errno"
+     CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-math-errno"
+ fi
+ 
+ 
++# Check whether --enable-icf or --disable-icf was given.
++if test "${enable_icf+set}" = set; then
++  enableval="$enable_icf"
++  if test "$enableval" = "no"; then
++    MOZ_DISABLE_ICF=1
++  elif test "$enableval" = "yes"; then
++    MOZ_DISABLE_ICF= 
++  else
++    { echo "configure: error: Option, icf, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, icf, does not take an argument ($enableval)." 1>&5; exit 1; }
++  fi
++fi
++
++
+ if test "$GNU_CC" -a "$GCC_USE_GNU_LD" -a -z "$MOZ_DISABLE_ICF" -a -z "$DEVELOPER_OPTIONS"; then
+     echo $ac_n "checking whether the linker supports Identical Code Folding""... $ac_c" 1>&6
+-echo "configure:4722: checking whether the linker supports Identical Code Folding" >&5
++echo "configure:5261: checking whether the linker supports Identical Code Folding" >&5
+ if eval "test \"`echo '$''{'LD_SUPPORTS_ICF'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4727,7 +5266,7 @@ else
+               'int main() {return foo() - bar();}' > conftest.${ac_ext}
+         # If the linker supports ICF, foo and bar symbols will have
+         # the same address
+-        if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS -Wl,--icf=safe -ffunction-sections conftest.${ac_ext} $LIBS 1>&2'; { (eval echo configure:4731: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } &&
++        if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS -Wl,--icf=safe -ffunction-sections conftest.${ac_ext} $LIBS 1>&2'; { (eval echo configure:5270: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } &&
+            test -s conftest${ac_exeext} &&
+            $LLVM_OBJDUMP -t conftest${ac_exeext} | awk '{a[$6] = $1} END {if (a["foo"] && (a["foo"] != a["bar"])) { exit 1 }}'; then
+             LD_SUPPORTS_ICF=yes
+@@ -4742,14 +5281,14 @@ echo "$ac_t""$LD_SUPPORTS_ICF" 1>&6
+         _SAVE_LDFLAGS="$LDFLAGS -Wl,--icf=safe"
+         LDFLAGS="$LDFLAGS -Wl,--icf=safe -Wl,--print-icf-sections"
+         cat > conftest.$ac_ext <<EOF
+-#line 4746 "configure"
++#line 5285 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   LD_PRINT_ICF_SECTIONS=-Wl,--print-icf-sections
+ else
+@@ -4768,18 +5307,18 @@ fi
+ if test "$GNU_CC" -a "$GCC_USE_GNU_LD" -a -z "$DEVELOPER_OPTIONS"; then
+     if test -n "$MOZ_DEBUG_FLAGS"; then
+                 echo $ac_n "checking whether removing dead symbols breaks debugging""... $ac_c" 1>&6
+-echo "configure:4772: checking whether removing dead symbols breaks debugging" >&5
++echo "configure:5311: checking whether removing dead symbols breaks debugging" >&5
+ if eval "test \"`echo '$''{'GC_SECTIONS_BREAKS_DEBUG_RANGES'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   echo 'int foo() {return 42;}' \
+                   'int bar() {return 1;}' \
+                   'int main() {return foo();}' > conftest.${ac_ext}
+-            if { ac_try='${CC-cc} -o conftest.${ac_objext} $CFLAGS $MOZ_DEBUG_FLAGS -c conftest.${ac_ext} 1>&2'; { (eval echo configure:4779: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } &&
+-                { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS $MOZ_DEBUG_FLAGS -Wl,--gc-sections conftest.${ac_objext} $LIBS 1>&2'; { (eval echo configure:4780: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } &&
++            if { ac_try='${CC-cc} -o conftest.${ac_objext} $CFLAGS $MOZ_DEBUG_FLAGS -c conftest.${ac_ext} 1>&2'; { (eval echo configure:5318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } &&
++                { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS $MOZ_DEBUG_FLAGS -Wl,--gc-sections conftest.${ac_objext} $LIBS 1>&2'; { (eval echo configure:5319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } &&
+                 test -s conftest${ac_exeext} -a -s conftest.${ac_objext}; then
+-                 if test "`$PYTHON3 -m mozbuild.configure.check_debug_ranges conftest.${ac_objext} conftest.${ac_ext}`" = \
+-                         "`$PYTHON3 -m mozbuild.configure.check_debug_ranges conftest${ac_exeext} conftest.${ac_ext}`"; then
++                 if test "`$PYTHON -m mozbuild.configure.check_debug_ranges conftest.${ac_objext} conftest.${ac_ext}`" = \
++                         "`$PYTHON -m mozbuild.configure.check_debug_ranges conftest${ac_exeext} conftest.${ac_ext}`"; then
+                      GC_SECTIONS_BREAKS_DEBUG_RANGES=no
+                  else
+                      GC_SECTIONS_BREAKS_DEBUG_RANGES=yes
+@@ -4818,12 +5357,12 @@ fi # COMPILE_ENVIRONMENT
+ 
+ if test -z "$SKIP_COMPILER_CHECKS"; then
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:4822: checking for working const" >&5
++echo "configure:5361: checking for working const" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4827 "configure"
++#line 5366 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -4872,7 +5411,7 @@ ccp = (char const *const *) p;
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5415: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_const=yes
+ else
+@@ -4898,12 +5437,12 @@ fi
+ 
+ 
+ echo $ac_n "checking for mode_t""... $ac_c" 1>&6
+-echo "configure:4902: checking for mode_t" >&5
++echo "configure:5441: checking for mode_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4907 "configure"
++#line 5446 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -4936,12 +5475,12 @@ fi
+ 
+ 
+ echo $ac_n "checking for off_t""... $ac_c" 1>&6
+-echo "configure:4940: checking for off_t" >&5
++echo "configure:5479: checking for off_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4945 "configure"
++#line 5484 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -4974,12 +5513,12 @@ fi
+ 
+ 
+ echo $ac_n "checking for pid_t""... $ac_c" 1>&6
+-echo "configure:4978: checking for pid_t" >&5
++echo "configure:5517: checking for pid_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4983 "configure"
++#line 5522 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -5012,12 +5551,12 @@ fi
+ 
+ 
+ echo $ac_n "checking for size_t""... $ac_c" 1>&6
+-echo "configure:5016: checking for size_t" >&5
++echo "configure:5555: checking for size_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5021 "configure"
++#line 5560 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -5096,7 +5635,7 @@ fi
+ 
+ if test "$GNU_CXX"; then
+     echo $ac_n "checking whether 64-bits std::atomic requires -latomic""... $ac_c" 1>&6
+-echo "configure:5100: checking whether 64-bits std::atomic requires -latomic" >&5
++echo "configure:5639: checking whether 64-bits std::atomic requires -latomic" >&5
+ if eval "test \"`echo '$''{'ac_cv_needs_atomic'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5104,7 +5643,7 @@ else
+             ac_cv_needs_atomic=yes
+         else
+             cat > conftest.$ac_ext <<EOF
+-#line 5108 "configure"
++#line 5647 "configure"
+ #include "confdefs.h"
+ #include <cstdint>
+                  #include <atomic>
+@@ -5112,7 +5651,7 @@ int main() {
+  std::atomic<uint64_t> foo; foo = 1; 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_needs_atomic=no
+ else
+@@ -5122,7 +5661,7 @@ else
+   _SAVE_LIBS="$LIBS"
+                 LIBS="$LIBS -latomic"
+                 cat > conftest.$ac_ext <<EOF
+-#line 5126 "configure"
++#line 5665 "configure"
+ #include "confdefs.h"
+ #include <cstdint>
+                      #include <atomic>
+@@ -5130,7 +5669,7 @@ int main() {
+  std::atomic<uint64_t> foo; foo = 1; 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_needs_atomic=yes
+ else
+@@ -5199,12 +5738,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/di
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
+-echo "configure:5203: checking for $ac_hdr that defines DIR" >&5
++echo "configure:5742: checking for $ac_hdr that defines DIR" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5208 "configure"
++#line 5747 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -5212,7 +5751,7 @@ int main() {
+ DIR *dirp = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "ac_cv_header_dirent_$ac_safe=yes"
+ else
+@@ -5240,7 +5779,7 @@ done
+ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+ if test $ac_header_dirent = dirent.h; then
+ echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
+-echo "configure:5244: checking for opendir in -ldir" >&5
++echo "configure:5783: checking for opendir in -ldir" >&5
+ ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5248,7 +5787,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldir  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5252 "configure"
++#line 5791 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5259,7 +5798,7 @@ int main() {
+ opendir()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5281,7 +5820,7 @@ fi
+ 
+ else
+ echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
+-echo "configure:5285: checking for opendir in -lx" >&5
++echo "configure:5824: checking for opendir in -lx" >&5
+ ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5289,7 +5828,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lx  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5293 "configure"
++#line 5832 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5300,7 +5839,7 @@ int main() {
+ opendir()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5330,12 +5869,12 @@ bitrig*|dragonfly*|freebsd*|openbsd*)
+ esac
+ 
+ echo $ac_n "checking for sockaddr_in.sin_len""... $ac_c" 1>&6
+-echo "configure:5334: checking for sockaddr_in.sin_len" >&5
++echo "configure:5873: checking for sockaddr_in.sin_len" >&5
+ if eval "test \"`echo '$''{'ac_cv_sockaddr_in_sin_len'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5339 "configure"
++#line 5878 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_SYS_TYPES_H
+                                     #include <sys/types.h>
+@@ -5347,7 +5886,7 @@ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5890: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_sockaddr_in_sin_len=true
+ else
+@@ -5378,12 +5917,12 @@ EOF
+ fi
+ 
+ echo $ac_n "checking for sockaddr_in6.sin6_len""... $ac_c" 1>&6
+-echo "configure:5382: checking for sockaddr_in6.sin6_len" >&5
++echo "configure:5921: checking for sockaddr_in6.sin6_len" >&5
+ if eval "test \"`echo '$''{'ac_cv_sockaddr_in6_sin6_len'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5387 "configure"
++#line 5926 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_SYS_TYPES_H
+                                 #include <sys/types.h>
+@@ -5395,7 +5934,7 @@ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5938: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_sockaddr_in6_sin6_len=true
+ else
+@@ -5419,12 +5958,12 @@ EOF
+ fi
+ 
+ echo $ac_n "checking for sockaddr.sa_len""... $ac_c" 1>&6
+-echo "configure:5423: checking for sockaddr.sa_len" >&5
++echo "configure:5962: checking for sockaddr.sa_len" >&5
+ if eval "test \"`echo '$''{'ac_cv_sockaddr_sa_len'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5428 "configure"
++#line 5967 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_SYS_TYPES_H
+                                 #include <sys/types.h>
+@@ -5436,7 +5975,7 @@ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5440: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_sockaddr_sa_len=true
+ else
+@@ -5459,8 +5998,70 @@ EOF
+ 
+ fi
+ 
++# Check whether --enable-dtrace or --disable-dtrace was given.
++if test "${enable_dtrace+set}" = set; then
++  enableval="$enable_dtrace"
++  if test "$enableval" = "yes"; then
++    enable_dtrace="yes"
++  elif test "$enableval" = "no"; then
++    :
++  else
++    { echo "configure: error: Option, dtrace, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, dtrace, does not take an argument ($enableval)." 1>&5; exit 1; }
++  fi
++fi
++
++if test "x$enable_dtrace" = "xyes"; then
++     ac_safe=`echo "sys/sdt.h" | sed 'y%./+-%__p_%'`
++  echo $ac_n "checking for sys/sdt.h""... $ac_c" 1>&6
++echo "configure:6017: checking for sys/sdt.h" >&5
++  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++   cat > conftest.$ac_ext <<EOF
++#line 6022 "configure"
++#include "confdefs.h"
++
++#include <sys/sdt.h>
++int main() {
++
++; return 0; }
++EOF
++if { (eval echo configure:6030: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest* 
++fi
++
++  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++    echo "$ac_t""yes" 1>&6
++    HAVE_DTRACE=1
++  else
++    echo "$ac_t""no" 1>&6
++    
++  fi
++
++  if test -n "$HAVE_DTRACE"; then
++      cat >> confdefs.pytmp <<\EOF
++    (''' INCLUDE_MOZILLA_DTRACE ''', ' 1 ')
++EOF
++cat >> confdefs.h <<\EOF
++#define INCLUDE_MOZILLA_DTRACE 1
++EOF
++
++  else
++      { echo "configure: error: dtrace enabled but sys/sdt.h not found" 1>&2; echo "configure: error: dtrace enabled but sys/sdt.h not found" 1>&5; exit 1; };
++  fi
++fi
++
++
+ echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6
+-echo "configure:5464: checking for gethostbyname_r in -lc_r" >&5
++echo "configure:6065: checking for gethostbyname_r in -lc_r" >&5
+ ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5468,7 +6069,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lc_r  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5472 "configure"
++#line 6073 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5479,7 +6080,7 @@ int main() {
+ gethostbyname_r()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5516,14 +6117,14 @@ case $target in
+ *)
+     
+ echo $ac_n "checking for library containing dlopen""... $ac_c" 1>&6
+-echo "configure:5520: checking for library containing dlopen" >&5
++echo "configure:6121: checking for library containing dlopen" >&5
+ if eval "test \"`echo '$''{'ac_cv_search_dlopen'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_func_search_save_LIBS="$LIBS"
+ ac_cv_search_dlopen="no"
+ cat > conftest.$ac_ext <<EOF
+-#line 5527 "configure"
++#line 6128 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5534,7 +6135,7 @@ int main() {
+ dlopen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_search_dlopen="none required"
+ else
+@@ -5545,7 +6146,7 @@ rm -f conftest*
+ test "$ac_cv_search_dlopen" = "no" && for i in dl; do
+ LIBS="-l$i  $ac_func_search_save_LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5549 "configure"
++#line 6150 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5556,7 +6157,7 @@ int main() {
+ dlopen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_search_dlopen="-l$i"
+ break
+@@ -5574,12 +6175,12 @@ if test "$ac_cv_search_dlopen" != "no";
+   test "$ac_cv_search_dlopen" = "none required" || LIBS="$ac_cv_search_dlopen $LIBS"
+      ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
+   echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
+-echo "configure:5578: checking for dlfcn.h" >&5
++echo "configure:6179: checking for dlfcn.h" >&5
+   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+    cat > conftest.$ac_ext <<EOF
+-#line 5583 "configure"
++#line 6184 "configure"
+ #include "confdefs.h"
+ 
+ #include <dlfcn.h>
+@@ -5587,7 +6188,7 @@ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+@@ -5624,12 +6225,12 @@ CFLAGS="$CFLAGS -D_GNU_SOURCE"
+ for ac_func in dladdr memmem
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5628: checking for $ac_func" >&5
++echo "configure:6229: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5633 "configure"
++#line 6234 "configure"
+ #define $ac_func innocuous_$ac_func
+ #include "confdefs.h"
+ #undef $ac_func
+@@ -5656,7 +6257,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -5687,7 +6288,7 @@ CFLAGS="$_SAVE_CFLAGS"
+ 
+ if test ! "$GNU_CXX"; then
+     echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6
+-echo "configure:5691: checking for demangle in -lC" >&5
++echo "configure:6292: checking for demangle in -lC" >&5
+ ac_lib_var=`echo C'_'demangle | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5695,7 +6296,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lC  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5699 "configure"
++#line 6300 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5706,7 +6307,7 @@ int main() {
+ demangle()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5739,7 +6340,7 @@ fi
+ fi
+ 
+ echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
+-echo "configure:5743: checking for socket in -lsocket" >&5
++echo "configure:6344: checking for socket in -lsocket" >&5
+ ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5747,7 +6348,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsocket  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5751 "configure"
++#line 6352 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5758,7 +6359,7 @@ int main() {
+ socket()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5804,7 +6405,7 @@ EOF
+     _SAVE_LIBS="$LIBS"
+     LDFLAGS="$XLDFLAGS $LDFLAGS"
+     echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6
+-echo "configure:5808: checking for XDrawLines in -lX11" >&5
++echo "configure:6409: checking for XDrawLines in -lX11" >&5
+ ac_lib_var=`echo X11'_'XDrawLines | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5812,7 +6413,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lX11 $XLIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5816 "configure"
++#line 6417 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5823,7 +6424,7 @@ int main() {
+ XDrawLines()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5845,7 +6446,7 @@ MISSING_X="$MISSING_X -lX11"
+ fi
+ 
+     echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6
+-echo "configure:5849: checking for XextAddDisplay in -lXext" >&5
++echo "configure:6450: checking for XextAddDisplay in -lXext" >&5
+ ac_lib_var=`echo Xext'_'XextAddDisplay | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5853,7 +6454,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXext $XLIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5857 "configure"
++#line 6458 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5864,7 +6465,7 @@ int main() {
+ XextAddDisplay()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5887,7 +6488,7 @@ fi
+ 
+ 
+     echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6
+-echo "configure:5891: checking for XtFree in -lXt" >&5
++echo "configure:6492: checking for XtFree in -lXt" >&5
+ ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5895,7 +6496,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXt  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5899 "configure"
++#line 6500 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5906,7 +6507,7 @@ int main() {
+ XtFree()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5927,7 +6528,7 @@ else
+ 
+         unset ac_cv_lib_Xt_XtFree
+         echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6
+-echo "configure:5931: checking for IceFlush in -lICE" >&5
++echo "configure:6532: checking for IceFlush in -lICE" >&5
+ ac_lib_var=`echo ICE'_'IceFlush | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5935,7 +6536,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lICE $XT_LIBS $XLIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5939 "configure"
++#line 6540 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5946,7 +6547,7 @@ int main() {
+ IceFlush()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5967,7 +6568,7 @@ else
+ fi
+ 
+         echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6
+-echo "configure:5971: checking for SmcCloseConnection in -lSM" >&5
++echo "configure:6572: checking for SmcCloseConnection in -lSM" >&5
+ ac_lib_var=`echo SM'_'SmcCloseConnection | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5975,7 +6576,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lSM $XT_LIBS $XLIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5979 "configure"
++#line 6580 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5986,7 +6587,7 @@ int main() {
+ SmcCloseConnection()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6007,7 +6608,7 @@ else
+ fi
+ 
+         echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6
+-echo "configure:6011: checking for XtFree in -lXt" >&5
++echo "configure:6612: checking for XtFree in -lXt" >&5
+ ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6015,7 +6616,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXt $X_PRE_LIBS $XT_LIBS $XLIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6019 "configure"
++#line 6620 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6026,7 +6627,7 @@ int main() {
+ XtFree()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6052,7 +6653,7 @@ fi
+ 
+ 
+                 echo $ac_n "checking for xcb_connect in -lxcb""... $ac_c" 1>&6
+-echo "configure:6056: checking for xcb_connect in -lxcb" >&5
++echo "configure:6657: checking for xcb_connect in -lxcb" >&5
+ ac_lib_var=`echo xcb'_'xcb_connect | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6060,7 +6661,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lxcb $XLIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6064 "configure"
++#line 6665 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6071,7 +6672,7 @@ int main() {
+ xcb_connect()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6093,7 +6694,7 @@ MISSING_X="$MISSING_X -lxcb"
+ fi
+ 
+     echo $ac_n "checking for xcb_shm_query_version in -lxcb-shm""... $ac_c" 1>&6
+-echo "configure:6097: checking for xcb_shm_query_version in -lxcb-shm" >&5
++echo "configure:6698: checking for xcb_shm_query_version in -lxcb-shm" >&5
+ ac_lib_var=`echo xcb-shm'_'xcb_shm_query_version | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6101,7 +6702,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lxcb-shm $XLIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6105 "configure"
++#line 6706 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6112,7 +6713,7 @@ int main() {
+ xcb_shm_query_version()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6134,7 +6735,7 @@ MISSING_X="$MISSING_X -lxcb-shm"
+ fi
+ 
+     echo $ac_n "checking for XGetXCBConnection in -lX11-xcb""... $ac_c" 1>&6
+-echo "configure:6138: checking for XGetXCBConnection in -lX11-xcb" >&5
++echo "configure:6739: checking for XGetXCBConnection in -lX11-xcb" >&5
+ ac_lib_var=`echo X11-xcb'_'XGetXCBConnection | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6142,7 +6743,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lX11-xcb $XLIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6146 "configure"
++#line 6747 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6153,7 +6754,7 @@ int main() {
+ XGetXCBConnection()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6191,7 +6792,7 @@ darwin*)
+     ;;
+ *)
+     echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
+-echo "configure:6195: checking for pthread_create in -lpthreads" >&5
++echo "configure:6796: checking for pthread_create in -lpthreads" >&5
+ ac_lib_var=`echo pthreads'_'pthread_create | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6199,7 +6800,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpthreads  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6203 "configure"
++#line 6804 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6210,7 +6811,7 @@ int main() {
+ pthread_create()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6229,7 +6830,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
+-echo "configure:6233: checking for pthread_create in -lpthread" >&5
++echo "configure:6834: checking for pthread_create in -lpthread" >&5
+ ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6237,7 +6838,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpthread  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6241 "configure"
++#line 6842 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6248,7 +6849,7 @@ int main() {
+ pthread_create()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6267,7 +6868,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
+-echo "configure:6271: checking for pthread_create in -lc_r" >&5
++echo "configure:6872: checking for pthread_create in -lc_r" >&5
+ ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6275,7 +6876,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lc_r  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6279 "configure"
++#line 6880 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6286,7 +6887,7 @@ int main() {
+ pthread_create()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6305,7 +6906,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
+-echo "configure:6309: checking for pthread_create in -lc" >&5
++echo "configure:6910: checking for pthread_create in -lc" >&5
+ ac_lib_var=`echo c'_'pthread_create | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6313,7 +6914,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lc  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6317 "configure"
++#line 6918 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6324,7 +6925,7 @@ int main() {
+ pthread_create()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6362,7 +6963,7 @@ then
+                 rm -f conftest*
+     ac_cv_have_dash_pthread=no
+     echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6
+-echo "configure:6366: checking whether ${CC-cc} accepts -pthread" >&5
++echo "configure:6967: checking whether ${CC-cc} accepts -pthread" >&5
+     echo 'int main() { return 0; }' | cat > conftest.c
+     ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1
+     if test $? -eq 0; then
+@@ -6385,7 +6986,7 @@ echo "configure:6366: checking whether $
+                 ac_cv_have_dash_pthreads=no
+     if test "$ac_cv_have_dash_pthread" = "no"; then
+         echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6
+-echo "configure:6389: checking whether ${CC-cc} accepts -pthreads" >&5
++echo "configure:6990: checking whether ${CC-cc} accepts -pthreads" >&5
+         echo 'int main() { return 0; }' | cat > conftest.c
+         ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1
+         if test $? -eq 0; then
+@@ -6457,12 +7058,12 @@ EOF
+   do
+        ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:6461: checking for $ac_hdr" >&5
++echo "configure:7062: checking for $ac_hdr" >&5
+   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+    cat > conftest.$ac_ext <<EOF
+-#line 6466 "configure"
++#line 7067 "configure"
+ #include "confdefs.h"
+ 
+ #include <$ac_hdr>
+@@ -6470,7 +7071,7 @@ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7075: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+@@ -6505,12 +7106,12 @@ fi
+ for ac_func in stat64 lstat64 truncate64 statvfs64 statvfs statfs64 statfs getpagesize gmtime_r localtime_r arc4random arc4random_buf mallinfo gettid lchown setpriority strerror syscall
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6509: checking for $ac_func" >&5
++echo "configure:7110: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6514 "configure"
++#line 7115 "configure"
+ #define $ac_func innocuous_$ac_func
+ #include "confdefs.h"
+ #undef $ac_func
+@@ -6537,7 +7138,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -6566,7 +7167,7 @@ done
+ 
+ 
+ echo $ac_n "checking for clock_gettime(CLOCK_MONOTONIC)""... $ac_c" 1>&6
+-echo "configure:6570: checking for clock_gettime(CLOCK_MONOTONIC)" >&5
++echo "configure:7171: checking for clock_gettime(CLOCK_MONOTONIC)" >&5
+ if eval "test \"`echo '$''{'ac_cv_clock_monotonic'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6576,7 +7177,7 @@ else
+                     LIBS="$LIBS $libs"
+                     CFLAGS="$CFLAGS $DSO_PIC_CFLAGS"
+                     cat > conftest.$ac_ext <<EOF
+-#line 6580 "configure"
++#line 7181 "configure"
+ #include "confdefs.h"
+ #define availability(os, ...) availability(os, strict, __VA_ARGS)
+                                  #include <time.h>
+@@ -6585,11 +7186,10 @@ int main() {
+                                    clock_gettime(CLOCK_MONOTONIC, &ts); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_clock_monotonic=$libs
+                                  LIBS="$_SAVE_LIBS"
+-                                 CFLAGS="$_SAVE_CFLAGS"
+                                  break
+ else
+   echo "configure: failed program was:" >&5
+@@ -6621,19 +7221,19 @@ fi
+ _SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $WARNINGS_AS_ERRORS"
+ echo $ac_n "checking for pthread_cond_timedwait_monotonic_np""... $ac_c" 1>&6
+-echo "configure:6625: checking for pthread_cond_timedwait_monotonic_np" >&5
++echo "configure:7225: checking for pthread_cond_timedwait_monotonic_np" >&5
+ if eval "test \"`echo '$''{'ac_cv_pthread_cond_timedwait_monotonic_np'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6630 "configure"
++#line 7230 "configure"
+ #include "confdefs.h"
+ #include <pthread.h>
+ int main() {
+ pthread_cond_timedwait_monotonic_np(0, 0, 0);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_pthread_cond_timewait_monotonic_np=yes
+ else
+@@ -6658,7 +7258,7 @@ fi
+ CFLAGS=$_SAVE_CFLAGS
+ 
+ echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6
+-echo "configure:6662: checking for res_ninit()" >&5
++echo "configure:7262: checking for res_ninit()" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_res_ninit'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6666,7 +7266,7 @@ else
+                 ac_cv_func_res_ninit=no
+      else
+         cat > conftest.$ac_ext <<EOF
+-#line 6670 "configure"
++#line 7270 "configure"
+ #include "confdefs.h"
+ 
+             #ifdef linux
+@@ -6681,7 +7281,7 @@ int main() {
+ int foo = res_ninit(&_res);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_func_res_ninit=yes
+ else
+@@ -6720,12 +7320,12 @@ fi
+ 
+ 
+ echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6
+-echo "configure:6724: checking for an implementation of va_copy()" >&5
++echo "configure:7324: checking for an implementation of va_copy()" >&5
+ if eval "test \"`echo '$''{'ac_cv_va_copy'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6729 "configure"
++#line 7329 "configure"
+ #include "confdefs.h"
+ #include <stdarg.h>
+                      #include <stdlib.h>
+@@ -6741,7 +7341,7 @@ int main() {
+ f(0, 42); return 0
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_va_copy=yes
+ else
+@@ -6757,12 +7357,12 @@ fi
+ 
+ echo "$ac_t""$ac_cv_va_copy" 1>&6
+ echo $ac_n "checking whether va_list can be copied by value""... $ac_c" 1>&6
+-echo "configure:6761: checking whether va_list can be copied by value" >&5
++echo "configure:7361: checking whether va_list can be copied by value" >&5
+ if eval "test \"`echo '$''{'ac_cv_va_val_copy'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6766 "configure"
++#line 7366 "configure"
+ #include "confdefs.h"
+ #include <stdarg.h>
+                      #include <stdlib.h>
+@@ -6778,7 +7378,7 @@ int main() {
+ f(0, 42); return 0
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_va_val_copy=yes
+ else
+@@ -6835,12 +7435,12 @@ ARM_ABI_PREFIX=
+ if test "$GNU_CC"; then
+   if test "$CPU_ARCH" = "arm" ; then
+     echo $ac_n "checking for ARM EABI""... $ac_c" 1>&6
+-echo "configure:6839: checking for ARM EABI" >&5
++echo "configure:7439: checking for ARM EABI" >&5
+ if eval "test \"`echo '$''{'ac_cv_gcc_arm_eabi'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6844 "configure"
++#line 7444 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -6853,7 +7453,7 @@ int main() {
+                         
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_gcc_arm_eabi="yes"
+ else
+@@ -6884,19 +7484,19 @@ fi
+ _SAVE_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS $DSO_PIC_CFLAGS $DSO_LDOPTS $MOZ_OPTIMIZE_LDFLAGS"
+ echo $ac_n "checking for __thread keyword for TLS variables""... $ac_c" 1>&6
+-echo "configure:6888: checking for __thread keyword for TLS variables" >&5
++echo "configure:7488: checking for __thread keyword for TLS variables" >&5
+ if eval "test \"`echo '$''{'ac_cv_thread_keyword'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6893 "configure"
++#line 7493 "configure"
+ #include "confdefs.h"
+ __thread bool tlsIsMainThread = false;
+ int main() {
+ return tlsIsMainThread;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_thread_keyword=yes
+ else
+@@ -6966,12 +7566,12 @@ fi
+ for ac_func in localeconv
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6970: checking for $ac_func" >&5
++echo "configure:7570: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6975 "configure"
++#line 7575 "configure"
+ #define $ac_func innocuous_$ac_func
+ #include "confdefs.h"
+ #undef $ac_func
+@@ -6998,7 +7598,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -7040,12 +7640,12 @@ MALLOC_H=
+ for file in $MALLOC_HEADERS; do
+      ac_safe=`echo "$file" | sed 'y%./+-%__p_%'`
+   echo $ac_n "checking for $file""... $ac_c" 1>&6
+-echo "configure:7044: checking for $file" >&5
++echo "configure:7644: checking for $file" >&5
+   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+    cat > conftest.$ac_ext <<EOF
+-#line 7049 "configure"
++#line 7649 "configure"
+ #include "confdefs.h"
+ 
+ #include <$file>
+@@ -7053,7 +7653,7 @@ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7657: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+@@ -7088,12 +7688,12 @@ done
+ for ac_func in strndup posix_memalign memalign
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:7092: checking for $ac_func" >&5
++echo "configure:7692: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7097 "configure"
++#line 7697 "configure"
+ #define $ac_func innocuous_$ac_func
+ #include "confdefs.h"
+ #undef $ac_func
+@@ -7120,7 +7720,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -7151,12 +7751,12 @@ done
+ for ac_func in malloc_usable_size
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:7155: checking for $ac_func" >&5
++echo "configure:7755: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7160 "configure"
++#line 7760 "configure"
+ #define $ac_func innocuous_$ac_func
+ #include "confdefs.h"
+ #undef $ac_func
+@@ -7183,7 +7783,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -7213,9 +7813,9 @@ done
+ MALLOC_USABLE_SIZE_CONST_PTR=const
+ if test -n "$HAVE_MALLOC_H"; then
+   echo $ac_n "checking whether malloc_usable_size definition can use const argument""... $ac_c" 1>&6
+-echo "configure:7217: checking whether malloc_usable_size definition can use const argument" >&5
++echo "configure:7817: checking whether malloc_usable_size definition can use const argument" >&5
+   cat > conftest.$ac_ext <<EOF
+-#line 7219 "configure"
++#line 7819 "configure"
+ #include "confdefs.h"
+ #include <malloc.h>
+                   #include <stddef.h>
+@@ -7224,7 +7824,7 @@ int main() {
+ return malloc_usable_size(0);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7228: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   echo "$ac_t""yes" 1>&6
+ else
+@@ -7246,9 +7846,9 @@ EOF
+ 
+ 
+ echo $ac_n "checking for valloc in malloc.h""... $ac_c" 1>&6
+-echo "configure:7250: checking for valloc in malloc.h" >&5
++echo "configure:7850: checking for valloc in malloc.h" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 7252 "configure"
++#line 7852 "configure"
+ #include "confdefs.h"
+ #include <malloc.h>
+ EOF
+@@ -7271,9 +7871,9 @@ rm -f conftest*
+ 
+ 
+ echo $ac_n "checking for valloc in unistd.h""... $ac_c" 1>&6
+-echo "configure:7275: checking for valloc in unistd.h" >&5
++echo "configure:7875: checking for valloc in unistd.h" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 7277 "configure"
++#line 7877 "configure"
+ #include "confdefs.h"
+ #include <unistd.h>
+ EOF
+@@ -7296,9 +7896,9 @@ rm -f conftest*
+ 
+ 
+ echo $ac_n "checking for _aligned_malloc in malloc.h""... $ac_c" 1>&6
+-echo "configure:7300: checking for _aligned_malloc in malloc.h" >&5
++echo "configure:7900: checking for _aligned_malloc in malloc.h" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 7302 "configure"
++#line 7902 "configure"
+ #include "confdefs.h"
+ #include <malloc.h>
+ EOF
+@@ -7364,6 +7964,391 @@ fi # SKIP_COMPILER_CHECKS
+ 
+ # External Packages
+ 
++case "$OS_TARGET" in
++WINNT|Darwin|Android)
++  MOZ_FOLD_LIBS=1
++  ;;
++*)
++  MOZ_FOLD_LIBS=
++  ;;
++esac
++
++
++
++
++
++
++# Check whether --with-nspr-cflags or --without-nspr-cflags was given.
++if test "${with_nspr_cflags+set}" = set; then
++  withval="$with_nspr_cflags"
++  NSPR_CFLAGS=$withval
++fi
++
++# Check whether --with-nspr-libs or --without-nspr-libs was given.
++if test "${with_nspr_libs+set}" = set; then
++  withval="$with_nspr_libs"
++  NSPR_LIBS=$withval
++fi
++
++
++
++    # Check whether --enable-nspr-build or --disable-nspr-build was given.
++if test "${enable_nspr_build+set}" = set; then
++  enableval="$enable_nspr_build"
++  if test "$enableval" = "yes"; then
++    MOZ_BUILD_NSPR=1
++  elif test "$enableval" = "no"; then
++    MOZ_BUILD_NSPR=
++  else
++    { echo "configure: error: Option, nspr-build, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, nspr-build, does not take an argument ($enableval)." 1>&5; exit 1; }
++  fi
++fi
++
++
++
++if test "$MOZ_BUILD_APP" != js || test -n "$JS_STANDALONE"; then
++  _IS_OUTER_CONFIGURE=1
++fi
++
++# Check whether --with-system-nspr or --without-system-nspr was given.
++if test "${with_system_nspr+set}" = set; then
++  withval="$with_system_nspr"
++  if test "$withval" = "yes"; then
++    _USE_SYSTEM_NSPR=1 
++  elif test "$withval" = "no"; then
++    :
++  else
++    { echo "configure: error: Option, system-nspr, does not take an argument ($withval)." 1>&2; echo "configure: error: Option, system-nspr, does not take an argument ($withval)." 1>&5; exit 1; }
++  fi
++fi
++
++
++JS_POSIX_NSPR=unset
++
++    if test -n "$JS_STANDALONE"; then
++      case "$target" in
++        *linux*|*darwin*|*dragonfly*|*freebsd*|*netbsd*|*openbsd*)
++          if test -z "$_HAS_NSPR"; then
++            JS_POSIX_NSPR_DEFAULT=1
++          fi
++          ;;
++      esac
++    fi
++
++    # Check whether --enable-posix-nspr-emulation or --disable-posix-nspr-emulation was given.
++if test "${enable_posix_nspr_emulation+set}" = set; then
++  enableval="$enable_posix_nspr_emulation"
++  if test "$enableval" = "yes"; then
++    JS_POSIX_NSPR=1
++  elif test "$enableval" = "no"; then
++    JS_POSIX_NSPR=
++  else
++    { echo "configure: error: Option, posix-nspr-emulation, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, posix-nspr-emulation, does not take an argument ($enableval)." 1>&5; exit 1; }
++  fi
++fi
++
++
++
++
++echo $ac_n "checking NSPR selection""... $ac_c" 1>&6
++echo "configure:8055: checking NSPR selection" >&5
++nspr_opts=
++which_nspr=default
++if test -n "$_USE_SYSTEM_NSPR"; then
++    nspr_opts="x$nspr_opts"
++    which_nspr="system"
++fi
++if test -n "$NSPR_CFLAGS" -o -n "$NSPR_LIBS"; then
++    nspr_opts="x$nspr_opts"
++    which_nspr="command-line"
++fi
++if test -n "$MOZ_BUILD_NSPR"; then
++    nspr_opts="x$nspr_opts"
++    which_nspr="source-tree"
++fi
++if test "$JS_POSIX_NSPR" = unset; then
++    JS_POSIX_NSPR=
++else
++    nspr_opts="x$nspr_opts"
++    which_nspr="posix-wrapper"
++fi
++
++if test -z "$nspr_opts"; then
++    if test "$MOZ_BUILD_APP" != js; then
++            MOZ_BUILD_NSPR=1
++      which_nspr="source-tree"
++    else
++                  JS_POSIX_NSPR="$JS_POSIX_NSPR_DEFAULT"
++      if test -z "$JS_POSIX_NSPR"; then
++        MOZ_BUILD_NSPR=1
++        which_nspr="source-tree"
++      else
++        which_nspr="posix-wrapper"
++      fi
++   fi
++fi
++
++if test -z "$nspr_opts" || test "$nspr_opts" = x; then
++    echo "$ac_t""$which_nspr" 1>&6
++else
++    { echo "configure: error: only one way of using NSPR may be selected. See 'configure --help'." 1>&2; echo "configure: error: only one way of using NSPR may be selected. See 'configure --help'." 1>&5; exit 1; }
++fi
++
++
++
++if test "$MOZ_BUILD_APP" = js; then
++  if test "$JS_POSIX_NSPR" = 1; then
++    cat >> confdefs.pytmp <<\EOF
++    (''' JS_POSIX_NSPR ''', ' 1 ')
++EOF
++cat >> confdefs.h <<\EOF
++#define JS_POSIX_NSPR 1
++EOF
++
++  fi
++  
++fi
++
++# A (sub)configure invoked by the toplevel configure will always receive
++# --with-nspr-libs on the command line. It will never need to figure out
++# anything itself.
++if test -n "$_IS_OUTER_CONFIGURE"; then
++
++if test -n "$_USE_SYSTEM_NSPR"; then
++    
++# Check whether --with-nspr-prefix or --without-nspr-prefix was given.
++if test "${with_nspr_prefix+set}" = set; then
++  withval="$with_nspr_prefix"
++  nspr_config_prefix="$withval"
++else
++  nspr_config_prefix=""
++fi
++
++
++# Check whether --with-nspr-exec-prefix or --without-nspr-exec-prefix was given.
++if test "${with_nspr_exec_prefix+set}" = set; then
++  withval="$with_nspr_exec_prefix"
++  nspr_config_exec_prefix="$withval"
++else
++  nspr_config_exec_prefix=""
++fi
++
++
++	if test -n "$nspr_config_exec_prefix"; then
++		nspr_config_args="$nspr_config_args --exec-prefix=$nspr_config_exec_prefix"
++		if test -z "$NSPR_CONFIG"; then
++			NSPR_CONFIG=$nspr_config_exec_prefix/bin/nspr-config
++		fi
++	fi
++	if test -n "$nspr_config_prefix"; then
++		nspr_config_args="$nspr_config_args --prefix=$nspr_config_prefix"
++		if test -z "$NSPR_CONFIG"; then
++			NSPR_CONFIG=$nspr_config_prefix/bin/nspr-config
++		fi
++	fi
++
++	unset ac_cv_path_NSPR_CONFIG
++	# Extract the first word of "nspr-config", so it can be a program name with args.
++set dummy nspr-config; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:8155: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_path_NSPR_CONFIG'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  case "$NSPR_CONFIG" in
++  /*)
++  ac_cv_path_NSPR_CONFIG="$NSPR_CONFIG" # Let the user override the test with a path.
++  ;;
++  ?:/*)			 
++  ac_cv_path_NSPR_CONFIG="$NSPR_CONFIG" # Let the user override the test with a dos path.
++  ;;
++  *)
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do 
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_path_NSPR_CONFIG="$ac_dir/$ac_word"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++  test -z "$ac_cv_path_NSPR_CONFIG" && ac_cv_path_NSPR_CONFIG="no"
++  ;;
++esac
++fi
++NSPR_CONFIG="$ac_cv_path_NSPR_CONFIG"
++if test -n "$NSPR_CONFIG"; then
++  echo "$ac_t""$NSPR_CONFIG" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++	min_nspr_version=$NSPR_MINVER
++	echo $ac_n "checking for NSPR - version >= $min_nspr_version""... $ac_c" 1>&6
++echo "configure:8190: checking for NSPR - version >= $min_nspr_version" >&5
++
++	no_nspr=""
++	if test "$NSPR_CONFIG" != "no"; then
++		NSPR_CFLAGS=`$NSPR_CONFIG $nspr_config_args --cflags`
++		NSPR_LIBS=`$NSPR_CONFIG $nspr_config_args --libs`
++		NSPR_VERSION_STRING=`$NSPR_CONFIG $nspr_config_args --version`	
++	elif test -n "${NO_NSPR_CONFIG_SYSTEM_VERSION}"; then
++	    NSPR_CFLAGS="${NO_NSPR_CONFIG_SYSTEM_CFLAGS}"
++		NSPR_LIBS="${NO_NSPR_CONFIG_SYSTEM_LDFLAGS}"
++		NSPR_VERSION_STRING="$NO_NSPR_CONFIG_SYSTEM_VERSION"
++	else
++	    no_nspr="yes"
++	fi
++
++	if test -z "$no_nspr"; then
++		nspr_config_major_version=`echo $NSPR_VERSION_STRING | \
++			sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\1/'`
++		nspr_config_minor_version=`echo $NSPR_VERSION_STRING | \
++			sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\2/'`
++		nspr_config_micro_version=`echo $NSPR_VERSION_STRING | \
++			sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\4/'`
++		if test -z "$nspr_config_micro_version"; then
++			nspr_config_micro_version="0"
++		fi
++
++		min_nspr_major_version=`echo $min_nspr_version | \
++			sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\1/'`
++		min_nspr_minor_version=`echo $min_nspr_version | \
++			sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\2/'`
++		min_nspr_micro_version=`echo $min_nspr_version | \
++			sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\4/'`
++		if test -z "$min_nspr_micro_version"; then
++			min_nspr_micro_version="0"
++		fi
++
++		if test "$nspr_config_major_version" -ne "$min_nspr_major_version"; then
++			no_nspr="yes"
++		elif test "$nspr_config_major_version" -eq "$min_nspr_major_version" &&
++		     test "$nspr_config_minor_version" -lt "$min_nspr_minor_version"; then
++			no_nspr="yes"
++		elif test "$nspr_config_major_version" -eq "$min_nspr_major_version" &&
++		     test "$nspr_config_minor_version" -eq "$min_nspr_minor_version" &&
++		     test "$nspr_config_micro_version" -lt "$min_nspr_micro_version"; then
++			no_nspr="yes"
++		fi
++	fi
++
++	if test -z "$no_nspr"; then
++		echo "$ac_t""yes" 1>&6
++		MOZ_SYSTEM_NSPR=1     
++	else
++		echo "$ac_t""no" 1>&6
++		{ echo "configure: error: you do not have NSPR installed or your version is older than $NSPR_MINVER." 1>&2; echo "configure: error: you do not have NSPR installed or your version is older than $NSPR_MINVER." 1>&5; exit 1; }
++	fi
++
++
++	
++	
++
++
++fi
++
++if test -n "$MOZ_SYSTEM_NSPR" -o -n "$NSPR_CFLAGS" -o -n "$NSPR_LIBS"; then
++    _SAVE_CFLAGS=$CFLAGS
++    CFLAGS="$CFLAGS $NSPR_CFLAGS"
++    cat > conftest.$ac_ext <<EOF
++#line 8257 "configure"
++#include "confdefs.h"
++#include "prtypes.h"
++int main() {
++#ifndef PR_STATIC_ASSERT
++                 #error PR_STATIC_ASSERT not defined or requires including prtypes.h
++                 #endif
++; return 0; }
++EOF
++if { (eval echo configure:8266: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  :
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  { echo "configure: error: system NSPR does not support PR_STATIC_ASSERT or including prtypes.h does not provide it" 1>&2; echo "configure: error: system NSPR does not support PR_STATIC_ASSERT or including prtypes.h does not provide it" 1>&5; exit 1; }
++fi
++rm -f conftest*
++    cat > conftest.$ac_ext <<EOF
++#line 8276 "configure"
++#include "confdefs.h"
++#include "prtypes.h"
++int main() {
++#ifndef PR_UINT64
++                 #error PR_UINT64 not defined or requires including prtypes.h
++                 #endif
++; return 0; }
++EOF
++if { (eval echo configure:8285: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  :
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  { echo "configure: error: system NSPR does not support PR_UINT64 or including prtypes.h does not provide it" 1>&2; echo "configure: error: system NSPR does not support PR_UINT64 or including prtypes.h does not provide it" 1>&5; exit 1; }
++fi
++rm -f conftest*
++    CFLAGS=$_SAVE_CFLAGS
++    NSPR_INCLUDE_DIR=`echo ${NSPR_CFLAGS} | sed -e 's/.*-I\([^ ]*\).*/\1/'`
++    NSPR_LIB_DIR=`echo ${NSPR_LIBS} | sed -e 's/.*-L\([^ ]*\).*/\1/'`
++elif test -z "$JS_POSIX_NSPR"; then
++    NSPR_INCLUDE_DIR="${DIST}/include/nspr"
++    NSPR_CFLAGS="-I${NSPR_INCLUDE_DIR}"
++    if test -n "$GNU_CC"; then
++        if test -n "$MOZ_FOLD_LIBS"; then
++           NSPR_LIB_DIR=${DIST}/lib
++        else
++           NSPR_LIB_DIR=${DIST}/bin
++        fi
++        NSPR_LIBS="-L${NSPR_LIB_DIR} -lnspr${NSPR_VERSION} -lplc${NSPR_VERSION} -lplds${NSPR_VERSION}"
++    else
++        # NSS needs actual static libs to link to, and this is where they are.
++        NSPR_LIBS="${DIST}/lib/nspr${NSPR_VERSION}.lib ${DIST}/lib/plc${NSPR_VERSION}.lib ${DIST}/lib/plds${NSPR_VERSION}.lib "
++        NSPR_LIB_DIR="${DIST}/lib"
++    fi
++fi
++
++
++
++
++
++PKGCONF_REQUIRES_PRIVATE="Requires.private: nspr"
++if test -n "$MOZ_SYSTEM_NSPR"; then
++    _SAVE_CFLAGS=$CFLAGS
++    CFLAGS="$CFLAGS $NSPR_CFLAGS"
++    cat > conftest.$ac_ext <<EOF
++#line 8323 "configure"
++#include "confdefs.h"
++#include "prlog.h"
++int main() {
++#ifndef PR_STATIC_ASSERT
++                 #error PR_STATIC_ASSERT not defined
++                 #endif
++; return 0; }
++EOF
++if { (eval echo configure:8332: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  :
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  { echo "configure: error: system NSPR does not support PR_STATIC_ASSERT" 1>&2; echo "configure: error: system NSPR does not support PR_STATIC_ASSERT" 1>&5; exit 1; }
++fi
++rm -f conftest*
++    CFLAGS=$_SAVE_CFLAGS
++    # piggy back on $MOZ_SYSTEM_NSPR to set a variable for the nspr check for js.pc
++    PKGCONF_REQUIRES_PRIVATE="Requires.private: nspr >= $NSPR_MINVER"
++elif test -n "$JS_POSIX_NSPR"; then
++    PKGCONF_REQUIRES_PRIVATE=
++fi
++
++
++fi # _IS_OUTER_CONFIGURE
++
++
++
+ # Check whether --with-system-libevent or --without-system-libevent was given.
+ if test "${with_system_libevent+set}" = set; then
+   withval="$with_system_libevent"
+@@ -7386,19 +8371,19 @@ if test "$LIBEVENT_DIR" = yes; then
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+         echo $ac_n "checking for libevent""... $ac_c" 1>&6
+-echo "configure:7390: checking for libevent" >&5
++echo "configure:8375: checking for libevent" >&5
+ 
+         if $PKG_CONFIG --exists "libevent" ; then
+             echo "$ac_t""yes" 1>&6
+             succeeded=yes
+ 
+             echo $ac_n "checking MOZ_LIBEVENT_CFLAGS""... $ac_c" 1>&6
+-echo "configure:7397: checking MOZ_LIBEVENT_CFLAGS" >&5
++echo "configure:8382: checking MOZ_LIBEVENT_CFLAGS" >&5
+             MOZ_LIBEVENT_CFLAGS=`$PKG_CONFIG --cflags "libevent"`
+             echo "$ac_t""$MOZ_LIBEVENT_CFLAGS" 1>&6
+ 
+             echo $ac_n "checking MOZ_LIBEVENT_LIBS""... $ac_c" 1>&6
+-echo "configure:7402: checking MOZ_LIBEVENT_LIBS" >&5
++echo "configure:8387: checking MOZ_LIBEVENT_LIBS" >&5
+             ## Remove evil flags like -Wl,--export-dynamic
+             MOZ_LIBEVENT_LIBS="`$PKG_CONFIG --libs \"libevent\" |sed s/-Wl,--export-dynamic//g`"
+             echo "$ac_t""$MOZ_LIBEVENT_LIBS" 1>&6
+@@ -7435,12 +8420,12 @@ elif test -z "$MOZ_SYSTEM_LIBEVENT"; the
+     LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS"
+        ac_safe=`echo "event.h" | sed 'y%./+-%__p_%'`
+   echo $ac_n "checking for event.h""... $ac_c" 1>&6
+-echo "configure:7439: checking for event.h" >&5
++echo "configure:8424: checking for event.h" >&5
+   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+    cat > conftest.$ac_ext <<EOF
+-#line 7444 "configure"
++#line 8429 "configure"
+ #include "confdefs.h"
+ 
+ #include <event.h>
+@@ -7448,7 +8433,7 @@ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+@@ -7471,7 +8456,7 @@ fi
+   fi
+ 
+     echo $ac_n "checking for event_init in -levent""... $ac_c" 1>&6
+-echo "configure:7475: checking for event_init in -levent" >&5
++echo "configure:8460: checking for event_init in -levent" >&5
+ ac_lib_var=`echo event'_'event_init | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7479,7 +8464,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-levent  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7483 "configure"
++#line 8468 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7490,7 +8475,7 @@ int main() {
+ event_init()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7520,6 +8505,263 @@ LIBS=$_SAVE_LIBS
+ 
+ 
+ 
++
++# Check whether --with-system-nss or --without-system-nss was given.
++if test "${with_system_nss+set}" = set; then
++  withval="$with_system_nss"
++  if test "$withval" = "yes"; then
++    _USE_SYSTEM_NSS=1 
++  elif test "$withval" = "no"; then
++    :
++  else
++    { echo "configure: error: Option, system-nss, does not take an argument ($withval)." 1>&2; echo "configure: error: Option, system-nss, does not take an argument ($withval)." 1>&5; exit 1; }
++  fi
++fi
++
++
++if test -n "$_USE_SYSTEM_NSS"; then
++    
++# Check whether --with-nss-prefix or --without-nss-prefix was given.
++if test "${with_nss_prefix+set}" = set; then
++  withval="$with_nss_prefix"
++  nss_config_prefix="$withval"
++else
++  nss_config_prefix=""
++fi
++
++
++# Check whether --with-nss-exec-prefix or --without-nss-exec-prefix was given.
++if test "${with_nss_exec_prefix+set}" = set; then
++  withval="$with_nss_exec_prefix"
++  nss_config_exec_prefix="$withval"
++else
++  nss_config_exec_prefix=""
++fi
++
++
++	if test -n "$nss_config_exec_prefix"; then
++		nss_config_args="$nss_config_args --exec-prefix=$nss_config_exec_prefix"
++		if test -z "$NSS_CONFIG"; then
++			NSS_CONFIG=$nss_config_exec_prefix/bin/nss-config
++		fi
++	fi
++	if test -n "$nss_config_prefix"; then
++		nss_config_args="$nss_config_args --prefix=$nss_config_prefix"
++		if test -z "$NSS_CONFIG"; then
++			NSS_CONFIG=$nss_config_prefix/bin/nss-config
++		fi
++	fi
++
++	unset ac_cv_path_NSS_CONFIG
++	# Extract the first word of "nss-config", so it can be a program name with args.
++set dummy nss-config; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:8560: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  case "$NSS_CONFIG" in
++  /*)
++  ac_cv_path_NSS_CONFIG="$NSS_CONFIG" # Let the user override the test with a path.
++  ;;
++  ?:/*)			 
++  ac_cv_path_NSS_CONFIG="$NSS_CONFIG" # Let the user override the test with a dos path.
++  ;;
++  *)
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do 
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_path_NSS_CONFIG="$ac_dir/$ac_word"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++  test -z "$ac_cv_path_NSS_CONFIG" && ac_cv_path_NSS_CONFIG="no"
++  ;;
++esac
++fi
++NSS_CONFIG="$ac_cv_path_NSS_CONFIG"
++if test -n "$NSS_CONFIG"; then
++  echo "$ac_t""$NSS_CONFIG" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++	min_nss_version=3.44.2
++	echo $ac_n "checking for NSS - version >= $min_nss_version""... $ac_c" 1>&6
++echo "configure:8595: checking for NSS - version >= $min_nss_version" >&5
++
++	no_nss=""
++	if test "$NSS_CONFIG" = "no"; then
++		no_nss="yes"
++	else
++		NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags`
++		NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs`
++
++		nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \
++			sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\1/'`
++		nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \
++			sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\2/'`
++		nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \
++			sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\4/'`
++		if test -z "$nss_config_micro_version"; then
++			nss_config_micro_version="0"
++		fi
++
++		min_nss_major_version=`echo $min_nss_version | \
++			sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\1/'`
++		min_nss_minor_version=`echo $min_nss_version | \
++			sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\2/'`
++		min_nss_micro_version=`echo $min_nss_version | \
++			sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\4/'`
++		if test -z "$min_nss_micro_version"; then
++			min_nss_micro_version="0"
++		fi
++
++		if test "$nss_config_major_version" -lt "$min_nss_major_version"; then
++			no_nss="yes"
++		elif test "$nss_config_major_version" -eq "$min_nss_major_version" &&
++		     test "$nss_config_minor_version" -lt "$min_nss_minor_version"; then
++			no_nss="yes"
++		elif test "$nss_config_major_version" -eq "$min_nss_major_version" &&
++		     test "$nss_config_minor_version" -eq "$min_nss_minor_version" &&
++		     test "$nss_config_micro_version" -lt "$min_nss_micro_version"; then
++			no_nss="yes"
++		fi
++	fi
++
++	if test -z "$no_nss"; then
++		echo "$ac_t""yes" 1>&6
++		MOZ_SYSTEM_NSS=1     
++	else
++		echo "$ac_t""no" 1>&6
++		{ echo "configure: error: you don't have NSS installed or your version is too old" 1>&2; echo "configure: error: you don't have NSS installed or your version is too old" 1>&5; exit 1; }
++	fi
++
++
++	
++	
++
++
++fi
++
++NSS_CFLAGS="$NSS_CFLAGS -I${DIST}/include/nss"
++if test -z "$MOZ_SYSTEM_NSS"; then
++   case "${OS_ARCH}" in
++        # Only few platforms have been tested with GYP
++        WINNT|Darwin|Linux|DragonFly|FreeBSD|NetBSD|OpenBSD|SunOS)
++            ;;
++        *)
++            { echo "configure: error: building in-tree NSS is not supported on this platform. Use --with-system-nss" 1>&2; echo "configure: error: building in-tree NSS is not supported on this platform. Use --with-system-nss" 1>&5; exit 1; }
++            ;;
++   esac
++fi
++
++
++
++MOZZLIB=1.2.3
++
++# Check whether --with-system-zlib or --without-system-zlib was given.
++if test "${with_system_zlib+set}" = set; then
++  withval="$with_system_zlib"
++  ZLIB_DIR=$withval
++fi
++
++
++if test -z "$MOZ_ZLIB_LIBS$MOZ_ZLIB_CFLAGS$SKIP_LIBRARY_CHECKS"; then
++    _SAVE_CFLAGS=$CFLAGS
++    _SAVE_LDFLAGS=$LDFLAGS
++    _SAVE_LIBS=$LIBS
++
++    if test -n "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "yes"; then
++        MOZ_ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
++        MOZ_ZLIB_LIBS="-L${ZLIB_DIR}/lib"
++        CFLAGS="$MOZ_ZLIB_CFLAGS $CFLAGS"
++        LDFLAGS="$MOZ_ZLIB_LIBS $LDFLAGS"
++    fi
++    if test -z "$ZLIB_DIR" -o "$ZLIB_DIR" = no; then
++        MOZ_SYSTEM_ZLIB=
++    else
++        echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6
++echo "configure:8689: checking for gzread in -lz" >&5
++ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-lz  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 8697 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char gzread();
++
++int main() {
++gzread()
++; return 0; }
++EOF
++if { (eval echo configure:8708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  MOZ_SYSTEM_ZLIB=1 MOZ_ZLIB_LIBS="$MOZ_ZLIB_LIBS -lz"
++else
++  echo "$ac_t""no" 1>&6
++MOZ_SYSTEM_ZLIB=
++fi
++
++        if test "$MOZ_SYSTEM_ZLIB" = 1; then
++            MOZZLIBNUM=`echo $MOZZLIB | awk -F. '{printf "0x%x\n", ((($1 * 16 + $2) * 16) + $3) * 16 + $4}'`
++            cat > conftest.$ac_ext <<EOF
++#line 8732 "configure"
++#include "confdefs.h"
++ #include <stdio.h>
++                             #include <string.h>
++                             #include <zlib.h> 
++int main() {
++ #if ZLIB_VERNUM < $MOZZLIBNUM
++                             #error "Insufficient zlib version ($MOZZLIBNUM required)."
++                             #endif 
++; return 0; }
++EOF
++if { (eval echo configure:8743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  rm -rf conftest*
++  MOZ_SYSTEM_ZLIB=1
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  { echo "configure: error: Insufficient zlib version for --with-system-zlib ($MOZZLIB required)" 1>&2; echo "configure: error: Insufficient zlib version for --with-system-zlib ($MOZZLIB required)" 1>&5; exit 1; }
++fi
++rm -f conftest*
++        fi
++    fi
++    CFLAGS=$_SAVE_CFLAGS
++    LDFLAGS=$_SAVE_LDFLAGS
++    LIBS=$_SAVE_LIBS
++fi
++
++
++
++
++
++
++
+ if test -z "$SKIP_LIBRARY_CHECKS"; then
+ 
+ # Check whether --with-system-png or --without-system-png was given.
+@@ -7540,7 +8782,7 @@ if test -z "$PNG_DIR" -o "$PNG_DIR" = no
+     MOZ_SYSTEM_PNG=
+ else
+     echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6
+-echo "configure:7544: checking for png_get_valid in -lpng" >&5
++echo "configure:8786: checking for png_get_valid in -lpng" >&5
+ ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7548,7 +8790,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpng  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7552 "configure"
++#line 8794 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7559,7 +8801,7 @@ int main() {
+ png_get_valid()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7581,7 +8823,7 @@ else
+ fi
+ 
+     echo $ac_n "checking for png_get_acTL in -lpng""... $ac_c" 1>&6
+-echo "configure:7585: checking for png_get_acTL in -lpng" >&5
++echo "configure:8827: checking for png_get_acTL in -lpng" >&5
+ ac_lib_var=`echo png'_'png_get_acTL | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7589,7 +8831,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpng  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7593 "configure"
++#line 8835 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7600,7 +8842,7 @@ int main() {
+ png_get_acTL()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7634,7 +8876,7 @@ fi
+ fi
+ if test "$MOZ_SYSTEM_PNG" = 1; then
+     cat > conftest.$ac_ext <<EOF
+-#line 7638 "configure"
++#line 8880 "configure"
+ #include "confdefs.h"
+  #include <stdio.h>
+                      #include <sys/types.h>
+@@ -7648,7 +8890,7 @@ int main() {
+                      #endif 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8894: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   MOZ_SYSTEM_PNG=1
+ else
+@@ -7677,12 +8919,16 @@ ENABLE_SYSTEM_EXTENSION_DIRS=1
+ MOZ_BRANDING_DIRECTORY=
+ MOZ_OFFICIAL_BRANDING=
+ MOZ_AUTH_EXTENSION=1
++if test "$MOZ_IOS"; then
++   MOZ_AUTH_EXTENSION=
++fi
+ MOZ_PREF_EXTENSIONS=1
+ MOZ_SPELLCHECK=1
+ MOZ_UNIVERSALCHARDET=1
+ MOZ_XUL=1
+ MOZ_ZIPWRITER=1
+ MOZ_NO_SMART_CARDS=
++NECKO_COOKIES=1
+ MOZ_USE_NATIVE_POPUP_WINDOWS=
+ MOZ_EXCLUDE_HYPHENATION_DICTIONARIES=
+ MOZ_SANDBOX=1
+@@ -7736,7 +8982,7 @@ fi
+ 
+ # Allow the application to influence configure with a confvars.sh script.
+ echo $ac_n "checking if app-specific confvars.sh exists""... $ac_c" 1>&6
+-echo "configure:7740: checking if app-specific confvars.sh exists" >&5
++echo "configure:8986: checking if app-specific confvars.sh exists" >&5
+ if test -f "${srcdir}/${MOZ_BUILD_APP}/confvars.sh" ; then
+   echo "$ac_t""${srcdir}/${MOZ_BUILD_APP}/confvars.sh" 1>&6
+   . "${srcdir}/${MOZ_BUILD_APP}/confvars.sh"
+@@ -7744,6 +8990,25 @@ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
++# Allow influencing configure with a defines.sh script.
++. "${srcdir}/build/defines.sh"
++
++# If we're not building a release build, define EARLY_BETA_OR_EARLIER if it is
++# set in defines.sh
++if test "$BUILDING_RELEASE"; then
++  # Override value in defines.sh, if any
++  EARLY_BETA_OR_EARLIER=
++elif test "$EARLY_BETA_OR_EARLIER"; then
++  cat >> confdefs.pytmp <<\EOF
++    (''' EARLY_BETA_OR_EARLIER ''', ' 1 ')
++EOF
++cat >> confdefs.h <<\EOF
++#define EARLY_BETA_OR_EARLIER 1
++EOF
++
++fi
++
++
+ # Allow someone to change MOZ_APP_NAME and MOZ_APP_BASENAME in mozconfig
+ # Check whether --with-app-name or --without-app-name was given.
+ if test "${with_app_name+set}" = set; then
+@@ -7767,6 +9032,34 @@ if test -n "$WITH_APP_BASENAME" ; then
+     MOZ_APP_BASENAME="$WITH_APP_BASENAME"
+ fi
+ 
++# Special cases where we need to AC_DEFINE something. Also a holdover for apps
++# that haven't made a confvars.sh yet. Don't add new stuff here, use
++# MOZ_BUILD_APP.
++case "$MOZ_BUILD_APP" in
++browser)
++  cat >> confdefs.pytmp <<\EOF
++    (''' MOZ_PHOENIX ''', ' 1 ')
++EOF
++cat >> confdefs.h <<\EOF
++#define MOZ_PHOENIX 1
++EOF
++
++  ;;
++esac
++
++# Graphene is a desktop runtime for running applications with a HTML UI.
++if test -n "$MOZ_GRAPHENE"; then
++    cat >> confdefs.pytmp <<\EOF
++    (''' MOZ_GRAPHENE ''', ' 1 ')
++EOF
++cat >> confdefs.h <<\EOF
++#define MOZ_GRAPHENE 1
++EOF
++
++fi
++
++
++
+ 
+ case "$MOZ_BUILD_APP" in
+ mobile/android)
+@@ -7846,7 +9139,7 @@ gtk*)
+ esac
+ 
+ if test "$COMPILE_ENVIRONMENT"; then
+-  if test "$MOZ_WIDGET_TOOLKIT" = gtk; then
++  if test "$MOZ_WIDGET_TOOLKIT" = gtk3; then
+     succeeded=no
+ 
+   if test -z "$PKG_CONFIG"; then
+@@ -7858,19 +9151,19 @@ if test "$COMPILE_ENVIRONMENT"; then
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+         echo $ac_n "checking for gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 gio-unix-2.0 $GDK_PACKAGES""... $ac_c" 1>&6
+-echo "configure:7862: checking for gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 gio-unix-2.0 $GDK_PACKAGES" >&5
++echo "configure:9155: checking for gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 gio-unix-2.0 $GDK_PACKAGES" >&5
+ 
+         if $PKG_CONFIG --exists "gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 gio-unix-2.0 $GDK_PACKAGES" ; then
+             echo "$ac_t""yes" 1>&6
+             succeeded=yes
+ 
+             echo $ac_n "checking MOZ_GTK3_CFLAGS""... $ac_c" 1>&6
+-echo "configure:7869: checking MOZ_GTK3_CFLAGS" >&5
++echo "configure:9162: checking MOZ_GTK3_CFLAGS" >&5
+             MOZ_GTK3_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 gio-unix-2.0 $GDK_PACKAGES"`
+             echo "$ac_t""$MOZ_GTK3_CFLAGS" 1>&6
+ 
+             echo $ac_n "checking MOZ_GTK3_LIBS""... $ac_c" 1>&6
+-echo "configure:7874: checking MOZ_GTK3_LIBS" >&5
++echo "configure:9167: checking MOZ_GTK3_LIBS" >&5
+             ## Remove evil flags like -Wl,--export-dynamic
+             MOZ_GTK3_LIBS="`$PKG_CONFIG --libs \"gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 gio-unix-2.0 $GDK_PACKAGES\" |sed s/-Wl,--export-dynamic//g`"
+             echo "$ac_t""$MOZ_GTK3_LIBS" 1>&6
+@@ -7941,19 +9234,19 @@ EOF
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+         echo $ac_n "checking for gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 >= $GLIB_VERSION gobject-2.0 gio-unix-2.0 $GDK_PACKAGES""... $ac_c" 1>&6
+-echo "configure:7945: checking for gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 >= $GLIB_VERSION gobject-2.0 gio-unix-2.0 $GDK_PACKAGES" >&5
++echo "configure:9238: checking for gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 >= $GLIB_VERSION gobject-2.0 gio-unix-2.0 $GDK_PACKAGES" >&5
+ 
+         if $PKG_CONFIG --exists "gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 >= $GLIB_VERSION gobject-2.0 gio-unix-2.0 $GDK_PACKAGES" ; then
+             echo "$ac_t""yes" 1>&6
+             succeeded=yes
+ 
+             echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6
+-echo "configure:7952: checking MOZ_GTK2_CFLAGS" >&5
++echo "configure:9245: checking MOZ_GTK2_CFLAGS" >&5
+             MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 >= $GLIB_VERSION gobject-2.0 gio-unix-2.0 $GDK_PACKAGES"`
+             echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6
+ 
+             echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6
+-echo "configure:7957: checking MOZ_GTK2_LIBS" >&5
++echo "configure:9250: checking MOZ_GTK2_LIBS" >&5
+             ## Remove evil flags like -Wl,--export-dynamic
+             MOZ_GTK2_LIBS="`$PKG_CONFIG --libs \"gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 >= $GLIB_VERSION gobject-2.0 gio-unix-2.0 $GDK_PACKAGES\" |sed s/-Wl,--export-dynamic//g`"
+             echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6
+@@ -7989,6 +9282,102 @@ fi # COMPILE_ENVIRONMENT
+ 
+ 
+ 
++if test "$MOZ_ENABLE_GTK"
++then
++    MOZ_ENABLE_STARTUP_NOTIFICATION=
++
++    # Check whether --enable-startup-notification or --disable-startup-notification was given.
++if test "${enable_startup_notification+set}" = set; then
++  enableval="$enable_startup_notification"
++  if test "$enableval" = "yes"; then
++    MOZ_ENABLE_STARTUP_NOTIFICATION=force
++  elif test "$enableval" = "no"; then
++    MOZ_ENABLE_STARTUP_NOTIFICATION=
++  else
++    { echo "configure: error: Option, startup-notification, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, startup-notification, does not take an argument ($enableval)." 1>&5; exit 1; }
++  fi
++fi
++
++    if test "$MOZ_ENABLE_STARTUP_NOTIFICATION"
++    then
++        succeeded=no
++
++  if test -z "$PKG_CONFIG"; then
++     echo "*** The pkg-config script could not be found. Make sure it is"
++     echo "*** in your path, or set the PKG_CONFIG environment variable"
++     echo "*** to the full path to pkg-config."
++     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++  else
++     PKG_CONFIG_MIN_VERSION=0.9.0
++     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++        echo $ac_n "checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION""... $ac_c" 1>&6
++echo "configure:9315: checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" >&5
++
++        if $PKG_CONFIG --exists "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" ; then
++            echo "$ac_t""yes" 1>&6
++            succeeded=yes
++
++            echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_CFLAGS""... $ac_c" 1>&6
++echo "configure:9322: checking MOZ_STARTUP_NOTIFICATION_CFLAGS" >&5
++            MOZ_STARTUP_NOTIFICATION_CFLAGS=`$PKG_CONFIG --cflags "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"`
++            echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_CFLAGS" 1>&6
++
++            echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_LIBS""... $ac_c" 1>&6
++echo "configure:9327: checking MOZ_STARTUP_NOTIFICATION_LIBS" >&5
++            ## Remove evil flags like -Wl,--export-dynamic
++            MOZ_STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG --libs \"libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION\" |sed s/-Wl,--export-dynamic//g`"
++            echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_LIBS" 1>&6
++        else
++            MOZ_STARTUP_NOTIFICATION_CFLAGS=""
++            MOZ_STARTUP_NOTIFICATION_LIBS=""
++            ## If we have a custom action on failure, don't print errors, but 
++            ## do set a variable so people can do so.
++            MOZ_STARTUP_NOTIFICATION_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"`
++            
++        fi
++
++        
++        
++     else
++        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
++        echo "*** See http://www.freedesktop.org/software/pkgconfig"
++     fi
++  fi
++
++  if test $succeeded = yes; then
++     MOZ_ENABLE_STARTUP_NOTIFICATION=1
++  else
++     if test "$COMPILE_ENVIRONMENT"; then 
++       
++            if test "$MOZ_ENABLE_STARTUP_NOTIFICATION" = "force"
++            then
++                { echo "configure: error: * * * Could not find startup-notification >= $STARTUP_NOTIFICATION_VERSION" 1>&2; echo "configure: error: * * * Could not find startup-notification >= $STARTUP_NOTIFICATION_VERSION" 1>&5; exit 1; }
++            fi
++            MOZ_ENABLE_STARTUP_NOTIFICATION=
++        
++     fi
++  fi
++
++    fi
++
++    if test "$MOZ_ENABLE_STARTUP_NOTIFICATION"; then
++        cat >> confdefs.pytmp <<\EOF
++    (''' MOZ_ENABLE_STARTUP_NOTIFICATION ''', ' 1 ')
++EOF
++cat >> confdefs.h <<\EOF
++#define MOZ_ENABLE_STARTUP_NOTIFICATION 1
++EOF
++
++    fi
++
++    TK_LIBS="$TK_LIBS $MOZ_STARTUP_NOTIFICATION_LIBS"
++fi
++
++
++
++
++
++
+ 
+ 
+ # Components and Features
+@@ -8081,19 +9470,19 @@ fi
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+         echo $ac_n "checking for libproxy-1.0""... $ac_c" 1>&6
+-echo "configure:8085: checking for libproxy-1.0" >&5
++echo "configure:9474: checking for libproxy-1.0" >&5
+ 
+         if $PKG_CONFIG --exists "libproxy-1.0" ; then
+             echo "$ac_t""yes" 1>&6
+             succeeded=yes
+ 
+             echo $ac_n "checking MOZ_LIBPROXY_CFLAGS""... $ac_c" 1>&6
+-echo "configure:8092: checking MOZ_LIBPROXY_CFLAGS" >&5
++echo "configure:9481: checking MOZ_LIBPROXY_CFLAGS" >&5
+             MOZ_LIBPROXY_CFLAGS=`$PKG_CONFIG --cflags "libproxy-1.0"`
+             echo "$ac_t""$MOZ_LIBPROXY_CFLAGS" 1>&6
+ 
+             echo $ac_n "checking MOZ_LIBPROXY_LIBS""... $ac_c" 1>&6
+-echo "configure:8097: checking MOZ_LIBPROXY_LIBS" >&5
++echo "configure:9486: checking MOZ_LIBPROXY_LIBS" >&5
+             ## Remove evil flags like -Wl,--export-dynamic
+             MOZ_LIBPROXY_LIBS="`$PKG_CONFIG --libs \"libproxy-1.0\" |sed s/-Wl,--export-dynamic//g`"
+             echo "$ac_t""$MOZ_LIBPROXY_LIBS" 1>&6
+@@ -8164,19 +9553,19 @@ fi
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+         echo $ac_n "checking for dbus-1 >= $DBUS_VERSION""... $ac_c" 1>&6
+-echo "configure:8168: checking for dbus-1 >= $DBUS_VERSION" >&5
++echo "configure:9557: checking for dbus-1 >= $DBUS_VERSION" >&5
+ 
+         if $PKG_CONFIG --exists "dbus-1 >= $DBUS_VERSION" ; then
+             echo "$ac_t""yes" 1>&6
+             succeeded=yes
+ 
+             echo $ac_n "checking MOZ_DBUS_CFLAGS""... $ac_c" 1>&6
+-echo "configure:8175: checking MOZ_DBUS_CFLAGS" >&5
++echo "configure:9564: checking MOZ_DBUS_CFLAGS" >&5
+             MOZ_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= $DBUS_VERSION"`
+             echo "$ac_t""$MOZ_DBUS_CFLAGS" 1>&6
+ 
+             echo $ac_n "checking MOZ_DBUS_LIBS""... $ac_c" 1>&6
+-echo "configure:8180: checking MOZ_DBUS_LIBS" >&5
++echo "configure:9569: checking MOZ_DBUS_LIBS" >&5
+             ## Remove evil flags like -Wl,--export-dynamic
+             MOZ_DBUS_LIBS="`$PKG_CONFIG --libs \"dbus-1 >= $DBUS_VERSION\" |sed s/-Wl,--export-dynamic//g`"
+             echo "$ac_t""$MOZ_DBUS_LIBS" 1>&6
+@@ -8216,19 +9605,19 @@ echo "configure:8180: checking MOZ_DBUS_
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+         echo $ac_n "checking for dbus-glib-1 >= $DBUS_VERSION""... $ac_c" 1>&6
+-echo "configure:8220: checking for dbus-glib-1 >= $DBUS_VERSION" >&5
++echo "configure:9609: checking for dbus-glib-1 >= $DBUS_VERSION" >&5
+ 
+         if $PKG_CONFIG --exists "dbus-glib-1 >= $DBUS_VERSION" ; then
+             echo "$ac_t""yes" 1>&6
+             succeeded=yes
+ 
+             echo $ac_n "checking MOZ_DBUS_GLIB_CFLAGS""... $ac_c" 1>&6
+-echo "configure:8227: checking MOZ_DBUS_GLIB_CFLAGS" >&5
++echo "configure:9616: checking MOZ_DBUS_GLIB_CFLAGS" >&5
+             MOZ_DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_VERSION"`
+             echo "$ac_t""$MOZ_DBUS_GLIB_CFLAGS" 1>&6
+ 
+             echo $ac_n "checking MOZ_DBUS_GLIB_LIBS""... $ac_c" 1>&6
+-echo "configure:8232: checking MOZ_DBUS_GLIB_LIBS" >&5
++echo "configure:9621: checking MOZ_DBUS_GLIB_LIBS" >&5
+             ## Remove evil flags like -Wl,--export-dynamic
+             MOZ_DBUS_GLIB_LIBS="`$PKG_CONFIG --libs \"dbus-glib-1 >= $DBUS_VERSION\" |sed s/-Wl,--export-dynamic//g`"
+             echo "$ac_t""$MOZ_DBUS_GLIB_LIBS" 1>&6
+@@ -8279,14 +9668,14 @@ EOF
+ fi
+ 
+ cat > conftest.$ac_ext <<EOF
+-#line 8283 "configure"
++#line 9672 "configure"
+ #include "confdefs.h"
+ #include <linux/ethtool.h>
+ int main() {
+  struct ethtool_cmd cmd; cmd.speed_hi = 0; 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   MOZ_WEBRTC_HAVE_ETHTOOL_SPEED_HI=1
+ else
+@@ -8315,17 +9704,17 @@ for ac_hdr in CoreMedia/CoreMedia.h Vide
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:8319: checking for $ac_hdr" >&5
++echo "configure:9708: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8324 "configure"
++#line 9713 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:8329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:9718: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -8383,6 +9772,10 @@ if test "${enable_negotiateauth+set}" =
+ fi
+ 
+ 
++if test -n "$MOZ_IOS" -a -n "$MOZ_AUTH_EXTENSION"; then
++   { echo "configure: error: negotiateauth is not supported on iOS." 1>&2; echo "configure: error: negotiateauth is not supported on iOS." 1>&5; exit 1; }
++fi
++
+ # Check whether --enable-pref-extensions or --disable-pref-extensions was given.
+ if test "${enable_pref_extensions+set}" = set; then
+   enableval="$enable_pref_extensions"
+@@ -8437,12 +9830,12 @@ if test "$COMPILE_ENVIRONMENT" ; then
+ if test "$OS_TARGET" = "Linux"; then
+        ac_safe=`echo "linux/joystick.h" | sed 'y%./+-%__p_%'`
+   echo $ac_n "checking for linux/joystick.h""... $ac_c" 1>&6
+-echo "configure:8441: checking for linux/joystick.h" >&5
++echo "configure:9834: checking for linux/joystick.h" >&5
+   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+    cat > conftest.$ac_ext <<EOF
+-#line 8446 "configure"
++#line 9839 "configure"
+ #include "confdefs.h"
+ 
+ #include <linux/joystick.h>
+@@ -8450,7 +9843,7 @@ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+@@ -8484,7 +9877,9 @@ i?86-*-mingw*|x86_64-*-mingw*|aarch64-*-
+   MOZ_CRASHREPORTER=1
+   ;;
+ i?86-apple-darwin*|x86_64-apple-darwin*)
+-  MOZ_CRASHREPORTER=1
++  if test -z "$MOZ_IOS"; then
++    MOZ_CRASHREPORTER=1
++  fi
+   ;;
+ *-android*|*-linuxandroid*)
+       MOZ_CRASHREPORTER=1
+@@ -8509,7 +9904,7 @@ if test "${enable_crashreporter+set}" =
+ fi
+ 
+ 
+-if test "$OS_ARCH" != "$HOST_OS_ARCH" -a "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "Darwin" -a "$MOZ_WIDGET_TOOLKIT" != "android"; then
++if test "$OS_ARCH" != "$HOST_OS_ARCH" -a "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "Darwin"; then
+   if test "$MOZ_CRASHREPORTER" = F; then
+     { echo "configure: error: Cannot --enable-crashreporter, as breakpad tools do not support compiling on $HOST_OS_ARCH while targeting $OS_ARCH." 1>&2; echo "configure: error: Cannot --enable-crashreporter, as breakpad tools do not support compiling on $HOST_OS_ARCH while targeting $OS_ARCH." 1>&5; exit 1; }
+   fi
+@@ -8538,19 +9933,19 @@ EOF
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+         echo $ac_n "checking for gthread-2.0""... $ac_c" 1>&6
+-echo "configure:8542: checking for gthread-2.0" >&5
++echo "configure:9937: checking for gthread-2.0" >&5
+ 
+         if $PKG_CONFIG --exists "gthread-2.0" ; then
+             echo "$ac_t""yes" 1>&6
+             succeeded=yes
+ 
+             echo $ac_n "checking MOZ_GTHREAD_CFLAGS""... $ac_c" 1>&6
+-echo "configure:8549: checking MOZ_GTHREAD_CFLAGS" >&5
++echo "configure:9944: checking MOZ_GTHREAD_CFLAGS" >&5
+             MOZ_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0"`
+             echo "$ac_t""$MOZ_GTHREAD_CFLAGS" 1>&6
+ 
+             echo $ac_n "checking MOZ_GTHREAD_LIBS""... $ac_c" 1>&6
+-echo "configure:8554: checking MOZ_GTHREAD_LIBS" >&5
++echo "configure:9949: checking MOZ_GTHREAD_LIBS" >&5
+             ## Remove evil flags like -Wl,--export-dynamic
+             MOZ_GTHREAD_LIBS="`$PKG_CONFIG --libs \"gthread-2.0\" |sed s/-Wl,--export-dynamic//g`"
+             echo "$ac_t""$MOZ_GTHREAD_LIBS" 1>&6
+@@ -8648,7 +10043,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:8652: checking for $ac_word" >&5
++echo "configure:10047: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_WGET'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8681,6 +10076,39 @@ test -n "$WGET" || WGET=""""
+ 
+ 
+ 
++# Check whether --enable-signmar or --disable-signmar was given.
++if test "${enable_signmar+set}" = set; then
++  enableval="$enable_signmar"
++  if test "$enableval" = "yes"; then
++    MOZ_ENABLE_SIGNMAR=1
++  elif test "$enableval" = "no"; then
++    MOZ_ENABLE_SIGNMAR= 
++  else
++    { echo "configure: error: Option, signmar, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, signmar, does not take an argument ($enableval)." 1>&5; exit 1; }
++  fi
++fi
++
++
++if test -n "$MOZ_ENABLE_SIGNMAR"; then
++  if test -z "$COMPILE_ENVIRONMENT" ; then
++    echo "configure: warning: Cannot --enable-signmar with --disable-compile-environment" 1>&2
++    MOZ_ENABLE_SIGNMAR=
++  else
++    cat >> confdefs.pytmp <<\EOF
++    (''' MOZ_ENABLE_SIGNMAR ''', ' 1 ')
++EOF
++cat >> confdefs.h <<\EOF
++#define MOZ_ENABLE_SIGNMAR 1
++EOF
++
++  fi
++fi
++
++
++if test "$MOZ_IOS"; then
++  MOZ_UPDATER=
++fi
++
+ # Check whether --enable-updater or --disable-updater was given.
+ if test "${enable_updater+set}" = set; then
+   enableval="$enable_updater"
+@@ -8796,13 +10224,83 @@ fi
+ 
+ # Individual module options
+ 
+-echo $ac_n "checking for fdatasync""... $ac_c" 1>&6
+-echo "configure:8801: checking for fdatasync" >&5
++
++MOZ_SYSTEM_SQLITE=
++# Check whether --enable-system-sqlite or --disable-system-sqlite was given.
++if test "${enable_system_sqlite+set}" = set; then
++  enableval="$enable_system_sqlite"
++  if test "$enableval" = "yes"; then
++    MOZ_SYSTEM_SQLITE=1
++  elif test "$enableval" = "no"; then
++    MOZ_SYSTEM_SQLITE= 
++  else
++    { echo "configure: error: Option, system-sqlite, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, system-sqlite, does not take an argument ($enableval)." 1>&5; exit 1; }
++  fi
++fi
++
++
++if test -n "$MOZ_SYSTEM_SQLITE"
++then
++                    succeeded=no
++
++  if test -z "$PKG_CONFIG"; then
++     echo "*** The pkg-config script could not be found. Make sure it is"
++     echo "*** in your path, or set the PKG_CONFIG environment variable"
++     echo "*** to the full path to pkg-config."
++     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++  else
++     PKG_CONFIG_MIN_VERSION=0.9.0
++     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++        echo $ac_n "checking for sqlite3 >= $SQLITE_VERSION""... $ac_c" 1>&6
++echo "configure:10256: checking for sqlite3 >= $SQLITE_VERSION" >&5
++
++        if $PKG_CONFIG --exists "sqlite3 >= $SQLITE_VERSION" ; then
++            echo "$ac_t""yes" 1>&6
++            succeeded=yes
++
++            echo $ac_n "checking SQLITE_CFLAGS""... $ac_c" 1>&6
++echo "configure:10263: checking SQLITE_CFLAGS" >&5
++            SQLITE_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= $SQLITE_VERSION"`
++            echo "$ac_t""$SQLITE_CFLAGS" 1>&6
++
++            echo $ac_n "checking SQLITE_LIBS""... $ac_c" 1>&6
++echo "configure:10268: checking SQLITE_LIBS" >&5
++            ## Remove evil flags like -Wl,--export-dynamic
++            SQLITE_LIBS="`$PKG_CONFIG --libs \"sqlite3 >= $SQLITE_VERSION\" |sed s/-Wl,--export-dynamic//g`"
++            echo "$ac_t""$SQLITE_LIBS" 1>&6
++        else
++            SQLITE_CFLAGS=""
++            SQLITE_LIBS=""
++            ## If we have a custom action on failure, don't print errors, but 
++            ## do set a variable so people can do so.
++            SQLITE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sqlite3 >= $SQLITE_VERSION"`
++            echo $SQLITE_PKG_ERRORS
++        fi
++
++        
++        
++     else
++        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
++        echo "*** See http://www.freedesktop.org/software/pkgconfig"
++     fi
++  fi
++
++  if test $succeeded = yes; then
++     :
++  else
++     if test "$COMPILE_ENVIRONMENT"; then 
++       { echo "configure: error: Library requirements (sqlite3 >= $SQLITE_VERSION) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; echo "configure: error: Library requirements (sqlite3 >= $SQLITE_VERSION) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&5; exit 1; }
++     fi
++  fi
++
++else
++                    echo $ac_n "checking for fdatasync""... $ac_c" 1>&6
++echo "configure:10299: checking for fdatasync" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_fdatasync'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8806 "configure"
++#line 10304 "configure"
+ #define fdatasync innocuous_fdatasync
+ #include "confdefs.h"
+ #undef fdatasync
+@@ -8829,7 +10327,7 @@ fdatasync();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_fdatasync=yes"
+ else
+@@ -8848,6 +10346,18 @@ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
++fi
++
++if test -n "$MOZ_SYSTEM_SQLITE"; then
++    cat >> confdefs.pytmp <<\EOF
++    (''' MOZ_SYSTEM_SQLITE ''', ' 1 ')
++EOF
++cat >> confdefs.h <<\EOF
++#define MOZ_SYSTEM_SQLITE 1
++EOF
++
++fi
++
+ 
+ # Check whether --enable-zipwriter or --disable-zipwriter was given.
+ if test "${enable_zipwriter+set}" = set; then
+@@ -8909,21 +10419,60 @@ if test -n "${MOZ_CONFIGURE_OPTIMIZE_FLA
+     MOZ_OPTIMIZE_FLAGS=${MOZ_CONFIGURE_OPTIMIZE_FLAGS}
+ fi
+ 
++
++  if test "$GNU_CC"; then
++    MOZ_ENABLE_FRAME_PTR="-fno-omit-frame-pointer -funwind-tables"
++    MOZ_DISABLE_FRAME_PTR="-fomit-frame-pointer -funwind-tables"
++  else
++    case "$target" in
++        aarch64-windows*)
++      if test "$CC_TYPE" = "clang-cl"; then
++        MOZ_ENABLE_FRAME_PTR="-Xclang -mdisable-fp-elim"
++        MOZ_DISABLE_FRAME_PTR="-Xclang -mdisable-fp-elim"
++      else
++        MOZ_ENABLE_FRAME_PTR="-Oy-"
++        MOZ_DISABLE_FRAME_PTR="-Oy"
++      fi
++    ;;
++        *-mingw32*)
++      MOZ_ENABLE_FRAME_PTR="-Oy-"
++      MOZ_DISABLE_FRAME_PTR="-Oy"
++    ;;
++    esac
++  fi
++
++  # If we are debugging, profiling, using sanitizers, or on win32 we want a
++  # frame pointer.  It is not required to enable frame pointers on AArch64
++  # Windows, but we enable it for compatibility with ETW.
++  if test -z "$MOZ_OPTIMIZE" -o \
++          -n "$MOZ_PROFILING" -o \
++          -n "$MOZ_DEBUG" -o \
++          -n "$MOZ_MSAN" -o \
++          -n "$MOZ_ASAN" -o \
++          -n "$MOZ_UBSAN" -o \
++          "$OS_ARCH:$CPU_ARCH" = "WINNT:x86" -o \
++	  "$OS_ARCH:$CPU_ARCH" = "WINNT:aarch64"; then
++    MOZ_FRAMEPTR_FLAGS="$MOZ_ENABLE_FRAME_PTR"
++  else
++    MOZ_FRAMEPTR_FLAGS="$MOZ_DISABLE_FRAME_PTR"
++  fi
++
++
+ if test "$COMPILE_ENVIRONMENT"; then
+ if test -n "$MOZ_OPTIMIZE"; then
+     echo $ac_n "checking for valid C compiler optimization flags""... $ac_c" 1>&6
+-echo "configure:8916: checking for valid C compiler optimization flags" >&5
++echo "configure:10465: checking for valid C compiler optimization flags" >&5
+     _SAVE_CFLAGS=$CFLAGS
+     CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS"
+     cat > conftest.$ac_ext <<EOF
+-#line 8920 "configure"
++#line 10469 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int main() {
+ printf("Hello World\n");
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10476: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   _results=yes
+ else
+@@ -8956,6 +10505,11 @@ fi # COMPILE_ENVIRONMENT
+ 
+ 
+ 
++
++if test -z "$MOZ_ENABLE_WARNINGS_AS_ERRORS"; then
++   WARNINGS_AS_ERRORS=''
++fi
++
+ cat >> confdefs.pytmp <<\EOF
+     (''' MOZ_LOGGING ''', ' 1 ')
+ EOF
+@@ -9083,7 +10637,7 @@ if test -n "$ENABLE_CLANG_PLUGIN"; then
+     fi
+ 
+     echo $ac_n "checking for llvm-config""... $ac_c" 1>&6
+-echo "configure:9087: checking for llvm-config" >&5
++echo "configure:10641: checking for llvm-config" >&5
+     if test -z "$LLVMCONFIG"; then
+       if test -n "$CLANG_CL"; then
+           CXX_COMPILER="$(dirname "$CXX")/clang"
+@@ -9128,7 +10682,6 @@ echo "configure:9087: checking for llvm-
+             LLVM_REPLACE_CXXFLAGS="$LLVM_REPLACE_CXXFLAGS $arg"
+         done
+         LLVM_CXXFLAGS="$LLVM_REPLACE_CXXFLAGS"
+-                                LLVM_CXXFLAGS=`echo "$LLVM_CXXFLAGS"|sed -e 's/ \(-Xclang \|\)-std[:=]/ -Xclang -std=/'`
+ 
+         LLVM_REPLACE_LDFLAGS=''
+         for arg in $LLVM_LDFLAGS; do
+@@ -9145,6 +10698,142 @@ echo "configure:9087: checking for llvm-
+         CLANG_LDFLAGS="$CLANG_REPLACE_LDFLAGS"
+     fi
+ 
++                echo $ac_n "checking for new ASTMatcher API""... $ac_c" 1>&6
++echo "configure:10703: checking for new ASTMatcher API" >&5
++if eval "test \"`echo '$''{'ac_cv_have_new_ASTMatcher_names'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  
++            
++            ac_ext=C
++# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cxx_cross
++
++if test "$CC_TYPE" = "clang-cl"; then
++  ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5'
++fi
++
++            _SAVE_CXXFLAGS="$CXXFLAGS"
++            _SAVE_CPPFLAGS="$CPPFLAGS"
++            _SAVE_CXX="$CXX"
++            _SAVE_MACOSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET"
++            unset MACOSX_DEPLOYMENT_TARGET
++            CXXFLAGS="${LLVM_CXXFLAGS}"
++            CPPFLAGS=""
++            CXX="${HOST_CXX}"
++            cat > conftest.$ac_ext <<EOF
++#line 10729 "configure"
++#include "confdefs.h"
++#include "clang/ASTMatchers/ASTMatchers.h"
++int main() {
++clang::ast_matchers::cxxConstructExpr();
++; return 0; }
++EOF
++if { (eval echo configure:10736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  rm -rf conftest*
++  ac_cv_have_new_ASTMatcher_names="yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  ac_cv_have_new_ASTMatcher_names="no"
++fi
++rm -f conftest*
++            CXX="$_SAVE_CXX"
++            CPPFLAGS="$_SAVE_CPPFLAGS"
++            CXXFLAGS="$_SAVE_CXXFLAGS"
++            export MACOSX_DEPLOYMENT_TARGET="$_SAVE_MACOSX_DEPLOYMENT_TARGET"
++            ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
++
++if test "$CC_TYPE" = "clang-cl"; then
++  ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5'
++fi
++
++        
++fi
++
++echo "$ac_t""$ac_cv_have_new_ASTMatcher_names" 1>&6
++    if test "$ac_cv_have_new_ASTMatcher_names" = "yes"; then
++      LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DHAVE_NEW_ASTMATCHER_NAMES"
++    fi
++
++                echo $ac_n "checking for has with ignoringParenImpCasts""... $ac_c" 1>&6
++echo "configure:10770: checking for has with ignoringParenImpCasts" >&5
++if eval "test \"`echo '$''{'ac_cv_has_accepts_ignoringParenImpCasts'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  
++            
++            ac_ext=C
++# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cxx_cross
++
++if test "$CC_TYPE" = "clang-cl"; then
++  ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5'
++fi
++
++            _SAVE_CXXFLAGS="$CXXFLAGS"
++            _SAVE_CPPFLAGS="$CPPFLAGS"
++            _SAVE_CXX="$CXX"
++            _SAVE_MACOSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET"
++            unset MACOSX_DEPLOYMENT_TARGET
++            CXXFLAGS="${LLVM_CXXFLAGS}"
++            CPPFLAGS=""
++            CXX="${HOST_CXX}"
++            cat > conftest.$ac_ext <<EOF
++#line 10796 "configure"
++#include "confdefs.h"
++#include "clang/ASTMatchers/ASTMatchers.h"
++int main() {
++using namespace clang::ast_matchers;
++                            expr(has(ignoringParenImpCasts(declRefExpr())));
++                           
++; return 0; }
++EOF
++if { (eval echo configure:10805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  rm -rf conftest*
++  ac_cv_has_accepts_ignoringParenImpCasts="yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  ac_cv_has_accepts_ignoringParenImpCasts="no"
++fi
++rm -f conftest*
++            CXX="$_SAVE_CXX"
++            CPPFLAGS="$_SAVE_CPPFLAGS"
++            CXXFLAGS="$_SAVE_CXXFLAGS"
++            export MACOSX_DEPLOYMENT_TARGET="$_SAVE_MACOSX_DEPLOYMENT_TARGET"
++            ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
++
++if test "$CC_TYPE" = "clang-cl"; then
++  ac_link="$ac_compile"' && ${LINKER} -OUT:conftest${ac_exeext} $LDFLAGS conftest.obj $LIBS 1>&5'
++fi
++
++        
++fi
++
++echo "$ac_t""$ac_cv_has_accepts_ignoringParenImpCasts" 1>&6
++    if test "$ac_cv_has_accepts_ignoringParenImpCasts" = "yes"; then
++      LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DHAS_ACCEPTS_IGNORINGPARENIMPCASTS"
++    fi
++
+     CLANG_PLUGIN_FLAGS="-Xclang -load -Xclang $CLANG_PLUGIN -Xclang -add-plugin -Xclang moz-check"
+ 
+     cat >> confdefs.pytmp <<\EOF
+@@ -9187,9 +10876,34 @@ fi
+ 
+ 
+ 
+-
+ fi # COMPILE_ENVIRONMENT
+ 
++# Check whether --enable-strip or --disable-strip was given.
++if test "${enable_strip+set}" = set; then
++  enableval="$enable_strip"
++  if test "$enableval" = "yes"; then
++    ENABLE_STRIP=1
++  elif test "$enableval" = "no"; then
++    ENABLE_STRIP= 
++  else
++    { echo "configure: error: Option, strip, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, strip, does not take an argument ($enableval)." 1>&5; exit 1; }
++  fi
++fi
++
++
++# Check whether --enable-install-strip or --disable-install-strip was given.
++if test "${enable_install_strip+set}" = set; then
++  enableval="$enable_install_strip"
++  if test "$enableval" = "yes"; then
++    PKG_SKIP_STRIP= 
++  elif test "$enableval" = "no"; then
++    PKG_SKIP_STRIP=1
++  else
++    { echo "configure: error: Option, install-strip, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, install-strip, does not take an argument ($enableval)." 1>&5; exit 1; }
++  fi
++fi
++
++
+ 
+ # Check whether --enable-debug-js-modules or --disable-debug-js-modules was given.
+ if test "${enable_debug_js_modules+set}" = set; then
+@@ -9249,12 +10963,12 @@ fi
+     for ac_func in __cxa_demangle
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:9253: checking for $ac_func" >&5
++echo "configure:10967: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9258 "configure"
++#line 10972 "configure"
+ #define $ac_func innocuous_$ac_func
+ #include "confdefs.h"
+ #undef $ac_func
+@@ -9284,7 +10998,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -9354,12 +11068,12 @@ fi
+ 
+        ac_safe=`echo "unwind.h" | sed 'y%./+-%__p_%'`
+   echo $ac_n "checking for unwind.h""... $ac_c" 1>&6
+-echo "configure:9358: checking for unwind.h" >&5
++echo "configure:11072: checking for unwind.h" >&5
+   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+    cat > conftest.$ac_ext <<EOF
+-#line 9363 "configure"
++#line 11077 "configure"
+ #include "confdefs.h"
+ 
+ #include <unwind.h>
+@@ -9367,7 +11081,7 @@ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9371: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+@@ -9384,12 +11098,12 @@ fi
+     for ac_func in _Unwind_Backtrace
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:9388: checking for $ac_func" >&5
++echo "configure:11102: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9393 "configure"
++#line 11107 "configure"
+ #define $ac_func innocuous_$ac_func
+ #include "confdefs.h"
+ #undef $ac_func
+@@ -9421,7 +11135,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -9463,6 +11177,24 @@ fi
+ 
+ fi
+ 
++
++# Check whether --with-jitreport-granularity or --without-jitreport-granularity was given.
++if test "${with_jitreport_granularity+set}" = set; then
++  withval="$with_jitreport_granularity"
++  JITREPORT_GRANULARITY=$withval
++else
++  JITREPORT_GRANULARITY=3
++fi
++
++
++cat >> confdefs.pytmp <<EOF
++    (''' JS_DEFAULT_JITREPORT_GRANULARITY ''', r''' $JITREPORT_GRANULARITY ''')
++EOF
++cat >> confdefs.h <<EOF
++#define JS_DEFAULT_JITREPORT_GRANULARITY $JITREPORT_GRANULARITY
++EOF
++
++
+ # Misc. Options
+ 
+ # Check whether --with-user-appdir or --without-user-appdir was given.
+@@ -9489,7 +11221,7 @@ if test -z "$SKIP_COMPILER_CHECKS"; then
+ # Compiler Options
+ 
+ echo $ac_n "checking for -pipe support""... $ac_c" 1>&6
+-echo "configure:9493: checking for -pipe support" >&5
++echo "configure:11225: checking for -pipe support" >&5
+ if test -n "$GNU_CC" -a -n "$GNU_CXX"; then
+         CFLAGS="$CFLAGS -pipe"
+     CXXFLAGS="$CXXFLAGS -pipe"
+@@ -9500,6 +11232,13 @@ fi
+ 
+ fi # ! SKIP_COMPILER_CHECKS
+ 
++cat >> confdefs.pytmp <<\EOF
++    (''' CPP_THROW_NEW ''', r''' throw() ''')
++EOF
++cat >> confdefs.h <<\EOF
++#define CPP_THROW_NEW throw()
++EOF
++
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -9516,25 +11255,25 @@ if test "$COMPILE_ENVIRONMENT"; then
+ 
+ 
+ echo $ac_n "checking what kind of list files are supported by the linker""... $ac_c" 1>&6
+-echo "configure:9520: checking what kind of list files are supported by the linker" >&5
++echo "configure:11259: checking what kind of list files are supported by the linker" >&5
+ if eval "test \"`echo '$''{'EXPAND_LIBS_LIST_STYLE'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   echo "int main() {return 0;}" > conftest.${ac_ext}
+-                         if { ac_try='${CC-cc} -o conftest.${OBJ_SUFFIX} -c $MOZ_LTO_CFLAGS $CFLAGS $CPPFLAGS conftest.${ac_ext} 1>&5'; { (eval echo configure:9525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.${OBJ_SUFFIX}; then
++                         if { ac_try='${CC-cc} -o conftest.${OBJ_SUFFIX} -c $MOZ_LTO_CFLAGS $CFLAGS $CPPFLAGS conftest.${ac_ext} 1>&5'; { (eval echo configure:11264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.${OBJ_SUFFIX}; then
+          echo "INPUT(conftest.${OBJ_SUFFIX})" > conftest.list
+          if test "$CC_TYPE" = "clang-cl"; then
+              link="$LINKER -OUT:conftest${ac_exeext}"
+          else
+              link="${CC-cc} -o conftest${ac_exeext}"
+          fi
+-         if { ac_try='$link $MOZ_LTO_LDFLAGS $LDFLAGS conftest.list $LIBS 1>&5'; { (eval echo configure:9532: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then
++         if { ac_try='$link $MOZ_LTO_LDFLAGS $LDFLAGS conftest.list $LIBS 1>&5'; { (eval echo configure:11271: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then
+              EXPAND_LIBS_LIST_STYLE=linkerscript
+          else
+              echo "conftest.${OBJ_SUFFIX}" > conftest.list
+-                                                                 if { ac_try='$link $MOZ_LTO_LDFLAGS $LDFLAGS -Wl,-filelist,conftest.list $LIBS 1>&5'; { (eval echo configure:9536: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then
++                                                                 if { ac_try='$link $MOZ_LTO_LDFLAGS $LDFLAGS -Wl,-filelist,conftest.list $LIBS 1>&5'; { (eval echo configure:11275: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then
+                  EXPAND_LIBS_LIST_STYLE=filelist
+-             elif { ac_try='$link $MOZ_LTO_LDFLAGS $LDFLAGS @conftest.list $LIBS 1>&5'; { (eval echo configure:9538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then
++             elif { ac_try='$link $MOZ_LTO_LDFLAGS $LDFLAGS @conftest.list $LIBS 1>&5'; { (eval echo configure:11277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then
+                  EXPAND_LIBS_LIST_STYLE=list
+              else
+                  { echo "configure: error: Couldn't find one that works" 1>&2; echo "configure: error: Couldn't find one that works" 1>&5; exit 1; }
+@@ -9556,7 +11295,7 @@ fi # COMPILE_ENVIRONMENT
+ # Static build options
+ 
+ if test -z "$MOZ_SYSTEM_ZLIB"; then
+-if test -n "$JS_SHARED_LIBRARY" -o -n "$MOZ_LINKER" -o "$MOZ_WIDGET_TOOLKIT" = android; then
++if test -n "$JS_SHARED_LIBRARY" -o -n "$MOZ_LINKER"; then
+   ZLIB_IN_MOZGLUE=1
+   cat >> confdefs.pytmp <<\EOF
+     (''' ZLIB_IN_MOZGLUE ''', ' 1 ')
+@@ -9587,19 +11326,19 @@ if test -z "${GLIB_CFLAGS}" -o -z "${GLI
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+         echo $ac_n "checking for glib-2.0 >= 1.3.7 gobject-2.0""... $ac_c" 1>&6
+-echo "configure:9591: checking for glib-2.0 >= 1.3.7 gobject-2.0" >&5
++echo "configure:11330: checking for glib-2.0 >= 1.3.7 gobject-2.0" >&5
+ 
+         if $PKG_CONFIG --exists "glib-2.0 >= 1.3.7 gobject-2.0" ; then
+             echo "$ac_t""yes" 1>&6
+             succeeded=yes
+ 
+             echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6
+-echo "configure:9598: checking GLIB_CFLAGS" >&5
++echo "configure:11337: checking GLIB_CFLAGS" >&5
+             GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 1.3.7 gobject-2.0"`
+             echo "$ac_t""$GLIB_CFLAGS" 1>&6
+ 
+             echo $ac_n "checking GLIB_LIBS""... $ac_c" 1>&6
+-echo "configure:9603: checking GLIB_LIBS" >&5
++echo "configure:11342: checking GLIB_LIBS" >&5
+             ## Remove evil flags like -Wl,--export-dynamic
+             GLIB_LIBS="`$PKG_CONFIG --libs \"glib-2.0 >= 1.3.7 gobject-2.0\" |sed s/-Wl,--export-dynamic//g`"
+             echo "$ac_t""$GLIB_LIBS" 1>&6
+@@ -9650,12 +11389,12 @@ if test "$USE_FC_FREETYPE"; then
+             CFLAGS="$CFLAGS $FT2_CFLAGS"
+ 
+             echo $ac_n "checking for FT_Bitmap_Size.y_ppem""... $ac_c" 1>&6
+-echo "configure:9654: checking for FT_Bitmap_Size.y_ppem" >&5
++echo "configure:11393: checking for FT_Bitmap_Size.y_ppem" >&5
+ if eval "test \"`echo '$''{'ac_cv_member_FT_Bitmap_Size_y_ppem'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9659 "configure"
++#line 11398 "configure"
+ #include "confdefs.h"
+ #include <ft2build.h>
+                                  #include FT_FREETYPE_H
+@@ -9665,7 +11404,7 @@ FT_Bitmap_Size s;
+                                  return 1
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9669: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11408: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_member_FT_Bitmap_Size_y_ppem=yes
+ else
+@@ -9694,12 +11433,12 @@ EOF
+             for ac_func in FT_GlyphSlot_Embolden FT_Load_Sfnt_Table
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:9698: checking for $ac_func" >&5
++echo "configure:11437: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9703 "configure"
++#line 11442 "configure"
+ #define $ac_func innocuous_$ac_func
+ #include "confdefs.h"
+ #undef $ac_func
+@@ -9726,7 +11465,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -9764,12 +11503,12 @@ done
+   do
+        ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:9768: checking for $ac_hdr" >&5
++echo "configure:11507: checking for $ac_hdr" >&5
+   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+    cat > conftest.$ac_ext <<EOF
+-#line 9773 "configure"
++#line 11512 "configure"
+ #include "confdefs.h"
+ #include <fontconfig/fontconfig.h>
+ #include <$ac_hdr>
+@@ -9777,7 +11516,7 @@ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9781: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+@@ -9864,19 +11603,19 @@ else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+         echo $ac_n "checking for pixman-1 >= 0.19.2""... $ac_c" 1>&6
+-echo "configure:9868: checking for pixman-1 >= 0.19.2" >&5
++echo "configure:11607: checking for pixman-1 >= 0.19.2" >&5
+ 
+         if $PKG_CONFIG --exists "pixman-1 >= 0.19.2" ; then
+             echo "$ac_t""yes" 1>&6
+             succeeded=yes
+ 
+             echo $ac_n "checking MOZ_PIXMAN_CFLAGS""... $ac_c" 1>&6
+-echo "configure:9875: checking MOZ_PIXMAN_CFLAGS" >&5
++echo "configure:11614: checking MOZ_PIXMAN_CFLAGS" >&5
+             MOZ_PIXMAN_CFLAGS=`$PKG_CONFIG --cflags "pixman-1 >= 0.19.2"`
+             echo "$ac_t""$MOZ_PIXMAN_CFLAGS" 1>&6
+ 
+             echo $ac_n "checking MOZ_PIXMAN_LIBS""... $ac_c" 1>&6
+-echo "configure:9880: checking MOZ_PIXMAN_LIBS" >&5
++echo "configure:11619: checking MOZ_PIXMAN_LIBS" >&5
+             ## Remove evil flags like -Wl,--export-dynamic
+             MOZ_PIXMAN_LIBS="`$PKG_CONFIG --libs \"pixman-1 >= 0.19.2\" |sed s/-Wl,--export-dynamic//g`"
+             echo "$ac_t""$MOZ_PIXMAN_LIBS" 1>&6
+@@ -9955,12 +11694,12 @@ case "$MOZ_WIDGET_TOOLKIT" in
+     if test "$COMPILE_ENVIRONMENT"; then
+          ac_safe=`echo "d3d10.h" | sed 'y%./+-%__p_%'`
+   echo $ac_n "checking for d3d10.h""... $ac_c" 1>&6
+-echo "configure:9959: checking for d3d10.h" >&5
++echo "configure:11698: checking for d3d10.h" >&5
+   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+    cat > conftest.$ac_ext <<EOF
+-#line 9964 "configure"
++#line 11703 "configure"
+ #include "confdefs.h"
+ 
+ #include <d3d10.h>
+@@ -9968,7 +11707,7 @@ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+@@ -10071,7 +11810,9 @@ if test "$MOZ_WIDGET_TOOLKIT"; then
+ 
+   case "$OS_TARGET" in
+     Darwin)
+-      NECKO_WIFI=1
++      if test -z "$MOZ_IOS"; then
++	NECKO_WIFI=1
++      fi
+       ;;
+     DragonFly|FreeBSD|WINNT)
+       NECKO_WIFI=1
+@@ -10113,6 +11854,35 @@ fi
+ 
+ 
+ 
++# Check whether --enable-cookies or --disable-cookies was given.
++if test "${enable_cookies+set}" = set; then
++  enableval="$enable_cookies"
++  if test "$enableval" = "no"; then
++    NECKO_COOKIES=
++  elif test "$enableval" = "yes"; then
++    NECKO_COOKIES=1
++  else
++    { echo "configure: error: Option, cookies, does not take an argument ($enableval)." 1>&2; echo "configure: error: Option, cookies, does not take an argument ($enableval)." 1>&5; exit 1; }
++  fi
++fi
++
++
++if test "$NECKO_COOKIES"; then
++    cat >> confdefs.pytmp <<\EOF
++    (''' NECKO_COOKIES ''', ' 1 ')
++EOF
++cat >> confdefs.h <<\EOF
++#define NECKO_COOKIES 1
++EOF
++
++    _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_COOKIES"
++fi
++
++
++
++
++
++
+ 
+ 
+ 
+@@ -10239,6 +12009,15 @@ MOZ_CHILD_PROCESS_BUNDLENAME="${MOZ_APP_
+ # "Profile" field, which controls profile location.
+ # - MOZ_APP_ID: When set, used for application.ini's "ID" field, and
+ # crash reporter server url.
++# - MOZ_APP_ANDROID_VERSION_CODE: On Android, "android:versionCode" for
++# the main application is set to the value of this variable.  If not
++# set, it falls back to a Mozilla-specific value derived from the
++# build ID.
++# - MOZ_ANDROID_SHARED_ID: On Android, "android:sharedUserId" for all Android
++# packages produced.
++# - MOZ_ANDROID_GCM_SENDERID: On Android, the Android GCM Sender ID used.  GCM
++# sender IDs are not sensitive: see, http://stackoverflow.com/a/18216063.
++# - MOZ_MMA_GCM_SENDERID: This GCM Sender ID is used for MMA integration.
+ # - MOZ_PROFILE_MIGRATOR: When set, enables profile migrator.
+ 
+ # The following environment variables used to have an effect, but don't anymore:
+@@ -10275,6 +12054,14 @@ if test -z "$ANDROID_PACKAGE_NAME" ; the
+    fi
+ fi
+ 
++# Mozilla released Firefox for Android {Release,Beta} and {Aurora,Nightly} to
++# the public with specific common shared IDs and we need to keep them
++# consistent forever.  The specific common values are set by per-channel
++# branding; all other channels use a generic sharedID, set below.
++if test -z "$MOZ_ANDROID_SHARED_ID" ; then
++   MOZ_ANDROID_SHARED_ID="${ANDROID_PACKAGE_NAME}.sharedID"
++fi
++
+ # For extensions and langpacks, we require a max version that is compatible
+ # across security releases. MOZ_APP_MAXVERSION is our method for doing that.
+ # 24.0a1 and 24.0a2 aren't affected
+@@ -10303,6 +12090,10 @@ fi
+ 
+ 
+ 
++
++
++
++
+ cat >> confdefs.pytmp <<EOF
+     (''' MOZ_APP_UA_NAME ''', r''' "$MOZ_APP_UA_NAME" ''')
+ EOF
+@@ -10359,7 +12150,7 @@ fi
+ 
+ 
+ 
+-if test -n "$MOZ_TELEMETRY_REPORTING" || test -n "$MOZ_SERVICES_HEALTHREPORT" || test -n "$MOZ_CRASHREPORTER"  || test -n "$MOZ_NORMANDY"; then
++if test -n "$MOZ_TELEMETRY_REPORTING" || test -n "$MOZ_SERVICES_HEALTHREPORT" || test -n "$MOZ_CRASHREPORTER"; then
+   MOZ_DATA_REPORTING=1
+   cat >> confdefs.pytmp <<\EOF
+     (''' MOZ_DATA_REPORTING ''', ' 1 ')
+@@ -10374,6 +12165,199 @@ fi
+ 
+ 
+ 
++
++_INTL_API=yes
++
++if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then
++    USE_ICU=1
++fi
++
++
++
++MOZ_SYSTEM_ICU=
++# Check whether --with-system-icu or --without-system-icu was given.
++if test "${with_system_icu+set}" = set; then
++  withval="$with_system_icu"
++  if test "$withval" = "yes"; then
++    MOZ_SYSTEM_ICU=1
++  elif test "$withval" = "no"; then
++    :
++  else
++    { echo "configure: error: Option, system-icu, does not take an argument ($withval)." 1>&2; echo "configure: error: Option, system-icu, does not take an argument ($withval)." 1>&5; exit 1; }
++  fi
++fi
++
++
++if test -n "$MOZ_SYSTEM_ICU"; then
++    succeeded=no
++
++  if test -z "$PKG_CONFIG"; then
++     echo "*** The pkg-config script could not be found. Make sure it is"
++     echo "*** in your path, or set the PKG_CONFIG environment variable"
++     echo "*** to the full path to pkg-config."
++     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++  else
++     PKG_CONFIG_MIN_VERSION=0.9.0
++     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++        echo $ac_n "checking for icu-i18n >= 63.1""... $ac_c" 1>&6
++echo "configure:12204: checking for icu-i18n >= 63.1" >&5
++
++        if $PKG_CONFIG --exists "icu-i18n >= 63.1" ; then
++            echo "$ac_t""yes" 1>&6
++            succeeded=yes
++
++            echo $ac_n "checking MOZ_ICU_CFLAGS""... $ac_c" 1>&6
++echo "configure:12211: checking MOZ_ICU_CFLAGS" >&5
++            MOZ_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-i18n >= 63.1"`
++            echo "$ac_t""$MOZ_ICU_CFLAGS" 1>&6
++
++            echo $ac_n "checking MOZ_ICU_LIBS""... $ac_c" 1>&6
++echo "configure:12216: checking MOZ_ICU_LIBS" >&5
++            ## Remove evil flags like -Wl,--export-dynamic
++            MOZ_ICU_LIBS="`$PKG_CONFIG --libs \"icu-i18n >= 63.1\" |sed s/-Wl,--export-dynamic//g`"
++            echo "$ac_t""$MOZ_ICU_LIBS" 1>&6
++        else
++            MOZ_ICU_CFLAGS=""
++            MOZ_ICU_LIBS=""
++            ## If we have a custom action on failure, don't print errors, but 
++            ## do set a variable so people can do so.
++            MOZ_ICU_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "icu-i18n >= 63.1"`
++            echo $MOZ_ICU_PKG_ERRORS
++        fi
++
++        
++        
++     else
++        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
++        echo "*** See http://www.freedesktop.org/software/pkgconfig"
++     fi
++  fi
++
++  if test $succeeded = yes; then
++     :
++  else
++     if test "$COMPILE_ENVIRONMENT"; then 
++       { echo "configure: error: Library requirements (icu-i18n >= 63.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; echo "configure: error: Library requirements (icu-i18n >= 63.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&5; exit 1; }
++     fi
++  fi
++
++    CFLAGS="$CFLAGS $MOZ_ICU_CFLAGS"
++    CXXFLAGS="$CXXFLAGS $MOZ_ICU_CFLAGS"
++    cat >> confdefs.pytmp <<\EOF
++    (''' MOZ_SYSTEM_ICU ''', ' 1 ')
++EOF
++cat >> confdefs.h <<\EOF
++#define MOZ_SYSTEM_ICU 1
++EOF
++
++fi
++
++
++
++# Check whether --with-intl-api or --without-intl-api was given.
++if test "${with_intl_api+set}" = set; then
++  withval="$with_intl_api"
++  _INTL_API=$withval
++fi
++
++
++ENABLE_INTL_API=
++EXPOSE_INTL_API=
++case "$_INTL_API" in
++no)
++    ;;
++build)
++    ENABLE_INTL_API=1
++    ;;
++yes)
++    ENABLE_INTL_API=1
++    EXPOSE_INTL_API=1
++    ;;
++*)
++    { echo "configure: error: Invalid value passed to --with-intl-api: $_INTL_API" 1>&2; echo "configure: error: Invalid value passed to --with-intl-api: $_INTL_API" 1>&5; exit 1; }
++    ;;
++esac
++
++if test -n "$ENABLE_INTL_API"; then
++    USE_ICU=1
++fi
++
++if test -n "$EXPOSE_INTL_API"; then
++    cat >> confdefs.pytmp <<\EOF
++    (''' EXPOSE_INTL_API ''', ' 1 ')
++EOF
++cat >> confdefs.h <<\EOF
++#define EXPOSE_INTL_API 1
++EOF
++
++fi
++
++if test -n "$ENABLE_INTL_API"; then
++    cat >> confdefs.pytmp <<\EOF
++    (''' ENABLE_INTL_API ''', ' 1 ')
++EOF
++cat >> confdefs.h <<\EOF
++#define ENABLE_INTL_API 1
++EOF
++
++fi
++
++if test -n "$USE_ICU"; then
++    icudir="$_topsrcdir/intl/icu/source"
++    if test ! -d "$icudir"; then
++        icudir="$_topsrcdir/../../intl/icu/source"
++        if test ! -d "$icudir"; then
++            { echo "configure: error: Cannot find the ICU directory" 1>&2; echo "configure: error: Cannot find the ICU directory" 1>&5; exit 1; }
++        fi
++    fi
++
++    version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
++    if test x"$version" = x; then
++       { echo "configure: error: cannot determine icu version number from uvernum.h header file $lineno" 1>&2; echo "configure: error: cannot determine icu version number from uvernum.h header file $lineno" 1>&5; exit 1; }
++    fi
++    MOZ_ICU_VERSION="$version"
++
++    # TODO: the l is actually endian-dependent
++    # We could make this set as 'l' or 'b' for little or big, respectively,
++    # but we'd need to check in a big-endian version of the file.
++    ICU_DATA_FILE="icudt${version}l.dat"
++fi
++
++
++
++
++
++
++if test -n "$USE_ICU"; then
++            cat >> confdefs.pytmp <<\EOF
++    (''' U_USING_ICU_NAMESPACE ''', r''' 0 ''')
++EOF
++cat >> confdefs.h <<\EOF
++#define U_USING_ICU_NAMESPACE 0
++EOF
++
++
++    if test -z "$MOZ_SYSTEM_ICU"; then
++        case "$OS_TARGET:$CPU_ARCH" in
++        WINNT:aarch64)
++                        ;;
++        *)
++            if test -z "$YASM" -a -z "$GNU_AS" -a "$COMPILE_ENVIRONMENT"; then
++                { echo "configure: error: Building ICU requires either yasm or a GNU assembler. If you do not have either of those available for this platform you must use --without-intl-api" 1>&2; echo "configure: error: Building ICU requires either yasm or a GNU assembler. If you do not have either of those available for this platform you must use --without-intl-api" 1>&5; exit 1; }
++            fi
++            ;;
++        esac
++                cat >> confdefs.pytmp <<\EOF
++    (''' U_STATIC_IMPLEMENTATION ''', ' 1 ')
++EOF
++cat >> confdefs.h <<\EOF
++#define U_STATIC_IMPLEMENTATION 1
++EOF
++
++    fi
++fi
++
++
+ CFLAGS=`echo \
+     $_COMPILATION_CFLAGS \
+     $CFLAGS`
+@@ -10406,6 +12390,10 @@ HOST_CXXFLAGS=`echo \
+ 
+ 
+ 
++
++
++
++
+ HOST_CMFLAGS="-x objective-c -fobjc-exceptions"
+ HOST_CMMFLAGS="-x objective-c++ -fobjc-exceptions"
+ OS_COMPILE_CMFLAGS="-x objective-c -fobjc-exceptions"
+@@ -10468,16 +12456,18 @@ OS_LIBS="$LIBS"
+ 
+ 
+ 
++
++
+ if test -n "$COMPILE_ENVIRONMENT"; then
+ for ac_func in posix_fadvise posix_fallocate
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:10476: checking for $ac_func" >&5
++echo "configure:12466: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10481 "configure"
++#line 12471 "configure"
+ #define $ac_func innocuous_$ac_func
+ #include "confdefs.h"
+ #undef $ac_func
+@@ -10504,7 +12494,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -10536,7 +12526,7 @@ if test "$MOZ_X11"; then
+                 _SAVE_CFLAGS=$CFLAGS
+     CFLAGS="$CFLAGS $XCFLAGS"
+     cat > conftest.$ac_ext <<EOF
+-#line 10540 "configure"
++#line 12530 "configure"
+ #include "confdefs.h"
+ 
+         #include <stdio.h>
+@@ -10555,7 +12545,7 @@ int main() {
+     
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10559: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:12549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+@@ -10637,6 +12627,7 @@ fi
+ 
+ 
+ _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES
++CPP_THROW_NEW
+ HAVE_GETPAGESIZE
+ HAVE_STATVFS64
+ HAVE_STATVFS
+@@ -10760,7 +12751,10 @@ sed 's/$/,/' >> $CONFIG_STATUS <<EOF
+     (''' build_cpu ''', r''' $build_cpu ''')
+     (''' build_vendor ''', r''' $build_vendor ''')
+     (''' build_os ''', r''' $build_os ''')
++    (''' ANDROID_PLATFORM ''', r''' $ANDROID_PLATFORM ''')
+     (''' OBJCOPY ''', r''' $OBJCOPY ''')
++    (''' MOZ_IOS ''', r''' $MOZ_IOS ''')
++    (''' ANDROID_SOURCE ''', r''' $ANDROID_SOURCE ''')
+     (''' ANDROID_PACKAGE_NAME ''', r''' $ANDROID_PACKAGE_NAME ''')
+     (''' CC ''', r''' $CC ''')
+     (''' CXX ''', r''' $CXX ''')
+@@ -10799,9 +12793,11 @@ sed 's/$/,/' >> $CONFIG_STATUS <<EOF
+     (''' MOZ_LINKER ''', r''' $MOZ_LINKER ''')
+     (''' XZ ''', r''' $XZ ''')
+     (''' MOZ_NO_DEBUG_RTL ''', r''' $MOZ_NO_DEBUG_RTL ''')
++    (''' MOZ_DEBUG_DEFINES ''', list(split(r''' $MOZ_DEBUG_DEFINES ''')))
+     (''' LD_PRINT_ICF_SECTIONS ''', r''' $LD_PRINT_ICF_SECTIONS ''')
+     (''' MOZ_PROGRAM_LDFLAGS ''', r''' $MOZ_PROGRAM_LDFLAGS ''')
+     (''' MOZ_NEEDS_LIBATOMIC ''', r''' $MOZ_NEEDS_LIBATOMIC ''')
++    (''' HAVE_DTRACE ''', r''' $HAVE_DTRACE ''')
+     (''' XCFLAGS ''', list(split(r''' $XCFLAGS ''')))
+     (''' XLDFLAGS ''', list(split(r''' $XLDFLAGS ''')))
+     (''' XLIBS ''', list(split(r''' $XLIBS ''')))
+@@ -10810,10 +12806,26 @@ sed 's/$/,/' >> $CONFIG_STATUS <<EOF
+     (''' MOZ_USE_PTHREADS ''', r''' $MOZ_USE_PTHREADS ''')
+     (''' HAVE_CLOCK_MONOTONIC ''', r''' $HAVE_CLOCK_MONOTONIC ''')
+     (''' REALTIME_LIBS ''', list(split(r''' $REALTIME_LIBS ''')))
++    (''' MOZ_BUILD_NSPR ''', r''' $MOZ_BUILD_NSPR ''')
++    (''' JS_POSIX_NSPR ''', r''' $JS_POSIX_NSPR ''')
++    (''' NSPR_CONFIG ''', r''' $NSPR_CONFIG ''')
++    (''' NSPR_CFLAGS ''', list(split(r''' $NSPR_CFLAGS ''')))
++    (''' NSPR_LIBS ''', list(split(r''' $NSPR_LIBS ''')))
++    (''' NSPR_INCLUDE_DIR ''', r''' $NSPR_INCLUDE_DIR ''')
++    (''' NSPR_LIB_DIR ''', r''' $NSPR_LIB_DIR ''')
++    (''' PKGCONF_REQUIRES_PRIVATE ''', r''' $PKGCONF_REQUIRES_PRIVATE ''')
+     (''' MOZ_LIBEVENT_CFLAGS ''', list(split(r''' $MOZ_LIBEVENT_CFLAGS ''')))
+     (''' MOZ_LIBEVENT_LIBS ''', list(split(r''' $MOZ_LIBEVENT_LIBS ''')))
+     (''' MOZ_SYSTEM_LIBEVENT ''', r''' $MOZ_SYSTEM_LIBEVENT ''')
++    (''' NSS_CONFIG ''', r''' $NSS_CONFIG ''')
++    (''' NSS_CFLAGS ''', list(split(r''' $NSS_CFLAGS ''')))
++    (''' NSS_LIBS ''', list(split(r''' $NSS_LIBS ''')))
++    (''' MOZ_ZLIB_CFLAGS ''', list(split(r''' $MOZ_ZLIB_CFLAGS ''')))
++    (''' MOZ_ZLIB_LIBS ''', list(split(r''' $MOZ_ZLIB_LIBS ''')))
++    (''' MOZ_SYSTEM_ZLIB ''', r''' $MOZ_SYSTEM_ZLIB ''')
+     (''' MOZ_ANDROID_DISTRIBUTION_DIRECTORY ''', r''' $MOZ_ANDROID_DISTRIBUTION_DIRECTORY ''')
++    (''' EARLY_BETA_OR_EARLIER ''', r''' $EARLY_BETA_OR_EARLIER ''')
++    (''' MOZ_PHOENIX ''', r''' $MOZ_PHOENIX ''')
+     (''' MOZ_ANDROID_MIN_SDK_VERSION ''', r''' $MOZ_ANDROID_MIN_SDK_VERSION ''')
+     (''' MOZ_ANDROID_MAX_SDK_VERSION ''', r''' $MOZ_ANDROID_MAX_SDK_VERSION ''')
+     (''' MOZ_GTK3_CFLAGS ''', list(split(r''' $MOZ_GTK3_CFLAGS ''')))
+@@ -10821,8 +12833,13 @@ sed 's/$/,/' >> $CONFIG_STATUS <<EOF
+     (''' MOZ_GTK2_CFLAGS ''', list(split(r''' $MOZ_GTK2_CFLAGS ''')))
+     (''' MOZ_GTK2_LIBS ''', list(split(r''' $MOZ_GTK2_LIBS ''')))
+     (''' MOZ_FS_LAYOUT ''', r''' $MOZ_FS_LAYOUT ''')
++    (''' MOZ_STARTUP_NOTIFICATION_CFLAGS ''', list(split(r''' $MOZ_STARTUP_NOTIFICATION_CFLAGS ''')))
++    (''' MOZ_STARTUP_NOTIFICATION_LIBS ''', list(split(r''' $MOZ_STARTUP_NOTIFICATION_LIBS ''')))
++    (''' MOZ_ENABLE_STARTUP_NOTIFICATION ''', r''' $MOZ_ENABLE_STARTUP_NOTIFICATION ''')
+     (''' TK_CFLAGS ''', list(split(r''' $TK_CFLAGS ''')))
+     (''' TK_LIBS ''', list(split(r''' $TK_LIBS ''')))
++    (''' MOC ''', r''' $MOC ''')
++    (''' RCC ''', r''' $RCC ''')
+     (''' MOZ_OFFICIAL_BRANDING ''', r''' $MOZ_OFFICIAL_BRANDING ''')
+     (''' MOZ_BRANDING_DIRECTORY ''', r''' $MOZ_BRANDING_DIRECTORY ''')
+     (''' MOZ_DISTRIBUTION_ID ''', r''' $MOZ_DISTRIBUTION_ID ''')
+@@ -10844,8 +12861,12 @@ sed 's/$/,/' >> $CONFIG_STATUS <<EOF
+     (''' MOZ_DISABLE_PARENTAL_CONTROLS ''', r''' $MOZ_DISABLE_PARENTAL_CONTROLS ''')
+     (''' MOZ_NO_SMART_CARDS ''', r''' $MOZ_NO_SMART_CARDS ''')
+     (''' MOZ_SANDBOX ''', r''' $MOZ_SANDBOX ''')
++    (''' SQLITE_CFLAGS ''', list(split(r''' $SQLITE_CFLAGS ''')))
++    (''' SQLITE_LIBS ''', list(split(r''' $SQLITE_LIBS ''')))
++    (''' MOZ_SYSTEM_SQLITE ''', r''' $MOZ_SYSTEM_SQLITE ''')
+     (''' MOZ_ZIPWRITER ''', r''' $MOZ_ZIPWRITER ''')
+     (''' MOZ_GFX_OPTIMIZE_MOBILE ''', r''' $MOZ_GFX_OPTIMIZE_MOBILE ''')
++    (''' MOZ_FRAMEPTR_FLAGS ''', list(split(r''' $MOZ_FRAMEPTR_FLAGS ''')))
+     (''' MOZ_OPTIMIZE_FLAGS ''', list(split(r''' $MOZ_OPTIMIZE_FLAGS ''')))
+     (''' MOZ_OPTIMIZE_LDFLAGS ''', list(split(r''' $MOZ_OPTIMIZE_LDFLAGS ''')))
+     (''' MOZ_PGO_OPTIMIZE_FLAGS ''', list(split(r''' $MOZ_PGO_OPTIMIZE_FLAGS ''')))
+@@ -10855,7 +12876,6 @@ sed 's/$/,/' >> $CONFIG_STATUS <<EOF
+     (''' LLVM_LDFLAGS ''', list(split(r''' $LLVM_LDFLAGS ''')))
+     (''' CLANG_LDFLAGS ''', list(split(r''' $CLANG_LDFLAGS ''')))
+     (''' ENABLE_CLANG_PLUGIN ''', r''' $ENABLE_CLANG_PLUGIN ''')
+-    (''' ENABLE_CLANG_PLUGIN_ALPHA ''', r''' $ENABLE_CLANG_PLUGIN_ALPHA ''')
+     (''' ENABLE_MOZSEARCH_PLUGIN ''', r''' $ENABLE_MOZSEARCH_PLUGIN ''')
+     (''' DEBUG_JS_MODULES ''', r''' $DEBUG_JS_MODULES ''')
+     (''' MOZ_DISABLE_STARTUPCACHE ''', r''' $MOZ_DISABLE_STARTUPCACHE ''')
+@@ -10897,6 +12917,7 @@ sed 's/$/,/' >> $CONFIG_STATUS <<EOF
+     (''' MOZ_XUL ''', r''' $MOZ_XUL ''')
+     (''' NECKO_WIFI ''', r''' $NECKO_WIFI ''')
+     (''' NECKO_WIFI_DBUS ''', r''' $NECKO_WIFI_DBUS ''')
++    (''' NECKO_COOKIES ''', r''' $NECKO_COOKIES ''')
+     (''' NM ''', r''' $NM ''')
+     (''' ASFLAGS ''', list(split(r''' $ASFLAGS ''')))
+     (''' RCFLAGS ''', r''' $RCFLAGS ''')
+@@ -10905,6 +12926,7 @@ sed 's/$/,/' >> $CONFIG_STATUS <<EOF
+     (''' MOZ_AUTH_EXTENSION ''', r''' $MOZ_AUTH_EXTENSION ''')
+     (''' MOZ_PREF_EXTENSIONS ''', r''' $MOZ_PREF_EXTENSIONS ''')
+     (''' MOZ_DEBUG_LDFLAGS ''', list(split(r''' $MOZ_DEBUG_LDFLAGS ''')))
++    (''' WARNINGS_AS_ERRORS ''', r''' $WARNINGS_AS_ERRORS ''')
+     (''' WARNINGS_CFLAGS ''', list(split(r''' $WARNINGS_CFLAGS ''')))
+     (''' MOZ_EXTENSIONS ''', unique_list(split(r''' $MOZ_EXTENSIONS ''')))
+     (''' MOZ_UNIVERSALCHARDET ''', r''' $MOZ_UNIVERSALCHARDET ''')
+@@ -10913,10 +12935,14 @@ sed 's/$/,/' >> $CONFIG_STATUS <<EOF
+     (''' MOZ_CRASHREPORTER ''', r''' $MOZ_CRASHREPORTER ''')
+     (''' MOZ_CRASHREPORTER_INJECTOR ''', r''' $MOZ_CRASHREPORTER_INJECTOR ''')
+     (''' MOZ_STUB_INSTALLER ''', r''' $MOZ_STUB_INSTALLER ''')
++    (''' MOZ_ENABLE_SIGNMAR ''', r''' $MOZ_ENABLE_SIGNMAR ''')
+     (''' MOZ_UPDATER ''', r''' $MOZ_UPDATER ''')
+     (''' MOZ_ANDROID_APPLICATION_CLASS ''', r''' $MOZ_ANDROID_APPLICATION_CLASS ''')
+     (''' MOZ_ANDROID_BROWSER_INTENT_CLASS ''', r''' $MOZ_ANDROID_BROWSER_INTENT_CLASS ''')
+     (''' MOZ_EXCLUDE_HYPHENATION_DICTIONARIES ''', r''' $MOZ_EXCLUDE_HYPHENATION_DICTIONARIES ''')
++    (''' ENABLE_STRIP ''', r''' $ENABLE_STRIP ''')
++    (''' PKG_SKIP_STRIP ''', r''' $PKG_SKIP_STRIP ''')
++    (''' STRIP_FLAGS ''', r''' $STRIP_FLAGS ''')
+     (''' INCREMENTAL_LINKER ''', r''' $INCREMENTAL_LINKER ''')
+     (''' MOZ_FIX_LINK_PATHS ''', list(split(r''' $MOZ_FIX_LINK_PATHS ''')))
+     (''' MOZ_POST_PROGRAM_COMMAND ''', r''' $MOZ_POST_PROGRAM_COMMAND ''')
+@@ -10934,6 +12960,10 @@ sed 's/$/,/' >> $CONFIG_STATUS <<EOF
+     (''' MOZ_APP_VENDOR ''', r''' $MOZ_APP_VENDOR ''')
+     (''' MOZ_APP_PROFILE ''', r''' $MOZ_APP_PROFILE ''')
+     (''' MOZ_APP_ID ''', r''' $MOZ_APP_ID ''')
++    (''' MOZ_APP_ANDROID_VERSION_CODE ''', r''' $MOZ_APP_ANDROID_VERSION_CODE ''')
++    (''' MOZ_ANDROID_SHARED_ID ''', r''' $MOZ_ANDROID_SHARED_ID ''')
++    (''' MOZ_ANDROID_GCM_SENDERID ''', r''' $MOZ_ANDROID_GCM_SENDERID ''')
++    (''' MOZ_MMA_GCM_SENDERID ''', r''' $MOZ_MMA_GCM_SENDERID ''')
+     (''' MAR_CHANNEL_ID ''', r''' $MAR_CHANNEL_ID ''')
+     (''' ACCEPTED_MAR_CHANNEL_IDS ''', r''' $ACCEPTED_MAR_CHANNEL_IDS ''')
+     (''' MOZ_PROFILE_MIGRATOR ''', r''' $MOZ_PROFILE_MIGRATOR ''')
+@@ -10948,9 +12978,18 @@ sed 's/$/,/' >> $CONFIG_STATUS <<EOF
+     (''' MOZ_DATA_REPORTING ''', r''' $MOZ_DATA_REPORTING ''')
+     (''' WIN32_REDIST_DIR ''', r''' $WIN32_REDIST_DIR ''')
+     (''' WIN_UCRT_REDIST_DIR ''', r''' $WIN_UCRT_REDIST_DIR ''')
++    (''' MOZ_ICU_CFLAGS ''', list(split(r''' $MOZ_ICU_CFLAGS ''')))
++    (''' MOZ_ICU_LIBS ''', list(split(r''' $MOZ_ICU_LIBS ''')))
++    (''' MOZ_SYSTEM_ICU ''', r''' $MOZ_SYSTEM_ICU ''')
++    (''' MOZ_ICU_VERSION ''', r''' $MOZ_ICU_VERSION ''')
++    (''' ENABLE_INTL_API ''', r''' $ENABLE_INTL_API ''')
++    (''' USE_ICU ''', r''' $USE_ICU ''')
++    (''' ICU_DATA_FILE ''', r''' $ICU_DATA_FILE ''')
+     (''' MOZ_SYSTEM_PNG ''', r''' $MOZ_SYSTEM_PNG ''')
+     (''' MOZ_PNG_CFLAGS ''', list(split(r''' $MOZ_PNG_CFLAGS ''')))
+     (''' MOZ_PNG_LIBS ''', list(split(r''' $MOZ_PNG_LIBS ''')))
++    (''' MOZ_SYSTEM_NSPR ''', r''' $MOZ_SYSTEM_NSPR ''')
++    (''' MOZ_SYSTEM_NSS ''', r''' $MOZ_SYSTEM_NSS ''')
+     (''' HOST_CMFLAGS ''', r''' $HOST_CMFLAGS ''')
+     (''' HOST_CMMFLAGS ''', r''' $HOST_CMMFLAGS ''')
+     (''' OS_COMPILE_CMFLAGS ''', r''' $OS_COMPILE_CMFLAGS ''')
+@@ -10985,6 +13024,8 @@ sed 's/$/,/' >> $CONFIG_STATUS <<EOF
+     (''' WIN32_GUI_EXE_LDFLAGS ''', r''' $WIN32_GUI_EXE_LDFLAGS ''')
+     (''' MOZ_DEVTOOLS ''', r''' $MOZ_DEVTOOLS ''')
+     (''' MOZ_PACKAGE_JSSHELL ''', r''' $MOZ_PACKAGE_JSSHELL ''')
++    (''' MOZ_FOLD_LIBS ''', r''' $MOZ_FOLD_LIBS ''')
++    (''' MOZ_FOLD_LIBS_FLAGS ''', list(split(r''' $MOZ_FOLD_LIBS_FLAGS ''')))
+     (''' DMG_TOOL ''', r''' $DMG_TOOL ''')
+     (''' JS_BINARY ''', r''' $JS_BINARY ''')
+     (''' NSS_EXTRA_SYMBOLS_FILE ''', r''' $NSS_EXTRA_SYMBOLS_FILE ''')
+@@ -11014,7 +13055,25 @@ cat >> $CONFIG_STATUS <<EOF
+ ]
+ 
+ flags = [
++    '--with-ios-sdk',
++    '--enable-ios-target',
++    '--enable-memory-sanitizer',
++    '--enable-thread-sanitizer',
++    '--enable-signed-overflow-sanitizer',
++    '--enable-unsigned-overflow-sanitizer',
++    '--with-debug-label',
++    '--with-debug-label',
++    '--enable-cpp-rtti',
++    '--enable-icf',
++    '--enable-dtrace',
++    '--with-nspr-cflags',
++    '--with-nspr-libs',
++    '--enable-nspr-build',
++    '--with-system-nspr',
++    '--enable-posix-nspr-emulation',
+     '--with-system-libevent',
++    '--with-system-nss',
++    '--with-system-zlib',
+     '--with-system-png',
+     '--with-android-distribution-directory',
+     '--enable-official-branding',
+@@ -11022,6 +13081,7 @@ flags = [
+     '--with-app-basename',
+     '--with-android-min-sdk',
+     '--with-android-max-sdk',
++    '--enable-startup-notification',
+     '--with-branding',
+     '--with-distribution-id',
+     '--enable-libproxy',
+@@ -11032,21 +13092,29 @@ flags = [
+     '--enable-universalchardet',
+     '--enable-crashreporter',
+     '--enable-extensions',
++    '--enable-signmar',
+     '--enable-updater',
+     '--enable-parental-controls',
+     '--enable-sandbox',
++    '--enable-system-sqlite',
+     '--enable-zipwriter',
+     '--enable-mobile-optimize',
+     '--enable-logrefcnt',
+     '--enable-dump-painting',
++    '--enable-strip',
++    '--enable-install-strip',
+     '--enable-debug-js-modules',
+     '--enable-startupcache',
++    '--with-jitreport-granularity',
+     '--with-user-appdir',
+     '--enable-system-cairo',
+     '--enable-system-pixman',
+     '--enable-xul',
+     '--enable-necko-wifi',
++    '--enable-cookies',
+     '--with-macbundlename-prefix',
++    '--with-system-icu',
++    '--with-intl-api',
+ ]
+ EOF
+ 
diff -Nru firefox-esr-78.7.0esr/debian/rules firefox-esr-78.7.0esr/debian/rules
--- firefox-esr-78.7.0esr/debian/rules	2021-01-26 23:56:16.000000000 +0000
+++ firefox-esr-78.7.0esr/debian/rules	2021-02-05 14:38:48.000000000 +0000
@@ -1,4 +1,6 @@
 #!/usr/bin/make -f
+export HOME=$(CURDIR)/fakehome
+
 TESTDIR = $(shell dh_testdir || echo no)
 ifeq (,$(TESTDIR))
 include debian/make.mk
@@ -132,7 +134,7 @@
 ifneq (,$(filter i386 amd64 armel armhf,$(DEB_HOST_ARCH)))
 	CRASH_REPORTER = 1
 endif
-ifneq (,$(filter mips%,$(DEB_HOST_ARCH)))
+ifneq (,$(filter armhf mips%,$(DEB_HOST_ARCH)))
 	CONFIGURE_FLAGS += --disable-webrtc
 endif
 
@@ -193,6 +195,7 @@
 endif
 
 override_dh_auto_configure:
+	mkdir -p fakehome
 
 configure js/src/configure:
 	cp -f $@.in $@ && chmod +x $@
@@ -274,12 +277,16 @@
 	rm -f $(filter-out debian/control,$(GENERATED_FILES))
 	rm -f $$(cat debian/extra-clean 2>/dev/null) debian/extra-clean old-configure js/src/old-configure
 	rm -rf stamps l10n $(CARGO_HOME)
+	rm -f third_party/python/psutil/psutil/*.so
+	rm -rf third_party/python/psutil/build/temp*
+	rm -rf third_party/python/psutil/build/lib*
 	debian/rules debian/control TESTDIR=
 
 	dh_auto_clean --builddirectory=build-$(PRODUCT)
 	dh_auto_clean --builddirectory=build-l10n
 	find . -name "*.pyc" -o -name "*.pyo" | xargs --no-run-if-empty rm -f
 	rm -rf obj-*/.mozbuild
+	find . -name __pycache__ -delete
 
 override_dh_clean:
 	dh_clean -XCargo.toml.orig
@@ -288,6 +295,8 @@
 			sed -i '2!b;/^exec "/ d' $$dir/$$file; \
 		done; \
 	done
+	rm -rf build-browser
+	rm -rf fakehome
 
 override_dh_auto_install-arch: stamps/install-$(PRODUCT)
 override_dh_auto_install-indep:
@@ -342,3 +351,4 @@
 	@mkdir -p stamps
 	$(if $(wildcard $@),,touch $@)
 endif
+