diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index 58c06ec3..eaa6c9af 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,45 @@
+-------------------------------------------------------------------
+Mon Jun  9 08:28:17 UTC 2014 - wr@rosenauer.org
+
+- update to Firefox 30.0 (bnc#881874)
+  * MFSA 2014-48/CVE-2014-1533/CVE-2014-1534
+    (bmo#921622, bmo#967354, bmo#969517, bmo#969549, bmo#973874,
+     bmo#978652, bmo#978811, bmo#988719, bmo#990868, bmo#991981,
+     bmo#992274, bmo#994907, bmo#995679, bmo#995816, bmo#995817,
+     bmo#996536, bmo#996715, bmo#999651, bmo#1000598,
+     bmo#1000960, bmo#1002340, bmo#1005578, bmo#1007223,
+     bmo#1009952, bmo#1011007)
+    Miscellaneous memory safety hazards (rv:30.0)
+  * MFSA 2014-49/CVE-2014-1536/CVE-2014-1537/CVE-2014-1538
+    (bmo#989994, bmo#999274, bmo#1005584)
+    Use-after-free and out of bounds issues found using Address
+    Sanitizer
+  * MFSA 2014-50/CVE-2014-1539 (bmo#995603)
+    Clickjacking through cursor invisability after Flash interaction
+  * MFSA 2014-51/CVE-2014-1540 (bmo#978862)
+    Use-after-free in Event Listener Manager
+  * MFSA 2014-52/CVE-2014-1541 (bmo#1000185)
+    Use-after-free with SMIL Animation Controller
+  * MFSA 2014-53/CVE-2014-1542 (bmo#991533)
+    Buffer overflow in Web Audio Speex resampler
+  * MFSA 2014-54/CVE-2014-1543 (bmo#1011859)
+    Buffer overflow in Gamepad API
+- rebased patches
+- removed obsolete patches
+  * firefox-browser-css.patch
+  * mozilla-aarch64-bmo-962488.patch
+  * mozilla-aarch64-bmo-963023.patch
+  * mozilla-aarch64-bmo-963024.patch
+  * mozilla-aarch64-bmo-963027.patch
+  * mozilla-ppc64-xpcom.patch
+  * mozilla-ppc64le-javascript.patch
+  * mozilla-ppc64le-libffi.patch
+  * mozilla-ppc64le-mfbt.patch
+  * mozilla-ppc64le-webrtc.patch
+  * mozilla-ppc64le-xpcom.patch
+- requires NSPR 4.10.6
+- enabled GStreamer 1.0 usage for 13.2 and above
+
 -------------------------------------------------------------------
 Sat May 10 06:09:37 UTC 2014 - wr@rosenauer.org
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index c6a11258..3370a695 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -17,15 +17,18 @@
 #
 
 
-%define major 29
-%define mainver %major.0.1
+%define major 30
+%define mainver %major.0
 %define update_channel release
 
-%if %suse_version > 1220
-%define gstreamer_ver 0.10
+%if %suse_version > 1210
+%if %suse_version > 1310
+%define gstreamer_ver 1.0
+%define gstreamer 1
 %else
 %define gstreamer_ver 0.10
 %endif
+%endif
 
 Name:           MozillaFirefox
 BuildRequires:  Mesa-devel
@@ -51,7 +54,7 @@ BuildRequires:  libproxy-devel
 %else
 BuildRequires:  wireless-tools
 %endif
-BuildRequires:  mozilla-nspr-devel >= 4.10.3
+BuildRequires:  mozilla-nspr-devel >= 4.10.6
 BuildRequires:  mozilla-nss-devel >= 3.16
 BuildRequires:  nss-shared-helper-devel
 BuildRequires:  pkgconfig(libpulse)
@@ -59,13 +62,19 @@ BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(gstreamer-%gstreamer_ver)
 BuildRequires:  pkgconfig(gstreamer-app-%gstreamer_ver)
 BuildRequires:  pkgconfig(gstreamer-plugins-base-%gstreamer_ver)
+%if 0%{?gstreamer} == 1
+Requires:       libgstreamer-1_0-0
+Recommends:     gstreamer-fluendo-mp3
+Recommends:     gstreamer-plugin-libav
+%else
 Requires:       libgstreamer-0_10-0
 Recommends:     gstreamer-0_10-fluendo-mp3
 Recommends:     gstreamer-0_10-plugins-ffmpeg
 %endif
+%endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2014050900
+%define         releasedate 2014060900
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
@@ -108,19 +117,8 @@ Patch11:        mozilla-icu-strncat.patch
 Patch12:        mozilla-arm-disable-edsp.patch
 Patch13:        mozilla-ppc.patch
 Patch14:        mozilla-libproxy-compat.patch
-Patch15:        mozilla-ppc64le-build.patch
-Patch16:        mozilla-ppc64le-javascript.patch
-Patch17:        mozilla-ppc64le-libffi.patch
-Patch18:        mozilla-ppc64le-mfbt.patch
-Patch19:        mozilla-ppc64le-webrtc.patch
-Patch20:        mozilla-ppc64le-xpcom.patch
-Patch21:        mozilla-ppc64-xpcom.patch
 # Gecko/Toolkit AArch64 Porting
 Patch30:        mozilla-aarch64-bmo-810631.patch
-Patch31:        mozilla-aarch64-bmo-962488.patch
-Patch32:        mozilla-aarch64-bmo-963027.patch
-Patch33:        mozilla-aarch64-bmo-963023.patch
-Patch34:        mozilla-aarch64-bmo-963024.patch
 
 # Firefox/browser
 Patch101:       firefox-kde.patch
@@ -198,7 +196,7 @@ of Firefox.
 %package translations-other
 Summary:        Extra translations for Firefox
 Group:          System/Localization
-Provides:       locale(%{name}:ach;af;an;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;en_ZA;eo;es_MX;et;eu;fa;ff;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;km;kn;ku;lij;lt;lv;mai;mk;ml;mr;ms;nn_NO;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;te;th;tr;uk;vi;xh;zu)
+Provides:       locale(%{name}:ach;af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;en_ZA;eo;es_MX;et;eu;fa;ff;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;km;kn;ku;lg;lij;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;vi;zu)
 Requires:       %{name} = %{version}
 Obsoletes:      %{name}-translations < %{version}-%{release}
 
@@ -261,18 +259,7 @@ cd $RPM_BUILD_DIR/mozilla
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
 %patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
 
 # Firefox
 %patch101 -p1
@@ -340,6 +327,9 @@ ac_add_options --disable-debug
 ac_add_options --enable-startup-notification
 #ac_add_options --enable-chrome-format=jar
 ac_add_options --enable-update-channel=%{update_channel}
+%if 0%{?gstreamer} == 1
+ac_add_options --enable-gstreamer=1.0
+%endif
 %if %suse_version > 1130
 ac_add_options --disable-gnomevfs
 ac_add_options --enable-gio
diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz
index b22718ce..a96919f1 100644
--- a/compare-locales.tar.xz
+++ b/compare-locales.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a0bdebb950897ad8ac5b25d45a547bef7e1c17b450f49a128ea9dd77bbb06d3b
-size 28408
+oid sha256:acccf9b3b483f646264bbcb09ef709955a16e743dd3deb693a189aa775c50ee7
+size 28508
diff --git a/create-tar.sh b/create-tar.sh
index 073e7a5c..a89c7695 100644
--- a/create-tar.sh
+++ b/create-tar.sh
@@ -2,8 +2,8 @@
 
 CHANNEL="release"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_29_0_1_RELEASE"
-VERSION="29.0.1"
+RELEASE_TAG="FIREFOX_30_0_RELEASE"
+VERSION="30.0"
 
 # mozilla
 if [ -d mozilla ]; then
diff --git a/firefox-29.0.1-source.tar.xz b/firefox-29.0.1-source.tar.xz
deleted file mode 100644
index 30649e69..00000000
--- a/firefox-29.0.1-source.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:46f282cdc7346e148cf5b38c80ddec9c396d6a3167fbbe5ca67466525eeea650
-size 120610264
diff --git a/firefox-30.0-source.tar.xz b/firefox-30.0-source.tar.xz
new file mode 100644
index 00000000..d5efc74d
--- /dev/null
+++ b/firefox-30.0-source.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:90179c3e6b747141f1f8d787135e2dc5879dae1c7be24cf3a8ae36e66e156258
+size 121266984
diff --git a/firefox-branded-icons.patch b/firefox-branded-icons.patch
index 19780933..fb68c987 100644
--- a/firefox-branded-icons.patch
+++ b/firefox-branded-icons.patch
@@ -1,10 +1,10 @@
 # HG changeset patch
-# Parent 5defe7bd2f041c227fe4a65f8a90e6cc42a9a339
+# Parent ab6659ccbfbbfed31bce1bcd696a820069b9d7c0
 
 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
 --- a/browser/app/Makefile.in
 +++ b/browser/app/Makefile.in
-@@ -133,16 +133,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d
+@@ -76,16 +76,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d
  endif
  
  ifdef MOZ_WIDGET_GTK
@@ -29,7 +29,7 @@ diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
 diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in
 --- a/browser/branding/official/Makefile.in
 +++ b/browser/branding/official/Makefile.in
-@@ -42,18 +42,21 @@ BRANDING_FILES := \
+@@ -36,18 +36,21 @@ BRANDING_FILES := \
  	document.icns \
  	dsstore \
  	$(NULL)
@@ -47,14 +47,14 @@ diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/M
  	$(NULL)
  endif
  
- ifeq ($(OS_ARCH),OS2)
- BRANDING_FILES := \
- 	firefox-os2.ico \
- 	document-os2.ico \
+ BRANDING_DEST := $(DIST)/branding
+ BRANDING_TARGET := export
+ INSTALL_TARGETS += BRANDING
+ 
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -571,18 +571,21 @@
+@@ -611,18 +611,21 @@
  @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
  @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
  @BINPATH@/chrome/toolkit@JAREXT@
diff --git a/firefox-kde.patch b/firefox-kde.patch
index 09164e7f..66217738 100644
--- a/firefox-kde.patch
+++ b/firefox-kde.patch
@@ -2,7 +2,7 @@ diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1217 @@
+@@ -0,0 +1,1219 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -411,14 +411,9 @@ new file mode 100644
 +        <image class="sync-panel-icon"/>
 +        <vbox class="sync-panel-inner">
 +          <description id="sync-start-panel-title"
-+                       value="&syncStartPanel.heading;"/>
-+          <description id="sync-start-panel-subtitle">
-+#ifdef XP_UNIX
-+            &syncStartPanel.subTitleUnix;
-+#else
-+            &syncStartPanel.subTitle;
-+#endif
-+          </description>
++                       value="&syncStartPanel2.heading;"/>
++          <description id="sync-start-panel-subtitle"
++                       value="&syncStartPanel2.subTitle;"/>
 +        </vbox>
 +      </hbox>
 +    </panel>
@@ -714,6 +709,8 @@ new file mode 100644
 +                <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/>
++                <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon" role="button"/>
++                <image id="webRTC-sharingMicrophone-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/>
 +              </box>
@@ -813,6 +810,12 @@ new file mode 100644
 +                      oncommand="toggleSidebar('viewBookmarksSidebar');">
 +              <observes element="viewBookmarksSidebar" attribute="checked"/>
 +            </menuitem>
++            <!-- NB: temporary solution for bug 985024, this should go away soon. -->
++            <menuitem id="BMB_bookmarksShowAllTop"
++                      class="menuitem-iconic subviewbutton"
++                      label="&showAllBookmarks2.label;"
++                      command="Browser:ShowAllBookmarks"
++                      key="manBookmarkKb"/>
 +            <menuseparator/>
 +            <menuitem id="BMB_subscribeToPageMenuitem"
 +#ifndef XP_MACOSX
@@ -1111,7 +1114,6 @@ new file mode 100644
 +                        command="Social:ToggleNotifications"
 +                        label="&social.toggleNotifications.label;"
 +                        accesskey="&social.toggleNotifications.accesskey;"/>
-+              <menuitem class="social-toggle-menuitem" command="Social:Toggle"/>
 +              <menuseparator/>
 +              <menuseparator class="social-provider-menu" hidden="true"/>
 +              <menuitem class="social-addons-menuitem" command="Social:Addons"
@@ -1223,7 +1225,7 @@ new file mode 100644
 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 --- a/browser/base/jar.mn
 +++ b/browser/base/jar.mn
-@@ -66,16 +66,18 @@ browser.jar:
+@@ -62,16 +62,18 @@ browser.jar:
          content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
          content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
          content/browser/aboutSocialError.xhtml        (content/aboutSocialError.xhtml)
@@ -1805,7 +1807,7 @@ new file mode 100644
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -654,19 +654,21 @@
+@@ -641,19 +641,21 @@
  @BINPATH@/defaults/autoconfig/prefcalls.js
  @BINPATH@/browser/defaults/profile/prefs.js
  
diff --git a/l10n-29.0.1.tar.xz b/l10n-29.0.1.tar.xz
deleted file mode 100644
index af7634a6..00000000
--- a/l10n-29.0.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8bc0f98d4470ab7f9d6703107dae68ebb815e8a450ab1c87066be9b1063a06ee
-size 39987132
diff --git a/l10n-30.0.tar.xz b/l10n-30.0.tar.xz
new file mode 100644
index 00000000..208a9706
--- /dev/null
+++ b/l10n-30.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a8e44a2e8fbe3fc63ae5867b2622f7b1dfdba83796a8533cbbfd494372ed8870
+size 40423444
diff --git a/mozilla-aarch64-bmo-962488.patch b/mozilla-aarch64-bmo-962488.patch
deleted file mode 100644
index cfd05d60..00000000
--- a/mozilla-aarch64-bmo-962488.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-
-# HG changeset patch
-# User Marcin Juszkiewicz <mjuszkiewicz@redhat.com>
-# Date 1393440196 18000
-# Node ID 6a46f53ad944b44385398822d7bcf7621a785d91
-# Parent  0aa56e2a5f816a30da48701f73d03060ee9692b2
-Bug 962488 - Update double-conversion for proper AArch64 support. r=froydnj
-
-Fix imported from upstream repository:
-https://code.google.com/p/double-conversion/source/detail?r=4e24bb31bcc76d6d218f3056b4c24a109d367561
-
-diff --git a/mfbt/double-conversion/fix-aarch64-macro.patch b/mfbt/double-conversion/fix-aarch64-macro.patch
-new file mode 100644
---- /dev/null
-+++ b/mfbt/double-conversion/fix-aarch64-macro.patch
-@@ -0,0 +1,23 @@
-+Backport from upstream.
-+
-+https://code.google.com/p/double-conversion/source/detail?r=4e24bb31bcc76d6d218f3056b4c24a109d367561
-+
-+---
-+ mfbt/double-conversion/utils.h |    2 +-
-+ 1 file changed, 1 insertion(+), 1 deletion(-)
-+
-+--- a/mfbt/double-conversion/utils.h
-++++ b/mfbt/double-conversion/utils.h
-+@@ -58,11 +58,11 @@
-+     defined(__mips__) || \
-+     defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \
-+     defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
-+     defined(__SH4__) || defined(__alpha__) || \
-+     defined(_MIPS_ARCH_MIPS32R2) || \
-+-    defined(_AARCH64EL_)
-++    defined(__AARCH64EL__)
-+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
-+ #elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
-+ #if defined(_WIN32)
-+ // Windows uses a 64bit wide floating point stack.
-+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
-diff --git a/mfbt/double-conversion/update.sh b/mfbt/double-conversion/update.sh
---- a/mfbt/double-conversion/update.sh
-+++ b/mfbt/double-conversion/update.sh
-@@ -15,9 +15,12 @@ cp $1/src/*.h ./
- 
- # Source
- cp $1/src/*.cc ./
- 
- patch -p3 < add-mfbt-api-markers.patch
- patch -p3 < use-StandardInteger.patch
- patch -p3 < use-mozilla-assertions.patch
- patch -p3 < use-static_assert.patch
--patch -p3 < ToPrecision-exponential.patch
-\ No newline at end of file
-+patch -p3 < ToPrecision-exponential.patch
-+
-+# Merged upstream, part of 2.0.1 version
-+patch -p3 < fix-aarch64-macro.patch
-diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h
---- a/mfbt/double-conversion/utils.h
-+++ b/mfbt/double-conversion/utils.h
-@@ -55,17 +55,17 @@
- #if defined(_M_X64) || defined(__x86_64__) || \
-     defined(__ARMEL__) || defined(__avr32__) || \
-     defined(__hppa__) || defined(__ia64__) || \
-     defined(__mips__) || \
-     defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \
-     defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
-     defined(__SH4__) || defined(__alpha__) || \
-     defined(_MIPS_ARCH_MIPS32R2) || \
--    defined(_AARCH64EL_)
-+    defined(__AARCH64EL__)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
- #elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
- #if defined(_WIN32)
- // Windows uses a 64bit wide floating point stack.
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
- #else
- #undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS
- #endif  // _WIN32
-
diff --git a/mozilla-aarch64-bmo-963023.patch b/mozilla-aarch64-bmo-963023.patch
deleted file mode 100644
index c0104d82..00000000
--- a/mozilla-aarch64-bmo-963023.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-
-# HG changeset patch
-# User Marcin Juszkiewicz <mjuszkiewicz@redhat.com>
-# Date 1392217668 18000
-# Node ID 4e9b713f435ade266a68a8d7ba08aad65c3fa6c5
-# Parent  282b6e88f9d4c2367a72836f6f9efeab2aadaa58
-Bug 963023 - AArch64 support for libevent. r=froydnj
-
-diff --git a/ipc/chromium/src/third_party/libevent-use-non-deprecated-syscalls.patch b/ipc/chromium/src/third_party/libevent-use-non-deprecated-syscalls.patch
-new file mode 100644
---- /dev/null
-+++ b/ipc/chromium/src/third_party/libevent-use-non-deprecated-syscalls.patch
-@@ -0,0 +1,43 @@
-+---
-+ ipc/chromium/src/third_party/libevent/epoll_sub.c |   13 +++++++++++++
-+ 1 file changed, 13 insertions(+)
-+
-+--- mozilla-central.orig/ipc/chromium/src/third_party/libevent/epoll_sub.c
-++++ mozilla-central/ipc/chromium/src/third_party/libevent/epoll_sub.c
-+@@ -29,15 +29,24 @@
-+ #include <sys/param.h>
-+ #include <sys/types.h>
-+ #include <sys/syscall.h>
-+ #include <sys/epoll.h>
-+ #include <unistd.h>
-++#include <errno.h>
-+
-+ int
-+ epoll_create(int size)
-+ {
-++#if !defined(__NR_epoll_create) && defined(__NR_epoll_create1)
-++	if (size <= 0) {
-++		errno = EINVAL;
-++		return -1;
-++	}
-++	return (syscall(__NR_epoll_create1, 0));
-++#else
-+ 	return (syscall(__NR_epoll_create, size));
-++#endif
-+ }
-+
-+ int
-+ epoll_ctl(int epfd, int op, int fd, struct epoll_event *event)
-+ {
-+@@ -46,7 +55,11 @@ epoll_ctl(int epfd, int op, int fd, stru
-+ }
-+
-+ int
-+ epoll_wait(int epfd, struct epoll_event *events, int maxevents, int timeout)
-+ {
-++#if !defined(__NR_epoll_wait) && defined(__NR_epoll_pwait)
-++	return (syscall(__NR_epoll_pwait, epfd, events, maxevents, timeout, NULL, 0));
-++#else
-+ 	return (syscall(__NR_epoll_wait, epfd, events, maxevents, timeout));
-++#endif
-+ }
-diff --git a/ipc/chromium/src/third_party/libevent/README.mozilla b/ipc/chromium/src/third_party/libevent/README.mozilla
---- a/ipc/chromium/src/third_party/libevent/README.mozilla
-+++ b/ipc/chromium/src/third_party/libevent/README.mozilla
-@@ -8,8 +8,10 @@ android/event2/event-config.h
- 
- These files are taken from libevent-2.0.21-stable built on the development environment indicated by the first path component. You have to run "./configure" and "make" to get all of the pre-processing done. The file can then be found in "include/event2/".
- 
- 2. This is ugly, prepare yourself. OS X has a weird problem with how the "TAILQ_END(head)" is used, causing a linking error. Just replace all use of the "TAILQ_END(head)" macro with "NULL".
- 
- 3. Apply "add mac-arc4random-buf.patch", which removes some bad OS X compatibility code. This will allow libevent to compile on all supported versions of OS X.
- 
- 4. Apply "openbsd-no-arc4random_addrandom.patch", which fixes the build on OpenBSD (which doesnt provide arc4random_addrandom anymore, see #931354)
-+
-+5. Apply "libevent-use-non-deprecated-syscalls.patch", which fixes the build on AArch64 architecture (which does not provide deprecated syscalls)
-diff --git a/ipc/chromium/src/third_party/libevent/epoll_sub.c b/ipc/chromium/src/third_party/libevent/epoll_sub.c
---- a/ipc/chromium/src/third_party/libevent/epoll_sub.c
-+++ b/ipc/chromium/src/third_party/libevent/epoll_sub.c
-@@ -26,27 +26,40 @@
-  */
- #include <stdint.h>
- 
- #include <sys/param.h>
- #include <sys/types.h>
- #include <sys/syscall.h>
- #include <sys/epoll.h>
- #include <unistd.h>
-+#include <errno.h>
- 
- int
- epoll_create(int size)
- {
-+#if !defined(__NR_epoll_create) && defined(__NR_epoll_create1)
-+	if (size <= 0) {
-+		errno = EINVAL;
-+		return -1;
-+	}
-+	return (syscall(__NR_epoll_create1, 0));
-+#else
- 	return (syscall(__NR_epoll_create, size));
-+#endif
- }
- 
- int
- epoll_ctl(int epfd, int op, int fd, struct epoll_event *event)
- {
- 
- 	return (syscall(__NR_epoll_ctl, epfd, op, fd, event));
- }
- 
- int
- epoll_wait(int epfd, struct epoll_event *events, int maxevents, int timeout)
- {
-+#if !defined(__NR_epoll_wait) && defined(__NR_epoll_pwait)
-+	return (syscall(__NR_epoll_pwait, epfd, events, maxevents, timeout, NULL, 0));
-+#else
- 	return (syscall(__NR_epoll_wait, epfd, events, maxevents, timeout));
-+#endif
- }
-
diff --git a/mozilla-aarch64-bmo-963024.patch b/mozilla-aarch64-bmo-963024.patch
deleted file mode 100644
index de0806ab..00000000
--- a/mozilla-aarch64-bmo-963024.patch
+++ /dev/null
@@ -1,517 +0,0 @@
-
-# HG changeset patch
-# User Marcin Juszkiewicz <mjuszkiewicz@redhat.com>
-# Date 1393440196 18000
-# Node ID d56b5c1a557348d4ac14a4d1ea7a5b5d240e3647
-# Parent  6a46f53ad944b44385398822d7bcf7621a785d91
-Bug 963024 - AArch64 support for XPCOM. r=froydnj
-
-diff --git a/xpcom/reflect/xptcall/src/md/unix/moz.build b/xpcom/reflect/xptcall/src/md/unix/moz.build
---- a/xpcom/reflect/xptcall/src/md/unix/moz.build
-+++ b/xpcom/reflect/xptcall/src/md/unix/moz.build
-@@ -144,16 +144,23 @@ if CONFIG['OS_ARCH'] == 'NetBSD':
-     if CONFIG['OS_TEST'] in ('amiga', 'atari', 'hp300', 'mac68k', 'mvme68k',
-                              'next68k', 'sun3', 'sun3x', 'x68k'):
-         SOURCES += [
-             'xptcinvoke_netbsd_m68k.cpp',
-             'xptcstubs_netbsd_m68k.cpp'
-         ]
- 
- if CONFIG['OS_ARCH'] == 'Linux':
-+    if CONFIG['OS_TEST'] == 'aarch64':
-+        SOURCES += [
-+            'xptcinvoke_aarch64.cpp',
-+            'xptcinvoke_asm_aarch64.s',
-+            'xptcstubs_aarch64.cpp',
-+            'xptcstubs_asm_aarch64.s',
-+        ]
-     if CONFIG['OS_TEST'] == 'm68k':
-         SOURCES += [
-             'xptcinvoke_linux_m68k.cpp',
-             'xptcstubs_linux_m68k.cpp',
-         ]
-     if CONFIG['OS_TEST'].find('mips') != -1:
-         if CONFIG['OS_TEST'].find('mips64') != -1:
-             SOURCES += [
-diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_aarch64.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_aarch64.cpp
-new file mode 100644
---- /dev/null
-+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_aarch64.cpp
-@@ -0,0 +1,136 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
-+/* Platform specific code to invoke XPCOM methods on native objects */
-+
-+#include "xptcprivate.h"
-+
-+#if !defined(__aarch64__)
-+#error "This code is for Linux AArch64 only."
-+#endif
-+
-+
-+/* "Procedure Call Standard for the ARM 64-bit Architecture" document, sections
-+ * "5.4 Parameter Passing" and "6.1.2 Procedure Calling" contain all the
-+ * needed information.
-+ *
-+ * http://infocenter.arm.com/help/topic/com.arm.doc.ihi0042d/IHI0042D_aapcs.pdf
-+ */
-+
-+#ifndef __AARCH64EL__
-+#error "Only little endian compatibility was tested"
-+#endif
-+
-+/*
-+ * Allocation of integer function arguments initially to registers r1-r7
-+ * and then to stack. Handling of 'that' argument which goes to register r0
-+ * is handled separately and does not belong here.
-+ *
-+ * 'ireg_args'  - pointer to the current position in the buffer,
-+ *                corresponding to the register arguments
-+ * 'stack_args' - pointer to the current position in the buffer,
-+ *                corresponding to the arguments on stack
-+ * 'end'        - pointer to the end of the registers argument
-+ *                buffer.
-+ */
-+static inline void alloc_word(uint64_t* &ireg_args,
-+                              uint64_t* &stack_args,
-+                              uint64_t* end,
-+                              uint64_t  data)
-+{
-+    if (ireg_args < end) {
-+        *ireg_args = data;
-+        ireg_args++;
-+    } else {
-+        *stack_args = data;
-+        stack_args++;
-+    }
-+}
-+
-+static inline void alloc_double(double* &freg_args,
-+                                uint64_t* &stack_args,
-+                                double* end,
-+                                double  data)
-+{
-+    if (freg_args < end) {
-+        *freg_args = data;
-+        freg_args++;
-+    } else {
-+        memcpy(stack_args, &data, sizeof(data));
-+        stack_args++;
-+    }
-+}
-+
-+static inline void alloc_float(double* &freg_args,
-+                               uint64_t* &stack_args,
-+                               double* end,
-+                               float  data)
-+{
-+    if (freg_args < end) {
-+        memcpy(freg_args, &data, sizeof(data));
-+        freg_args++;
-+    } else {
-+        memcpy(stack_args, &data, sizeof(data));
-+        stack_args++;
-+    }
-+}
-+
-+
-+extern "C" void
-+invoke_copy_to_stack(uint64_t* stk, uint64_t *end,
-+                     uint32_t paramCount, nsXPTCVariant* s)
-+{
-+    uint64_t *ireg_args = stk;
-+    uint64_t *ireg_end  = ireg_args + 8;
-+    double *freg_args = (double *)ireg_end;
-+    double *freg_end  = freg_args + 8;
-+    uint64_t *stack_args = (uint64_t *)freg_end;
-+
-+    // leave room for 'that' argument in x0
-+    ++ireg_args;
-+
-+    for (uint32_t i = 0; i < paramCount; i++, s++) {
-+        if (s->IsPtrData()) {
-+            alloc_word(ireg_args, stack_args, ireg_end, (uint64_t)s->ptr);
-+            continue;
-+        }
-+        // According to the ABI, integral types that are smaller than 8 bytes
-+        // are to be passed in 8-byte registers or 8-byte stack slots.
-+        switch (s->type) {
-+            case nsXPTType::T_FLOAT:
-+                alloc_float(freg_args, stack_args, freg_end, s->val.f);
-+                break;
-+            case nsXPTType::T_DOUBLE:
-+                alloc_double(freg_args, stack_args, freg_end, s->val.d);
-+                break;
-+            case nsXPTType::T_I8:  alloc_word(ireg_args, stk, end, s->val.i8);   break;
-+            case nsXPTType::T_I16: alloc_word(ireg_args, stk, end, s->val.i16);  break;
-+            case nsXPTType::T_I32: alloc_word(ireg_args, stk, end, s->val.i32);  break;
-+            case nsXPTType::T_I64: alloc_word(ireg_args, stk, end, s->val.i64);  break;
-+            case nsXPTType::T_U8:  alloc_word(ireg_args, stk, end, s->val.u8);   break;
-+            case nsXPTType::T_U16: alloc_word(ireg_args, stk, end, s->val.u16);  break;
-+            case nsXPTType::T_U32: alloc_word(ireg_args, stk, end, s->val.u32);  break;
-+            case nsXPTType::T_U64: alloc_word(ireg_args, stk, end, s->val.u64);  break;
-+            case nsXPTType::T_BOOL: alloc_word(ireg_args, stk, end, s->val.b);   break;
-+            case nsXPTType::T_CHAR: alloc_word(ireg_args, stk, end, s->val.c);   break;
-+            case nsXPTType::T_WCHAR: alloc_word(ireg_args, stk, end, s->val.wc); break;
-+            default:
-+                // all the others are plain pointer types
-+                alloc_word(ireg_args, stack_args, ireg_end,
-+                           reinterpret_cast<uint64_t>(s->val.p));
-+                break;
-+        }
-+    }
-+}
-+
-+extern "C" nsresult _NS_InvokeByIndex(nsISupports* that, uint32_t methodIndex,
-+                                      uint32_t paramCount, nsXPTCVariant* params);
-+
-+EXPORT_XPCOM_API(nsresult)
-+NS_InvokeByIndex(nsISupports* that, uint32_t methodIndex,
-+                 uint32_t paramCount, nsXPTCVariant* params)
-+{
-+    return _NS_InvokeByIndex(that, methodIndex, paramCount, params);
-+}
-diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_aarch64.s b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_aarch64.s
-new file mode 100644
---- /dev/null
-+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_aarch64.s
-@@ -0,0 +1,67 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
-+        .section ".text"
-+            .globl _NS_InvokeByIndex
-+            .type  _NS_InvokeByIndex,@function
-+
-+/*
-+ * _NS_InvokeByIndex(nsISupports* that, uint32_t methodIndex,
-+ *                   uint32_t paramCount, nsXPTCVariant* params)
-+ */
-+
-+_NS_InvokeByIndex:
-+            # set up frame
-+            stp         x29, x30, [sp,#-32]!
-+            mov         x29, sp
-+            stp         x19, x20, [sp,#16]
-+
-+            # save methodIndex across function calls
-+            mov         w20, w1
-+
-+            # end of stack area passed to invoke_copy_to_stack
-+            mov         x1, sp
-+
-+            # assume 8 bytes of stack for each argument with 16-byte alignment
-+            add         w19, w2, #1
-+            and         w19, w19, #0xfffffffe
-+            sub         sp, sp, w19, uxth #3
-+
-+            # temporary place to store args passed in r0-r7,v0-v7
-+            sub         sp, sp, #128
-+
-+            # save 'that' on stack
-+            str         x0, [sp]
-+
-+            # start of stack area passed to invoke_copy_to_stack
-+            mov         x0, sp
-+            bl          invoke_copy_to_stack
-+
-+            # load arguments passed in r0-r7
-+            ldp         x6, x7, [sp, #48]
-+            ldp         x4, x5, [sp, #32]
-+            ldp         x2, x3, [sp, #16]
-+            ldp         x0, x1, [sp],#64
-+
-+            # load arguments passed in v0-v7
-+            ldp         d6, d7, [sp, #48]
-+            ldp         d4, d5, [sp, #32]
-+            ldp         d2, d3, [sp, #16]
-+            ldp         d0, d1, [sp],#64
-+
-+            # call the method
-+            ldr         x16, [x0]
-+            add         x16, x16, w20, uxth #3
-+            ldr         x16, [x16]
-+            blr         x16
-+
-+            add         sp, sp, w19, uxth #3
-+            ldp         x19, x20, [sp,#16]
-+            ldp         x29, x30, [sp],#32
-+            ret
-+
-+            .size _NS_InvokeByIndex, . - _NS_InvokeByIndex
-+
-+
-diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_aarch64.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_aarch64.cpp
-new file mode 100644
---- /dev/null
-+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_aarch64.cpp
-@@ -0,0 +1,219 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
-+#include "xptcprivate.h"
-+#include "xptiprivate.h"
-+
-+#ifndef __AARCH64EL__
-+#error "Only little endian compatibility was tested"
-+#endif
-+
-+/*
-+ * This is for AArch64 ABI
-+ *
-+ * When we're called, the "gp" registers are stored in gprData and
-+ * the "fp" registers are stored in fprData. Each array has 8 regs
-+ * but first reg in gprData is a placeholder for 'self'.
-+ */
-+extern "C" nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, uint32_t methodIndex, uint64_t* args,
-+                   uint64_t *gprData, double *fprData)
-+{
-+#define PARAM_BUFFER_COUNT        16
-+#define PARAM_GPR_COUNT            8
-+#define PARAM_FPR_COUNT            8
-+
-+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+    nsXPTCMiniVariant* dispatchParams = NULL;
-+    const nsXPTMethodInfo* info;
-+    nsresult result = NS_ERROR_FAILURE;
-+
-+    NS_ASSERTION(self,"no self");
-+
-+    self->mEntry->GetMethodInfo(uint16_t(methodIndex), &info);
-+    NS_ASSERTION(info,"no method info");
-+
-+    uint32_t paramCount = info->GetParamCount();
-+
-+    // setup variant array pointer
-+    if (paramCount > PARAM_BUFFER_COUNT) {
-+        dispatchParams = new nsXPTCMiniVariant[paramCount];
-+    } else {
-+        dispatchParams = paramBuffer;
-+    }
-+    NS_ASSERTION(dispatchParams,"no place for params");
-+
-+    uint64_t* ap = args;
-+    uint32_t next_gpr = 1; // skip first arg which is 'self'
-+    uint32_t next_fpr = 0;
-+    for (uint32_t i = 0; i < paramCount; i++) {
-+        const nsXPTParamInfo& param = info->GetParam(i);
-+        const nsXPTType& type = param.GetType();
-+        nsXPTCMiniVariant* dp = &dispatchParams[i];
-+
-+        if (param.IsOut() || !type.IsArithmetic()) {
-+            if (next_gpr < PARAM_GPR_COUNT) {
-+                dp->val.p = (void*)gprData[next_gpr++];
-+            } else {
-+                dp->val.p = (void*)*ap++;
-+            }
-+            continue;
-+        }
-+
-+        switch (type) {
-+            case nsXPTType::T_I8:
-+                if (next_gpr < PARAM_GPR_COUNT) {
-+                    dp->val.i8  = (int8_t)gprData[next_gpr++];
-+                } else {
-+                    dp->val.i8  = (int8_t)*ap++;
-+                }
-+                break;
-+
-+            case nsXPTType::T_I16:
-+                if (next_gpr < PARAM_GPR_COUNT) {
-+                    dp->val.i16  = (int16_t)gprData[next_gpr++];
-+                } else {
-+                    dp->val.i16  = (int16_t)*ap++;
-+                }
-+                break;
-+
-+            case nsXPTType::T_I32:
-+                if (next_gpr < PARAM_GPR_COUNT) {
-+                    dp->val.i32  = (int32_t)gprData[next_gpr++];
-+                } else {
-+                    dp->val.i32  = (int32_t)*ap++;
-+                }
-+                break;
-+
-+            case nsXPTType::T_I64:
-+                if (next_gpr < PARAM_GPR_COUNT) {
-+                    dp->val.i64  = (int64_t)gprData[next_gpr++];
-+                } else {
-+                    dp->val.i64  = (int64_t)*ap++;
-+                }
-+                break;
-+
-+            case nsXPTType::T_U8:
-+                if (next_gpr < PARAM_GPR_COUNT) {
-+                    dp->val.u8  = (uint8_t)gprData[next_gpr++];
-+                } else {
-+                    dp->val.u8  = (uint8_t)*ap++;
-+                }
-+                break;
-+
-+            case nsXPTType::T_U16:
-+                if (next_gpr < PARAM_GPR_COUNT) {
-+                    dp->val.u16  = (uint16_t)gprData[next_gpr++];
-+                } else {
-+                    dp->val.u16  = (uint16_t)*ap++;
-+                }
-+                break;
-+
-+            case nsXPTType::T_U32:
-+                if (next_gpr < PARAM_GPR_COUNT) {
-+                    dp->val.u32  = (uint32_t)gprData[next_gpr++];
-+                } else {
-+                    dp->val.u32  = (uint32_t)*ap++;
-+                }
-+                break;
-+
-+            case nsXPTType::T_U64:
-+                if (next_gpr < PARAM_GPR_COUNT) {
-+                    dp->val.u64  = (uint64_t)gprData[next_gpr++];
-+                } else {
-+                    dp->val.u64  = (uint64_t)*ap++;
-+                }
-+                break;
-+
-+            case nsXPTType::T_FLOAT:
-+                if (next_fpr < PARAM_FPR_COUNT) {
-+                    memcpy(&dp->val.f, &fprData[next_fpr++], sizeof(dp->val.f));
-+                } else {
-+                    memcpy(&dp->val.f, ap++, sizeof(dp->val.f));
-+                }
-+                break;
-+
-+            case nsXPTType::T_DOUBLE:
-+                if (next_fpr < PARAM_FPR_COUNT) {
-+                    memcpy(&dp->val.d, &fprData[next_fpr++], sizeof(dp->val.d));
-+                } else {
-+                    memcpy(&dp->val.d, ap++, sizeof(dp->val.d));
-+                }
-+                break;
-+
-+            case nsXPTType::T_BOOL:
-+                if (next_gpr < PARAM_GPR_COUNT) {
-+                    dp->val.b  = (bool)gprData[next_gpr++];
-+                } else {
-+                    dp->val.b  = (bool)*ap++;
-+                }
-+                break;
-+
-+            case nsXPTType::T_CHAR:
-+                if (next_gpr < PARAM_GPR_COUNT) {
-+                    dp->val.c  = (char)gprData[next_gpr++];
-+                } else {
-+                    dp->val.c  = (char)*ap++;
-+                }
-+                break;
-+
-+            case nsXPTType::T_WCHAR:
-+                if (next_gpr < PARAM_GPR_COUNT) {
-+                    dp->val.wc  = (wchar_t)gprData[next_gpr++];
-+                } else {
-+                    dp->val.wc  = (wchar_t)*ap++;
-+                }
-+                break;
-+
-+            default:
-+                NS_ASSERTION(0, "bad type");
-+                break;
-+        }
-+    }
-+
-+    result = self->mOuter->CallMethod((uint16_t)methodIndex, info, dispatchParams);
-+
-+    if (dispatchParams != paramBuffer) {
-+        delete [] dispatchParams;
-+    }
-+
-+    return result;
-+}
-+
-+// Load w17 with the constant 'n' and branch to SharedStub().
-+# define STUB_ENTRY(n)                                                  \
-+    __asm__ (                                                           \
-+            ".section \".text\" \n\t"                                   \
-+            ".align 2\n\t"                                              \
-+            ".if "#n" < 10 \n\t"                                        \
-+            ".globl  _ZN14nsXPTCStubBase5Stub"#n"Ev \n\t"               \
-+            ".hidden _ZN14nsXPTCStubBase5Stub"#n"Ev \n\t"               \
-+            ".type   _ZN14nsXPTCStubBase5Stub"#n"Ev,@function \n\n"     \
-+            "_ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t"                      \
-+            ".elseif "#n" < 100 \n\t"                                   \
-+            ".globl  _ZN14nsXPTCStubBase6Stub"#n"Ev \n\t"               \
-+            ".hidden _ZN14nsXPTCStubBase6Stub"#n"Ev \n\t"               \
-+            ".type   _ZN14nsXPTCStubBase6Stub"#n"Ev,@function \n\n"     \
-+            "_ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t"                      \
-+            ".elseif "#n" < 1000 \n\t"                                  \
-+            ".globl  _ZN14nsXPTCStubBase7Stub"#n"Ev \n\t"               \
-+            ".hidden _ZN14nsXPTCStubBase7Stub"#n"Ev \n\t"               \
-+            ".type   _ZN14nsXPTCStubBase7Stub"#n"Ev,@function \n\n"     \
-+            "_ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t"                      \
-+            ".else  \n\t"                                               \
-+            ".err   \"stub number "#n" >= 1000 not yet supported\"\n"   \
-+            ".endif \n\t"                                               \
-+            "mov    w17,#"#n" \n\t"                                     \
-+            "b      SharedStub \n"                                      \
-+);
-+
-+#define SENTINEL_ENTRY(n)                              \
-+    nsresult nsXPTCStubBase::Sentinel##n()             \
-+{                                                      \
-+    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+    return NS_ERROR_NOT_IMPLEMENTED;                   \
-+}
-+
-+#include "xptcstubsdef.inc"
-diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_aarch64.s b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_aarch64.s
-new file mode 100644
---- /dev/null
-+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_aarch64.s
-@@ -0,0 +1,39 @@
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+
-+            .set NGPREGS,8
-+            .set NFPREGS,8
-+
-+            .section ".text"
-+            .globl SharedStub
-+            .hidden SharedStub
-+            .type  SharedStub,@function
-+SharedStub:
-+            stp         x29, x30, [sp,#-16]!
-+            mov         x29, sp
-+
-+            sub         sp, sp, #8*(NGPREGS+NFPREGS)
-+            stp         x0, x1, [sp, #64+(0*8)]
-+            stp         x2, x3, [sp, #64+(2*8)]
-+            stp         x4, x5, [sp, #64+(4*8)]
-+            stp         x6, x7, [sp, #64+(6*8)]
-+            stp         d0, d1, [sp, #(0*8)]
-+            stp         d2, d3, [sp, #(2*8)]
-+            stp         d4, d5, [sp, #(4*8)]
-+            stp         d6, d7, [sp, #(6*8)]
-+
-+            # methodIndex passed from stub
-+            mov         w1, w17
-+
-+            add         x2, sp, #16+(8*(NGPREGS+NFPREGS))
-+            add         x3, sp, #8*NFPREGS
-+            add         x4, sp, #0
-+
-+            bl          PrepareAndDispatch
-+
-+            add         sp, sp, #8*(NGPREGS+NFPREGS)
-+            ldp         x29, x30, [sp],#16
-+            ret
-+
-+            .size SharedStub, . - SharedStub
-
diff --git a/mozilla-aarch64-bmo-963027.patch b/mozilla-aarch64-bmo-963027.patch
deleted file mode 100644
index 59ef3308..00000000
--- a/mozilla-aarch64-bmo-963027.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-
-# HG changeset patch
-# User Marcin Juszkiewicz <mjuszkiewicz@redhat.com>
-# Date 1392218661 18000
-# Node ID 38fca44b6b86e2f12535900e2084f0378217570f
-# Parent  8858624d813a6200b059590c146cf774fc16ff38
-Bug 963027 - AArch64 support for WebRTC. r=derf
-
-Index: mozilla/media/webrtc/trunk/webrtc/typedefs.h
-===================================================================
---- mozilla.orig/media/webrtc/trunk/webrtc/typedefs.h
-+++ mozilla/media/webrtc/trunk/webrtc/typedefs.h
-@@ -113,6 +113,16 @@
- #define WEBRTC_ARCH_32_BITS 1
- #define WEBRTC_ARCH_BIG_ENDIAN
- #define WEBRTC_BIG_ENDIAN
-+#elif defined(__aarch64__)
-+#define WEBRTC_ARCH_AARCH64 1
-+#define WEBRTC_ARCH_64_BITS 1
-+#if defined(__AARCH64EL__)
-+#define WEBRTC_ARCH_LITTLE_ENDIAN
-+#define WEBRTC_LITTLE_ENDIAN
-+#elif defined(__AARCH64EB__)
-+#define WEBRTC_ARCH_BIG_ENDIAN
-+#define WEBRTC_BIG_ENDIAN
-+#endif
- #elif defined(__alpha__)
- #define WEBRTC_ARCH_ALPHA 1
- #define WEBRTC_ARCH_64_BITS 1
diff --git a/mozilla-kde.patch b/mozilla-kde.patch
index 81a35ca1..1444d66e 100644
--- a/mozilla-kde.patch
+++ b/mozilla-kde.patch
@@ -44,7 +44,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
  #include "prefread.h"
  #include "prefapi_private_data.h"
  
-@@ -1113,16 +1114,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
+@@ -1119,16 +1120,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
  
  static nsresult pref_LoadPrefsInDirList(const char *listId)
  {
@@ -79,7 +79,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
      return NS_OK;
  
    bool hasMore;
-@@ -1138,17 +1157,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -1144,17 +1163,17 @@ static nsresult pref_LoadPrefsInDirList(
  
      nsAutoCString leaf;
      path->GetNativeLeafName(leaf);
@@ -98,7 +98,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
  {
    nsZipItemPtr<char> manifest(jarReader, name, true);
    NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1242,28 +1261,40 @@ static nsresult pref_InitInitialObjects(
+@@ -1248,26 +1267,38 @@ static nsresult pref_InitInitialObjects(
    /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
    static const char* specialFiles[] = {
  #if defined(XP_MACOSX)
@@ -113,8 +113,6 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
  #elif defined(_AIX)
      , "aix.js"
  #endif
- #elif defined(XP_OS2)
-     "os2pref.js"
  #elif defined(XP_BEOS)
      "beos.js"
  #endif
@@ -184,21 +182,21 @@ diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpac
 diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in
 --- a/toolkit/components/downloads/Makefile.in
 +++ b/toolkit/components/downloads/Makefile.in
-@@ -4,9 +4,10 @@
+@@ -1,9 +1,9 @@
+ #
+ # This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
  include $(topsrcdir)/config/rules.mk
  
- CXXFLAGS += $(TK_CFLAGS) -DGOOGLE_PROTOBUF_NO_RTTI
- 
- LOCAL_INCLUDES += \
-   -I$(srcdir)/../protobuf \
-+  -I$(topsrcdir)/toolkit/xre \
-   $(NULL)
+ CXXFLAGS += $(TK_CFLAGS)
+-
++LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
 --- a/toolkit/components/downloads/nsDownloadManager.cpp
 +++ b/toolkit/components/downloads/nsDownloadManager.cpp
-@@ -41,16 +41,20 @@
+@@ -42,16 +42,20 @@
  #ifdef XP_WIN
  #include <shlobj.h>
  #include "nsWindowsHelpers.h"
@@ -219,7 +217,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
  #include "AndroidBridge.h"
  using namespace mozilla::widget::android;
  #endif
-@@ -2687,16 +2691,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2695,16 +2699,25 @@ nsDownload::SetState(DownloadState aStat
        nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
  
        // Master pref to control this function.
@@ -245,7 +243,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
          int64_t goat = PR_Now() - mStartTime;
          showTaskbarAlert = goat > alertIntervalUSec;
  
-@@ -2724,19 +2737,20 @@ nsDownload::SetState(DownloadState aStat
+@@ -2732,19 +2745,20 @@ nsDownload::SetState(DownloadState aStat
                // because if it is, they'll click open the download manager and
                // the items they downloaded will have been removed.
                alerts->ShowAlertNotification(
@@ -270,7 +268,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
 --- a/toolkit/content/jar.mn
 +++ b/toolkit/content/jar.mn
-@@ -55,29 +55,33 @@ toolkit.jar:
+@@ -56,29 +56,33 @@ toolkit.jar:
     content/global/viewZoomOverlay.js          (viewZoomOverlay.js)
  *+ content/global/bindings/autocomplete.xml    (widgets/autocomplete.xml)
     content/global/bindings/browser.xml         (widgets/browser.xml)
@@ -308,7 +306,7 @@ diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/di
 new file mode 100644
 --- /dev/null
 +++ b/toolkit/content/widgets/dialog-kde.xml
-@@ -0,0 +1,451 @@
+@@ -0,0 +1,449 @@
 +<?xml version="1.0"?>
 +<!-- This Source Code Form is subject to the terms of the Mozilla Public
 +   - License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -341,7 +339,7 @@ new file mode 100644
 +        <xul:button dlgtype="cancel" class="dialog-button"/>
 +        <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/>
 +#elif XP_UNIX
-+                pack="end">
++                >
 +	<xul:button dlgtype="help" class="dialog-button" hidden="true"/>
 +	<xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
 +	<xul:spacer anonid="spacer" flex="1" hidden="true"/>
@@ -728,8 +726,6 @@ new file mode 100644
 +    </implementation>
 +    
 +    <handlers>
-+      <handler event="keypress" keycode="VK_ENTER"
-+               group="system" action="this._hitEnter(event);"/>
 +      <handler event="keypress" keycode="VK_RETURN"
 +               group="system" action="this._hitEnter(event);"/>
 +      <handler event="keypress" keycode="VK_ESCAPE" group="system">
@@ -1350,7 +1346,7 @@ new file mode 100644
 +        <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
 +        <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
 +#elif XP_UNIX
-+                pack="end">
++                >
 +	<xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
 +	<xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
 +	<xul:spacer anonid="spacer" flex="1"/>
@@ -2197,14 +2193,14 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
 --- a/toolkit/xre/moz.build
 +++ b/toolkit/xre/moz.build
-@@ -45,17 +45,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
+@@ -43,17 +43,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
+     GENERATED_SOURCES += [
+         'moc_nsNativeAppSupportQt.cpp',
+     ]
+     SOURCES += [
          'nsNativeAppSupportQt.cpp',
          'nsQAppInstance.cpp',
      ]
- elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
-     SOURCES += [
-         'nsNativeAppSupportOS2.cpp',
-     ]
  elif CONFIG['MOZ_ENABLE_GTK']:
 +    EXPORTS += ['nsKDEUtils.h']
      UNIFIED_SOURCES += [
@@ -2617,7 +2613,7 @@ new file mode 100644
 diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
 --- a/uriloader/exthandler/Makefile.in
 +++ b/uriloader/exthandler/Makefile.in
-@@ -19,9 +19,10 @@ endif
+@@ -6,9 +6,10 @@
  ifdef MOZ_ENABLE_DBUS
  OS_INCLUDES   += $(TK_CFLAGS) $(MOZ_DBUS_CFLAGS)
  endif
@@ -2631,7 +2627,7 @@ diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
 --- a/uriloader/exthandler/moz.build
 +++ b/uriloader/exthandler/moz.build
-@@ -81,17 +81,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
+@@ -80,17 +80,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
  else:
      # These files can't be built in unified mode because they force NSPR logging.
      SOURCES += [
@@ -3440,10 +3436,10 @@ diff --git a/widget/gtk/nsFilePicker.h b/widget/gtk/nsFilePicker.h
 diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in
 --- a/xpcom/components/Makefile.in
 +++ b/xpcom/components/Makefile.in
-@@ -14,9 +14,10 @@ LOCAL_INCLUDES	= \
- 	-I$(topsrcdir)/chrome/src \
- 	-I$(topsrcdir)/modules/libjar \
- 	$(NULL)
+@@ -2,9 +2,10 @@
+ # This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
  include $(topsrcdir)/config/rules.mk
  
@@ -3583,19 +3579,6 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
  
      if (directive->regfunc) {
        if (GeckoProcessType_Default != XRE_GetProcessType())
-diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
---- a/xpcom/io/Makefile.in
-+++ b/xpcom/io/Makefile.in
-@@ -1,8 +1,8 @@
- # This Source Code Form is subject to the terms of the Mozilla Public
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- MOZILLA_INTERNAL_API = 1
- include $(topsrcdir)/config/rules.mk
- 
--LOCAL_INCLUDES	+= -I..
-+LOCAL_INCLUDES	+= -I.. -I$(topsrcdir)/toolkit/xre
 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 --- a/xpcom/io/nsLocalFileUnix.cpp
 +++ b/xpcom/io/nsLocalFileUnix.cpp
@@ -3617,7 +3600,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
  #include "prmem.h"
  #include "plbase64.h"
  
-@@ -1811,46 +1812,52 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1813,46 +1814,52 @@ nsLocalFile::SetPersistentDescriptor(con
      return InitWithNativePath(aPersistentDescriptor);
  #endif
  }
@@ -3684,7 +3667,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
        return rv;
      }
      return NS_ERROR_FAILURE;
-@@ -1858,16 +1865,23 @@ nsLocalFile::Reveal()
+@@ -1860,16 +1867,23 @@ nsLocalFile::Reveal()
      return NS_ERROR_FAILURE;
  #endif
  }
diff --git a/mozilla-language.patch b/mozilla-language.patch
index 26da69a8..5bc3a895 100644
--- a/mozilla-language.patch
+++ b/mozilla-language.patch
@@ -1,12 +1,12 @@
 # HG changeset patch
 # User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent df748bfc0eaca6dedf086cfd7167392416bfae27
+# Parent 13eb644c1216aed92b29dbc63fc26ce66f98c66c
 Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE
 
 diff --git a/intl/locale/src/nsLocaleService.cpp b/intl/locale/src/nsLocaleService.cpp
 --- a/intl/locale/src/nsLocaleService.cpp
 +++ b/intl/locale/src/nsLocaleService.cpp
-@@ -127,16 +127,17 @@ nsLocaleService::nsLocaleService(void)
+@@ -122,16 +122,17 @@ nsLocaleService::nsLocaleService(void)
      nsRefPtr<nsLocale> resultLocale(new nsLocale());
      NS_ENSURE_TRUE_VOID(resultLocale);
  
@@ -24,7 +24,7 @@ diff --git a/intl/locale/src/nsLocaleService.cpp b/intl/locale/src/nsLocaleServi
  
      for( i = 0; i < LocaleListLength; i++ ) {
          nsresult result;
-@@ -155,16 +156,21 @@ nsLocaleService::nsLocaleService(void)
+@@ -150,16 +151,21 @@ nsLocaleService::nsLocaleService(void)
              } else {
                  CopyASCIItoUTF16(lang, platformLocale);
                  result = nsPosixLocale::GetXPLocale(lang, xpLocale);
@@ -45,4 +45,4 @@ diff --git a/intl/locale/src/nsLocaleService.cpp b/intl/locale/src/nsLocaleServi
      mApplicationLocale = do_QueryInterface(resultLocale);
         
  #endif // XP_UNIX
- #ifdef XP_OS2
+ 
diff --git a/mozilla-ppc64-xpcom.patch b/mozilla-ppc64-xpcom.patch
deleted file mode 100644
index cb8e6559..00000000
--- a/mozilla-ppc64-xpcom.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.S
-===================================================================
---- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.S
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.S
-@@ -41,6 +41,11 @@ SharedStub:
-         .section ".text"
-         .align 2
-         .globl SharedStub
-+        # Make the symbol hidden so that the branch from the stub does
-+        # not go via a PLT.  This is not only better for performance,
-+        # but may be necessary to avoid linker errors since there is
-+        # no place to restore the TOC register in a sibling call.
-+        .hidden SharedStub
-         .section ".opd","aw"
-         .align 3
- 
diff --git a/mozilla-ppc64le-build.patch b/mozilla-ppc64le-build.patch
index c55ae87e..28db75d1 100644
--- a/mozilla-ppc64le-build.patch
+++ b/mozilla-ppc64le-build.patch
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent 8f66af6369d31e3952806faaa1f466a69d03f0eb
+# Parent 007cf000fdf7c5048939a87f63165a67fd9db5f6
 # User Ulrich Weigand <uweigand@de.ibm.com>
 Bug 976648 - powerpc64le-linux support - toplevel build/config
 
@@ -1344,7 +1344,7 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
  Try \`$me --help' for more information."
  
  # Parse command line
-@@ -118,20 +110,21 @@ case $# in
+@@ -118,23 +110,28 @@ case $# in
   *) echo "$me: too many arguments$help" >&2
      exit 1;;
  esac
@@ -1355,7 +1355,7 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
  case $maybe_os in
 -  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
 -  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-+  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* | \
@@ -1364,12 +1364,19 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
      ;;
++  android-linux)
++    os=-linux-android
++    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
++    ;;
    *)
      basic_machine=`echo $1 | sed 's/-[^-]*$//'`
      if [ $basic_machine != $1 ]
      then os=`echo $1 | sed 's/.*-/-/'`
      else os=; fi
-@@ -147,41 +140,41 @@ case $os in
+     ;;
+ esac
+ 
+@@ -147,41 +144,41 @@ case $os in
  		# Prevent following clause from handling this invalid input.
  		;;
  	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
@@ -1417,7 +1424,7 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  		;;
  	-sco5)
-@@ -216,16 +209,22 @@ case $os in
+@@ -216,16 +213,22 @@ case $os in
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  		;;
  	-clix*)
@@ -1440,7 +1447,7 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
  		;;
  	-windowsnt*)
  		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-@@ -240,30 +239,38 @@ case $os in
+@@ -240,30 +243,38 @@ case $os in
  esac
  
  # Decode aliases for certain CPU-COMPANY combinations.
@@ -1482,7 +1489,7 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
  	| mips64r5900 | mips64r5900el \
  	| mips64vr | mips64vrel \
  	| mips64vr4100 | mips64vr4100el \
-@@ -271,84 +278,118 @@ case $basic_machine in
+@@ -271,84 +282,118 @@ case $basic_machine in
  	| mips64vr5000 | mips64vr5000el \
  	| mips64vr5900 | mips64vr5900el \
  	| mipsisa32 | mipsisa32el \
@@ -1614,7 +1621,7 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
  	| mips64r5900-* | mips64r5900el-* \
  	| mips64vr-* | mips64vrel-* \
  	| mips64vr4100-* | mips64vr4100el-* \
-@@ -356,38 +397,44 @@ case $basic_machine in
+@@ -356,38 +401,44 @@ case $basic_machine in
  	| mips64vr5000-* | mips64vr5000el-* \
  	| mips64vr5900-* | mips64vr5900el-* \
  	| mipsisa32-* | mipsisa32el-* \
@@ -1667,7 +1674,7 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
  	xtensa*)
  		basic_machine=$basic_machine-unknown
  		;;
-@@ -402,17 +449,17 @@ case $basic_machine in
+@@ -402,17 +453,17 @@ case $basic_machine in
  		;;
  	3b*)
  		basic_machine=we32k-att
@@ -1686,7 +1693,7 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
  		;;
  	alliant | fx80)
  		basic_machine=fx80-alliant
-@@ -472,21 +519,30 @@ case $basic_machine in
+@@ -472,21 +523,30 @@ case $basic_machine in
  	blackfin-*)
  		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
  		os=-linux
@@ -1718,7 +1725,7 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
  		os=-bsd
  		;;
  	convex-c2)
-@@ -508,17 +564,17 @@ case $basic_machine in
+@@ -508,17 +568,17 @@ case $basic_machine in
  	cray | j90)
  		basic_machine=j90-cray
  		os=-unicos
@@ -1737,7 +1744,7 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
  		;;
  	crisv32 | crisv32-* | etraxfs*)
  		basic_machine=crisv32-axis
-@@ -666,17 +722,16 @@ case $basic_machine in
+@@ -666,17 +726,16 @@ case $basic_machine in
  		;;
  	hppro)
  		basic_machine=hppa1.1-hp
@@ -1755,7 +1762,7 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv4
  		;;
-@@ -724,21 +779,25 @@ case $basic_machine in
+@@ -724,21 +783,25 @@ case $basic_machine in
  	magnum | m3230)
  		basic_machine=mips-mips
  		os=-sysv
@@ -1783,7 +1790,7 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
  		;;
  	miniframe)
  		basic_machine=m68000-convergent
-@@ -763,20 +822,28 @@ case $basic_machine in
+@@ -763,20 +826,28 @@ case $basic_machine in
  		;;
  	msdos)
  		basic_machine=i386-pc
@@ -1812,7 +1819,7 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
  		basic_machine=i386-unknown
  		os=-netbsd
  		;;
-@@ -831,16 +898,22 @@ case $basic_machine in
+@@ -831,16 +902,22 @@ case $basic_machine in
  		;;
  	nonstopux)
  		basic_machine=mips-compaq
@@ -1835,7 +1842,7 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
  		os=-proelf
  		;;
  	openrisc | openrisc-*)
-@@ -913,19 +986,20 @@ case $basic_machine in
+@@ -913,19 +990,20 @@ case $basic_machine in
  	pentium4-*)
  		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
@@ -1858,7 +1865,7 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
  		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	ppc64)	basic_machine=powerpc64-unknown
-@@ -940,17 +1014,21 @@ case $basic_machine in
+@@ -940,17 +1018,21 @@ case $basic_machine in
  		;;
  	ps2)
  		basic_machine=i386-ibm
@@ -1881,7 +1888,7 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
  		os=-coff
  		;;
  	rm[46]00)
-@@ -1009,16 +1087,19 @@ case $basic_machine in
+@@ -1009,16 +1091,19 @@ case $basic_machine in
  		;;
  	st2000)
  		basic_machine=m68k-tandem
@@ -1901,7 +1908,7 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
  		os=-sunos3
  		;;
  	sun2os4)
-@@ -1065,30 +1146,18 @@ case $basic_machine in
+@@ -1065,30 +1150,18 @@ case $basic_machine in
  	t3e)
  		basic_machine=alphaev5-cray
  		os=-unicos
@@ -1933,7 +1940,7 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
  	tx39el)
  		basic_machine=mipstx39el-unknown
  		;;
-@@ -1148,16 +1217,19 @@ case $basic_machine in
+@@ -1148,16 +1221,19 @@ case $basic_machine in
  		;;
  	xbox)
  		basic_machine=i686-pc
@@ -1953,7 +1960,7 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
  		basic_machine=z8k-unknown
  		os=-sim
  		;;
-@@ -1245,19 +1317,22 @@ case $basic_machine in
+@@ -1245,19 +1321,22 @@ case $basic_machine in
  		;;
  esac
  
@@ -1978,7 +1985,7 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
  		;;
  	-svr4*)
  		os=-sysv4
-@@ -1269,39 +1344,40 @@ case $os in
+@@ -1269,39 +1348,40 @@ case $os in
  		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
  		;;
  	# First accept the basic system types.
@@ -2006,7 +2013,7 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
 -	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 -	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 +	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-+	      | -mingw32* | -mingw64* | -linux-gnu* \
++	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 +	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
  	      | -uxpv* | -beos* | -mpeix* | -udk* \
  	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
@@ -2025,7 +2032,7 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
  			;;
  		    *)
  			os=-nto$os
-@@ -1330,22 +1406,19 @@ case $os in
+@@ -1330,22 +1410,19 @@ case $os in
  		os=`echo $os | sed -e 's|sunos5|solaris2|'`
  		;;
  	-sunos6*)
@@ -2049,7 +2056,7 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
  		;;
  	-osf*)
  		os=-osf
-@@ -1382,17 +1455,17 @@ case $os in
+@@ -1382,17 +1459,17 @@ case $os in
  		;;
  	# Preserve the version number of sinix5.
  	-sinix5.*)
@@ -2068,7 +2075,7 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
  	-oss*)
  		os=-sysv3
  		;;
-@@ -1418,28 +1491,27 @@ case $os in
+@@ -1418,28 +1495,24 @@ case $os in
  		os=-xenix
  		;;
  	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
@@ -2086,9 +2093,9 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
  	-dicos*)
  		os=-dicos
  		;;
-         -android*)
- 	        os=-android
-                 ;;
+-        -android*)
+-	        os=-android
+-                ;;
 +	-nacl*)
 +		;;
  	-none)
@@ -2099,7 +2106,7 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
  		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
  		exit 1
  		;;
-@@ -1452,33 +1524,48 @@ else
+@@ -1452,33 +1525,48 @@ else
  
  # Note that if you're going to try to match "-MANUFACTURER" here (say,
  # "-sun"), then you have to tell the case statement up towards the top
@@ -2152,7 +2159,7 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
  	pdp11-*)
  		os=-none
  		;;
-@@ -1488,32 +1575,32 @@ case $basic_machine in
+@@ -1488,32 +1576,32 @@ case $basic_machine in
  	m68*-apollo)
  		os=-domain
  		;;
@@ -2189,7 +2196,7 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
  		;;
  	sparc-* | *-sun)
  		os=-sunos4.1.1
-@@ -1522,17 +1609,17 @@ case $basic_machine in
+@@ -1522,17 +1610,17 @@ case $basic_machine in
  		os=-beos
  		;;
  	*-haiku)
@@ -2208,10 +2215,30 @@ diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
  	*-winbond)
  		os=-proelf
  		;;
+@@ -1684,19 +1772,16 @@ case $basic_machine in
+ 				vendor=apple
+ 				;;
+ 			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ 				vendor=atari
+ 				;;
+ 			-vos*)
+ 				vendor=stratus
+ 				;;
+-			*-android*|*-linuxandroid*)
+-				vendor=linux-
+-				;;
+ 		esac
+ 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+ 		;;
+ esac
+ 
+ echo $basic_machine$os
+ exit
+ 
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -1121,17 +1121,17 @@ esac
+@@ -1082,17 +1082,17 @@ esac
  
  # Only set CPU_ARCH if we recognize the value of OS_TEST
  
@@ -2230,3 +2257,2235 @@ diff --git a/configure.in b/configure.in
      ;;
  
  Alpha | alpha | ALPHA)
+diff --git a/js/src/build/autoconf/config.guess b/js/src/build/autoconf/config.guess
+--- a/js/src/build/autoconf/config.guess
++++ b/js/src/build/autoconf/config.guess
+@@ -1,47 +1,41 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+-#   Free Software Foundation, Inc.
++#   Copyright 1992-2014 Free Software Foundation, Inc.
+ 
+-timestamp='2009-08-19'
++timestamp='2014-02-12'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
++# the Free Software Foundation; either version 3 of the License, or
+ # (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful, but
+ # WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+-# the same distribution terms that you use for the rest of that program.
+-
+-
+-# Originally written by Per Bothner.  Please send patches (context
+-# diff format) to <config-patches@gnu.org> and include a ChangeLog
+-# entry.
++# the same distribution terms that you use for the rest of that
++# program.  This Exception is an additional permission under section 7
++# of the GNU General Public License, version 3 ("GPLv3").
+ #
+-# This script attempts to guess a canonical system name similar to
+-# config.sub.  If it succeeds, it prints the system name on stdout, and
+-# exits with 0.  Otherwise, it exits with 1.
++# Originally written by Per Bothner.
+ #
+ # 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
++#
++# Please send patches with a ChangeLog entry to config-patches@gnu.org.
++
+ 
+ me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+ usage="\
+ Usage: $0 [OPTION]
+ 
+ Output the configuration name of the system \`$me' is run on.
+ 
+@@ -51,18 +45,17 @@ Operation modes:
+   -v, --version      print version number, then exit
+ 
+ Report bugs and patches to <config-patches@gnu.org>."
+ 
+ version="\
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright 1992-2014 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."
+ 
+ help="
+ Try \`$me --help' for more information."
+ 
+ # Parse command line
+@@ -134,22 +127,43 @@ if (test -f /.attbin/uname) >/dev/null 2
+ 	PATH=$PATH:/.attbin ; export PATH
+ fi
+ 
+ UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+ 
++case "${UNAME_SYSTEM}" in
++Linux|GNU|GNU/*)
++	# If the system lacks a compiler, then just pick glibc.
++	# We could probably try harder.
++	LIBC=gnu
++
++	eval $set_cc_for_build
++	cat <<-EOF > $dummy.c
++	#include <features.h>
++	#if defined(__UCLIBC__)
++	LIBC=uclibc
++	#elif defined(__dietlibc__)
++	LIBC=dietlibc
++	#else
++	LIBC=gnu
++	#endif
++	EOF
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
++	;;
++esac
++
+ # Note: order is significant - the case branches are not exclusive.
+ 
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+     *:NetBSD:*:*)
+ 	# NetBSD (nbsd) targets should (where applicable) match one or
+-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
++	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+ 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+ 	# switched to ELF, *-*-netbsd* would select the old
+ 	# object file format.  This provides both forward
+ 	# compatibility and a consistent mechanism for selecting the
+ 	# object file format.
+ 	#
+ 	# Note: NetBSD doesn't particularly care about the vendor
+ 	# portion of the name.  We always set it to "unknown".
+@@ -175,17 +189,17 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ 		    # Return netbsd for either.  FIX?
+ 		    os=netbsd
+ 		else
+ 		    os=netbsdelf
+ 		fi
+ 		;;
+ 	    *)
+-	        os=netbsd
++		os=netbsd
+ 		;;
+ 	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
+@@ -196,16 +210,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ 		;;
+ 	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}"
+ 	exit ;;
++    *:Bitrig:*:*)
++	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
++	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
++	exit ;;
+     *:OpenBSD:*:*)
+ 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+ 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+ 	exit ;;
+     *:ekkoBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ 	exit ;;
+     *:SolidBSD:*:*)
+@@ -218,17 +236,17 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+ 	exit ;;
+     alpha:OSF1:*:*)
+ 	case $UNAME_RELEASE in
+ 	*4.0)
+ 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+ 		;;
+ 	*5.*)
+-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
++		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ 		;;
+ 	esac
+ 	# According to Compaq, /usr/sbin/psrinfo has been available on
+ 	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+ 	# covers most systems running today.  This code pipes the CPU
+ 	# types through head -n 1, so we only detect the type of CPU 0.
+ 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+ 	case "$ALPHA_CPU_TYPE" in
+@@ -264,17 +282,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 		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'`
+-	exit ;;
++	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
++	exitcode=$?
++	trap '' 0
++	exit $exitcode ;;
+     Alpha\ *:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+ 	# Should we change UNAME_MACHINE based on the output of uname instead
+ 	# of the specific Alpha model?
+ 	echo alpha-pc-interix
+ 	exit ;;
+     21064:Windows_NT:50:3)
+ 	echo alpha-dec-winnt3.5
+@@ -290,22 +311,22 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 	exit ;;
+     *:OS/390:*:*)
+ 	echo i370-ibm-openedition
+ 	exit ;;
+     *:z/VM:*:*)
+ 	echo s390-ibm-zvmoe
+ 	exit ;;
+     *:OS400:*:*)
+-        echo powerpc-ibm-os400
++	echo powerpc-ibm-os400
+ 	exit ;;
+     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ 	echo arm-acorn-riscix${UNAME_RELEASE}
+ 	exit ;;
+-    arm:riscos:*:*|arm:RISCOS:*:*)
++    arm*:riscos:*:*|arm*:RISCOS:*:*)
+ 	echo arm-unknown-riscos
+ 	exit ;;
+     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+ 	echo hppa1.1-hitachi-hiuxmpp
+ 	exit ;;
+     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+ 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+ 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+@@ -328,16 +349,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 	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/[^.]*//'`
+ 	exit ;;
+     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
++    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
++	echo i386-pc-auroraux${UNAME_RELEASE}
++	exit ;;
+     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ 	eval $set_cc_for_build
+ 	SUN_ARCH="i386"
+ 	# 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 (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+@@ -386,33 +410,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+     # can be virtually everything (everything which is not
+     # "atarist" or "atariste" at least should have a processor
+     # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+     # to the lowercase version "mint" (or "freemint").  Finally
+     # the system name "TOS" denotes a system which is actually not
+     # MiNT.  But MiNT is downward compatible to TOS, so this should
+     # be no problem.
+     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+-        echo m68k-atari-mint${UNAME_RELEASE}
++	echo m68k-atari-mint${UNAME_RELEASE}
+ 	exit ;;
+     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+ 	echo m68k-atari-mint${UNAME_RELEASE}
+-        exit ;;
++	exit ;;
+     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+-        echo m68k-atari-mint${UNAME_RELEASE}
++	echo m68k-atari-mint${UNAME_RELEASE}
+ 	exit ;;
+     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+-        echo m68k-milan-mint${UNAME_RELEASE}
+-        exit ;;
++	echo m68k-milan-mint${UNAME_RELEASE}
++	exit ;;
+     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+-        echo m68k-hades-mint${UNAME_RELEASE}
+-        exit ;;
++	echo m68k-hades-mint${UNAME_RELEASE}
++	exit ;;
+     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+-        echo m68k-unknown-mint${UNAME_RELEASE}
+-        exit ;;
++	echo m68k-unknown-mint${UNAME_RELEASE}
++	exit ;;
+     m68k:machten:*:*)
+ 	echo m68k-apple-machten${UNAME_RELEASE}
+ 	exit ;;
+     powerpc:machten:*:*)
+ 	echo powerpc-apple-machten${UNAME_RELEASE}
+ 	exit ;;
+     RISC*:Mach:*:*)
+ 	echo mips-dec-mach_bsd4.3
+@@ -472,31 +496,31 @@ EOF
+ 	exit ;;
+     m88k:*:4*:R4*)
+ 	echo m88k-motorola-sysv4
+ 	exit ;;
+     m88k:*:3*:R3*)
+ 	echo m88k-motorola-sysv3
+ 	exit ;;
+     AViiON:dgux:*:*)
+-        # DG/UX returns AViiON for all architectures
+-        UNAME_PROCESSOR=`/usr/bin/uname -p`
++	# DG/UX returns AViiON for all architectures
++	UNAME_PROCESSOR=`/usr/bin/uname -p`
+ 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ 	then
+ 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+ 	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+ 	    then
+ 		echo m88k-dg-dgux${UNAME_RELEASE}
+ 	    else
+ 		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+ 	    fi
+ 	else
+ 	    echo i586-dg-dgux${UNAME_RELEASE}
+ 	fi
+- 	exit ;;
++	exit ;;
+     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+ 	echo m88k-dolphin-sysv3
+ 	exit ;;
+     M88*:*:R3*:*)
+ 	# Delta 88k system running SVR3
+ 	echo m88k-motorola-sysv3
+ 	exit ;;
+     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+@@ -543,17 +567,17 @@ EOF
+ 			echo rs6000-ibm-aix3.2.5
+ 		fi
+ 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+ 		echo rs6000-ibm-aix3.2.4
+ 	else
+ 		echo rs6000-ibm-aix3.2
+ 	fi
+ 	exit ;;
+-    *:AIX:*:[456])
++    *:AIX:*:[4567])
+ 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ 		IBM_ARCH=rs6000
+ 	else
+ 		IBM_ARCH=powerpc
+ 	fi
+ 	if [ -x /usr/bin/oslevel ] ; then
+ 		IBM_REV=`/usr/bin/oslevel`
+@@ -586,62 +610,62 @@ EOF
+     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 ;;
+ 	    9000/[678][0-9][0-9])
+ 		if [ -x /usr/bin/getconf ]; then
+ 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+-                    case "${sc_cpu_version}" in
+-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+-                      532)                      # CPU_PA_RISC2_0
+-                        case "${sc_kernel_bits}" in
+-                          32) HP_ARCH="hppa2.0n" ;;
+-                          64) HP_ARCH="hppa2.0w" ;;
++		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
++		    case "${sc_cpu_version}" in
++		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
++		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
++		      532)                      # CPU_PA_RISC2_0
++			case "${sc_kernel_bits}" in
++			  32) HP_ARCH="hppa2.0n" ;;
++			  64) HP_ARCH="hppa2.0w" ;;
+ 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+-                        esac ;;
+-                    esac
++			esac ;;
++		    esac
+ 		fi
+ 		if [ "${HP_ARCH}" = "" ]; then
+ 		    eval $set_cc_for_build
+-		    sed 's/^              //' << EOF >$dummy.c
++		    sed 's/^		//' << EOF >$dummy.c
+ 
+-              #define _HPUX_SOURCE
+-              #include <stdlib.h>
+-              #include <unistd.h>
++		#define _HPUX_SOURCE
++		#include <stdlib.h>
++		#include <unistd.h>
+ 
+-              int main ()
+-              {
+-              #if defined(_SC_KERNEL_BITS)
+-                  long bits = sysconf(_SC_KERNEL_BITS);
+-              #endif
+-                  long cpu  = sysconf (_SC_CPU_VERSION);
++		int main ()
++		{
++		#if defined(_SC_KERNEL_BITS)
++		    long bits = sysconf(_SC_KERNEL_BITS);
++		#endif
++		    long cpu  = sysconf (_SC_CPU_VERSION);
+ 
+-                  switch (cpu)
+-              	{
+-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+-              	case CPU_PA_RISC2_0:
+-              #if defined(_SC_KERNEL_BITS)
+-              	    switch (bits)
+-              		{
+-              		case 64: puts ("hppa2.0w"); break;
+-              		case 32: puts ("hppa2.0n"); break;
+-              		default: puts ("hppa2.0"); break;
+-              		} break;
+-              #else  /* !defined(_SC_KERNEL_BITS) */
+-              	    puts ("hppa2.0"); break;
+-              #endif
+-              	default: puts ("hppa1.0"); break;
+-              	}
+-                  exit (0);
+-              }
++		    switch (cpu)
++			{
++			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
++			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
++			case CPU_PA_RISC2_0:
++		#if defined(_SC_KERNEL_BITS)
++			    switch (bits)
++				{
++				case 64: puts ("hppa2.0w"); break;
++				case 32: puts ("hppa2.0n"); break;
++				default: puts ("hppa2.0"); break;
++				} break;
++		#else  /* !defined(_SC_KERNEL_BITS) */
++			    puts ("hppa2.0"); break;
++		#endif
++			default: puts ("hppa1.0"); break;
++			}
++		    exit (0);
++		}
+ EOF
+ 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ 		    test -z "$HP_ARCH" && HP_ARCH=hppa
+ 		fi ;;
+ 	esac
+ 	if [ ${HP_ARCH} = "hppa2.0w" ]
+ 	then
+ 	    eval $set_cc_for_build
+@@ -722,32 +746,32 @@ EOF
+ 	    echo ${UNAME_MACHINE}-unknown-osf1
+ 	fi
+ 	exit ;;
+     parisc*:Lites*:*:*)
+ 	echo hppa1.1-hp-lites
+ 	exit ;;
+     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ 	echo c1-convex-bsd
+-        exit ;;
++	exit ;;
+     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+ 	if getsysinfo -f scalar_acc
+ 	then echo c32-convex-bsd
+ 	else echo c2-convex-bsd
+ 	fi
+-        exit ;;
++	exit ;;
+     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+ 	echo c34-convex-bsd
+-        exit ;;
++	exit ;;
+     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+ 	echo c38-convex-bsd
+-        exit ;;
++	exit ;;
+     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ 	echo c4-convex-bsd
+-        exit ;;
++	exit ;;
+     CRAY*Y-MP:*:*:*)
+ 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit ;;
+     CRAY*[A-Z]90:*:*:*)
+ 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+ 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+ 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+ 	      -e 's/\.[^.]*$/.X/'
+@@ -761,63 +785,68 @@ EOF
+     CRAY*SV1:*:*:*)
+ 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit ;;
+     *:UNICOS/mp:*:*)
+ 	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/ /_/'`
+-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+-        exit ;;
++	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
++	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++	exit ;;
+     5000:UNIX_System_V:4.*:*)
+-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
++	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ 	exit ;;
+     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ 	exit ;;
+     sparc*:BSD/OS:*:*)
+ 	echo sparc-unknown-bsdi${UNAME_RELEASE}
+ 	exit ;;
+     *:BSD/OS:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ 	exit ;;
+     *:FreeBSD:*:*)
+-	case ${UNAME_MACHINE} in
+-	    pc98)
+-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	UNAME_PROCESSOR=`/usr/bin/uname -p`
++	case ${UNAME_PROCESSOR} in
+ 	    amd64)
+ 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ 	    *)
+-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ 	esac
+ 	exit ;;
+     i*:CYGWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-cygwin
+ 	exit ;;
++    *:MINGW64*:*)
++	echo ${UNAME_MACHINE}-pc-mingw64
++	exit ;;
+     *:MINGW*:*)
+ 	echo ${UNAME_MACHINE}-pc-mingw32
+ 	exit ;;
++    i*:MSYS*:*)
++	echo ${UNAME_MACHINE}-pc-msys
++	exit ;;
+     i*:windows32*:*)
+-    	# uname -m includes "-pc" on this system.
+-    	echo ${UNAME_MACHINE}-mingw32
++	# uname -m includes "-pc" on this system.
++	echo ${UNAME_MACHINE}-mingw32
+ 	exit ;;
+     i*:PW*:*)
+ 	echo ${UNAME_MACHINE}-pc-pw32
+ 	exit ;;
+-    *:Interix*:[3456]*)
+-    	case ${UNAME_MACHINE} in
++    *:Interix*:*)
++	case ${UNAME_MACHINE} in
+ 	    x86)
+ 		echo i586-pc-interix${UNAME_RELEASE}
+ 		exit ;;
+-	    EM64T | authenticamd | genuineintel)
++	    authenticamd | genuineintel | EM64T)
+ 		echo x86_64-unknown-interix${UNAME_RELEASE}
+ 		exit ;;
+ 	    IA64)
+ 		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
+@@ -840,55 +869,91 @@ EOF
+     p*:CYGWIN*:*)
+ 	echo powerpcle-unknown-cygwin
+ 	exit ;;
+     prep*:SunOS:5.*:*)
+ 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
+     *:GNU:*:*)
+ 	# the GNU system
+-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
++	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ 	exit ;;
+     *:GNU/*:*:*)
+ 	# other systems with GNU libc and userland
+-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
++	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+ 	exit ;;
+     i*86:Minix:*:*)
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit ;;
++    aarch64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
++    aarch64_be:Linux:*:*)
++	UNAME_MACHINE=aarch64_be
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
++    alpha:Linux:*:*)
++	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++	  EV5)   UNAME_MACHINE=alphaev5 ;;
++	  EV56)  UNAME_MACHINE=alphaev56 ;;
++	  PCA56) UNAME_MACHINE=alphapca56 ;;
++	  PCA57) UNAME_MACHINE=alphapca56 ;;
++	  EV6)   UNAME_MACHINE=alphaev6 ;;
++	  EV67)  UNAME_MACHINE=alphaev67 ;;
++	  EV68*) UNAME_MACHINE=alphaev68 ;;
++	esac
++	objdump --private-headers /bin/sh | grep -q ld.so.1
++	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
++    arc:Linux:*:* | arceb:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
+     arm*:Linux:*:*)
+ 	eval $set_cc_for_build
+ 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ 	    | grep -q __ARM_EABI__
+ 	then
+-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
++	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	else
+-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
++		| grep -q __ARM_PCS_VFP
++	    then
++		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
++	    else
++		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
++	    fi
+ 	fi
+ 	exit ;;
+     avr32*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     cris:Linux:*:*)
+-	echo cris-axis-linux-gnu
++	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ 	exit ;;
+     crisv32:Linux:*:*)
+-	echo crisv32-axis-linux-gnu
++	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ 	exit ;;
+     frv:Linux:*:*)
+-    	echo frv-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
++    hexagon:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
++    i*86:Linux:*:*)
++	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ 	exit ;;
+     ia64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     m32r*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     m68*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     mips:Linux:*:* | mips64:Linux:*:*)
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ 	#undef CPU
+ 	#undef ${UNAME_MACHINE}
+ 	#undef ${UNAME_MACHINE}el
+ 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+@@ -896,145 +961,87 @@ EOF
+ 	#else
+ 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ 	CPU=${UNAME_MACHINE}
+ 	#else
+ 	CPU=
+ 	#endif
+ 	#endif
+ EOF
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+-	    /^CPU/{
+-		s: ::g
+-		p
+-	    }'`"
+-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+ 	;;
++    or1k:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
+     or32:Linux:*:*)
+-	echo or32-unknown-linux-gnu
+-	exit ;;
+-    ppc:Linux:*:*)
+-	echo powerpc-unknown-linux-gnu
+-	exit ;;
+-    ppc64:Linux:*:*)
+-	echo powerpc64-unknown-linux-gnu
+-	exit ;;
+-    alpha:Linux:*:*)
+-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+-	  EV5)   UNAME_MACHINE=alphaev5 ;;
+-	  EV56)  UNAME_MACHINE=alphaev56 ;;
+-	  PCA56) UNAME_MACHINE=alphapca56 ;;
+-	  PCA57) UNAME_MACHINE=alphapca56 ;;
+-	  EV6)   UNAME_MACHINE=alphaev6 ;;
+-	  EV67)  UNAME_MACHINE=alphaev67 ;;
+-	  EV68*) UNAME_MACHINE=alphaev68 ;;
+-        esac
+-	objdump --private-headers /bin/sh | grep -q ld.so.1
+-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     padre:Linux:*:*)
+-	echo sparc-unknown-linux-gnu
++	echo sparc-unknown-linux-${LIBC}
++	exit ;;
++    parisc64:Linux:*:* | hppa64:Linux:*:*)
++	echo hppa64-unknown-linux-${LIBC}
+ 	exit ;;
+     parisc:Linux:*:* | hppa:Linux:*:*)
+ 	# Look for CPU level
+ 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+-	  *)    echo hppa-unknown-linux-gnu ;;
++	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
++	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
++	  *)    echo hppa-unknown-linux-${LIBC} ;;
+ 	esac
+ 	exit ;;
+-    parisc64:Linux:*:* | hppa64:Linux:*:*)
+-	echo hppa64-unknown-linux-gnu
++    ppc64:Linux:*:*)
++	echo powerpc64-unknown-linux-${LIBC}
++	exit ;;
++    ppc:Linux:*:*)
++	echo powerpc-unknown-linux-${LIBC}
++	exit ;;
++    ppc64le:Linux:*:*)
++	echo powerpc64le-unknown-linux-${LIBC}
++	exit ;;
++    ppcle:Linux:*:*)
++	echo powerpcle-unknown-linux-${LIBC}
+ 	exit ;;
+     s390:Linux:*:* | s390x:Linux:*:*)
+-	echo ${UNAME_MACHINE}-ibm-linux
++	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+ 	exit ;;
+     sh64*:Linux:*:*)
+-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     sh*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     sparc:Linux:*:* | sparc64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
++    tile*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     vax:Linux:*:*)
+-	echo ${UNAME_MACHINE}-dec-linux-gnu
++	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+ 	exit ;;
+     x86_64:Linux:*:*)
+-	echo x86_64-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     xtensa*:Linux:*:*)
+-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+-    i*86:Linux:*:*)
+-	# The BFD linker knows what the default object file format is, so
+-	# first see if it will tell us. cd to the root directory to prevent
+-	# problems with other programs or directories called `ld' in the path.
+-	# Set LC_ALL=C to ensure ld outputs messages in English.
+-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+-			 | sed -ne '/supported targets:/!d
+-				    s/[ 	][ 	]*/ /g
+-				    s/.*supported targets: *//
+-				    s/ .*//
+-				    p'`
+-        case "$ld_supported_targets" in
+-	  elf32-i386)
+-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+-		;;
+-	esac
+-	# Determine whether the default compiler is a.out or elf
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#include <features.h>
+-	#ifdef __ELF__
+-	# ifdef __GLIBC__
+-	#  if __GLIBC__ >= 2
+-	LIBC=gnu
+-	#  else
+-	LIBC=gnulibc1
+-	#  endif
+-	# else
+-	LIBC=gnulibc1
+-	# endif
+-	#else
+-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+-	LIBC=gnu
+-	#else
+-	LIBC=gnuaout
+-	#endif
+-	#endif
+-	#ifdef __dietlibc__
+-	LIBC=dietlibc
+-	#endif
+-EOF
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+-	    /^LIBC/{
+-		s: ::g
+-		p
+-	    }'`"
+-	test x"${LIBC}" != x && {
+-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+-		exit
+-	}
+-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+-	;;
+     i*86:DYNIX/ptx:4*:*)
+ 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ 	# earlier versions are messed up and put the nodename in both
+ 	# sysname and nodename.
+ 	echo i386-sequent-sysv4
+ 	exit ;;
+     i*86:UNIX_SV:4.2MP:2.*)
+-        # Unixware is an offshoot of SVR4, but it has its own version
+-        # number series starting with 2...
+-        # I am not positive that other SVR4 systems won't match this,
++	# Unixware is an offshoot of SVR4, but it has its own version
++	# number series starting with 2...
++	# I am not positive that other SVR4 systems won't match this,
+ 	# I just have to hope.  -- rms.
+-        # Use sysv4.2uw... so that sysv4* matches it.
++	# Use sysv4.2uw... so that sysv4* matches it.
+ 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ 	exit ;;
+     i*86:OS/2:*:*)
+ 	# If we were able to find `uname', then EMX Unix compatibility
+ 	# is probably installed.
+ 	echo ${UNAME_MACHINE}-pc-os2-emx
+ 	exit ;;
+     i*86:XTS-300:*:STOP)
+@@ -1056,17 +1063,17 @@ EOF
+ 	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}
+ 	else
+ 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+ 	fi
+ 	exit ;;
+     i*86:*:5:[678]*)
+-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
++	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+ 	case `/bin/uname -X | grep "^Machine"` in
+ 	    *486*)	     UNAME_MACHINE=i486 ;;
+ 	    *Pentium)	     UNAME_MACHINE=i586 ;;
+ 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+ 	esac
+ 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ 	exit ;;
+     i*86:*:3.2:*)
+@@ -1084,23 +1091,23 @@ EOF
+ 			&& UNAME_MACHINE=i686
+ 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+ 	else
+ 		echo ${UNAME_MACHINE}-pc-sysv32
+ 	fi
+ 	exit ;;
+     pc:*:*:*)
+ 	# Left here for compatibility:
+-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+-        # the processor, so we play safe by assuming i586.
++	# uname -m prints for DJGPP always 'pc', but it prints nothing about
++	# the processor, so we play safe by assuming i586.
+ 	# Note: whatever this is, it MUST be the same as what config.sub
+ 	# prints for the "djgpp" host, or else GDB configury will decide that
+ 	# this is a cross-build.
+ 	echo i586-pc-msdosdjgpp
+-        exit ;;
++	exit ;;
+     Intel:Mach:3*:*)
+ 	echo i386-pc-mach3
+ 	exit ;;
+     paragon:*:*:*)
+ 	echo i860-intel-osf1
+ 	exit ;;
+     i860:*:4.*:*) # i860-SVR4
+ 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+@@ -1125,18 +1132,18 @@ EOF
+ 	OS_REL=''
+ 	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; }
+ 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+-          && { echo i486-ncr-sysv4; exit; } ;;
++	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++	  && { echo i486-ncr-sysv4; exit; } ;;
+     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+ 	OS_REL='.3'
+ 	test -r /etc/.relid \
+ 	    && 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; }
+ 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ 	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+@@ -1169,20 +1176,20 @@ EOF
+     *:SINIX-*:*:*)
+ 	if uname -p 2>/dev/null >/dev/null ; then
+ 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ 		echo ${UNAME_MACHINE}-sni-sysv4
+ 	else
+ 		echo ns32k-sni-sysv
+ 	fi
+ 	exit ;;
+-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+-        echo i586-unisys-sysv4
+-        exit ;;
++    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
++			# says <Richard.M.Bartel@ccMail.Census.GOV>
++	echo i586-unisys-sysv4
++	exit ;;
+     *:UNIX_System_V:4*:FTX*)
+ 	# From Gerald Hewes <hewes@openmarket.com>.
+ 	# How about differentiating between stratus architectures? -djm
+ 	echo hppa1.1-stratus-sysv4
+ 	exit ;;
+     *:*:*:FTX*)
+ 	# From seanf@swdc.stratus.com.
+ 	echo i860-stratus-sysv4
+@@ -1198,33 +1205,36 @@ EOF
+     mc68*:A/UX:*:*)
+ 	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 ;;
++	exit ;;
+     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+ 	echo powerpc-be-beos
+ 	exit ;;
+     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+ 	echo powerpc-apple-beos
+ 	exit ;;
+     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+ 	echo i586-pc-beos
+ 	exit ;;
+     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+ 	echo i586-pc-haiku
+ 	exit ;;
++    x86_64:Haiku:*:*)
++	echo x86_64-unknown-haiku
++	exit ;;
+     SX-4:SUPER-UX:*:*)
+ 	echo sx4-nec-superux${UNAME_RELEASE}
+ 	exit ;;
+     SX-5:SUPER-UX:*:*)
+ 	echo sx5-nec-superux${UNAME_RELEASE}
+ 	exit ;;
+     SX-6:SUPER-UX:*:*)
+ 	echo sx6-nec-superux${UNAME_RELEASE}
+@@ -1241,37 +1251,58 @@ EOF
+     Power*:Rhapsody:*:*)
+ 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ 	exit ;;
+     *:Rhapsody:*:*)
+ 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+ 	exit ;;
+     *:Darwin:*:*)
+ 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+-	case $UNAME_PROCESSOR in
+-	    i386) eval $set_cc_for_build
+-	          if $CC_FOR_BUILD -E -dM -x c /dev/null | grep __LP64__>/dev/null 2>&1 ; then
+-	            UNAME_PROCESSOR=x86_64
+-	          fi ;;
+-	    unknown) UNAME_PROCESSOR=powerpc ;;
+-	esac
++	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 (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++		    grep IS_64BIT_ARCH >/dev/null
++		then
++		    case $UNAME_PROCESSOR in
++			i386) UNAME_PROCESSOR=x86_64 ;;
++			powerpc) UNAME_PROCESSOR=powerpc64 ;;
++		    esac
++		fi
++	    fi
++	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}
+ 	exit ;;
+     *:procnto*:*:* | *:QNX:[0123456789]*:*)
+ 	UNAME_PROCESSOR=`uname -p`
+ 	if test "$UNAME_PROCESSOR" = "x86"; then
+ 		UNAME_PROCESSOR=i386
+ 		UNAME_MACHINE=pc
+ 	fi
+ 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+ 	exit ;;
+     *:QNX:*:4*)
+ 	echo i386-pc-qnx
+ 	exit ;;
+-    NSE-?:NONSTOP_KERNEL:*:*)
++    NEO-?:NONSTOP_KERNEL:*:*)
++	echo neo-tandem-nsk${UNAME_RELEASE}
++	exit ;;
++    NSE-*:NONSTOP_KERNEL:*:*)
+ 	echo nse-tandem-nsk${UNAME_RELEASE}
+ 	exit ;;
+     NSR-?:NONSTOP_KERNEL:*:*)
+ 	echo nsr-tandem-nsk${UNAME_RELEASE}
+ 	exit ;;
+     *:NonStop-UX:*:*)
+ 	echo mips-compaq-nonstopux
+ 	exit ;;
+@@ -1306,23 +1337,23 @@ EOF
+ 	exit ;;
+     *:TOPS-20:*:*)
+ 	echo pdp10-unknown-tops20
+ 	exit ;;
+     *:ITS:*:*)
+ 	echo pdp10-unknown-its
+ 	exit ;;
+     SEI:*:*:SEIUX)
+-        echo mips-sei-seiux${UNAME_RELEASE}
++	echo mips-sei-seiux${UNAME_RELEASE}
+ 	exit ;;
+     *:DragonFly:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ 	exit ;;
+     *:*VMS:*:*)
+-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
++	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ 	case "${UNAME_MACHINE}" in
+ 	    A*) echo alpha-dec-vms ; exit ;;
+ 	    I*) echo ia64-dec-vms ; exit ;;
+ 	    V*) echo vax-dec-vms ; exit ;;
+ 	esac ;;
+     *:XENIX:*:SysV)
+ 	echo i386-pc-xenix
+ 	exit ;;
+@@ -1330,169 +1361,21 @@ EOF
+ 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+ 	exit ;;
+     i*86:rdos:*:*)
+ 	echo ${UNAME_MACHINE}-pc-rdos
+ 	exit ;;
+     i*86:AROS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-aros
+ 	exit ;;
++    x86_64:VMkernel:*:*)
++	echo ${UNAME_MACHINE}-unknown-esx
++	exit ;;
+ esac
+ 
+-#echo '(No uname command or uname output not recognized.)' 1>&2
+-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+-
+-eval $set_cc_for_build
+-cat >$dummy.c <<EOF
+-#ifdef _SEQUENT_
+-# 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
+-
+-#if defined (alliant) && defined (i860)
+-  printf ("i860-alliant-bsd\n"); exit (0);
+-#endif
+-
+-  exit (1);
+-}
+-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
+-
+ 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
+ 
+   http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+diff --git a/js/src/build/autoconf/config.sub b/js/src/build/autoconf/config.sub
+--- a/js/src/build/autoconf/config.sub
++++ b/js/src/build/autoconf/config.sub
+@@ -1,43 +1,36 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+-#   Free Software Foundation, Inc.
++#   Copyright 1992-2014 Free Software Foundation, Inc.
+ 
+-timestamp='2011-01-03'
++timestamp='2014-01-01'
+ 
+-# This file is (in principle) common to ALL GNU software.
+-# The presence of a machine in this file suggests that SOME GNU software
+-# can handle that machine.  It does not imply ALL GNU software can.
+-#
+-# This file is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
++# This file is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
+ # (at your option) any later version.
+ #
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+-# the same distribution terms that you use for the rest of that program.
++# the same distribution terms that you use for the rest of that
++# program.  This Exception is an additional permission under section 7
++# of the GNU General Public License, version 3 ("GPLv3").
+ 
+ 
+-# Please send patches to <config-patches@gnu.org>.  Submit a context
+-# diff and a properly formatted GNU ChangeLog entry.
++# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+ # Otherwise, we print the canonical config type on stdout and succeed.
+ 
+ # You can get the latest version of this script from:
+ # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+@@ -70,18 +63,17 @@ Operation modes:
+   -t, --time-stamp   print date of last modification, then exit
+   -v, --version      print version number, then exit
+ 
+ Report bugs and patches to <config-patches@gnu.org>."
+ 
+ version="\
+ GNU config.sub ($timestamp)
+ 
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright 1992-2014 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."
+ 
+ help="
+ Try \`$me --help' for more information."
+ 
+ # Parse command line
+@@ -118,23 +110,28 @@ case $# in
+  *) echo "$me: too many arguments$help" >&2
+     exit 1;;
+ 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/'`
+ case $maybe_os in
+-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
++  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
++  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
++  knetbsd*-gnu* | netbsd*-gnu* | \
+   kopensolaris*-gnu* | \
+-  storm-chaos* | os2-emx* | rtmk-nova* | wince-winmo*)
++  storm-chaos* | os2-emx* | rtmk-nova*)
+     os=-$maybe_os
+     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+     ;;
++  android-linux)
++    os=-linux-android
++    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
++    ;;
+   *)
+     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+     if [ $basic_machine != $1 ]
+     then os=`echo $1 | sed 's/.*-/-/'`
+     else os=; fi
+     ;;
+ esac
+ 
+@@ -147,41 +144,41 @@ case $os in
+ 		# Prevent following clause from handling this invalid input.
+ 		;;
+ 	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+ 	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+ 	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+ 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+-	-apple | -axis | -knuth | -cray | -microblaze)
++	-apple | -axis | -knuth | -cray | -microblaze*)
+ 		os=
+ 		basic_machine=$1
+ 		;;
+-        -bluegene*)
+-	        os=-cnk
++	-bluegene*)
++		os=-cnk
+ 		;;
+ 	-sim | -cisco | -oki | -wec | -winbond)
+ 		os=
+ 		basic_machine=$1
+ 		;;
+ 	-scout)
+ 		;;
+ 	-wrs)
+ 		os=-vxworks
+ 		basic_machine=$1
+ 		;;
+ 	-chorusos*)
+ 		os=-chorusos
+ 		basic_machine=$1
+ 		;;
+- 	-chorusrdb)
+- 		os=-chorusrdb
++	-chorusrdb)
++		os=-chorusrdb
+ 		basic_machine=$1
+- 		;;
++		;;
+ 	-hiux*)
+ 		os=-hiuxwe2
+ 		;;
+ 	-sco6)
+ 		os=-sco5v6
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco5)
+@@ -216,16 +213,22 @@ case $os in
+ 		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/'`
+ 		;;
++	-lynx*178)
++		os=-lynxos178
++		;;
++	-lynx*5)
++		os=-lynxos5
++		;;
+ 	-lynx*)
+ 		os=-lynxos
+ 		;;
+ 	-ptx*)
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+ 		;;
+ 	-windowsnt*)
+ 		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+@@ -240,30 +243,38 @@ case $os in
+ esac
+ 
+ # Decode aliases for certain CPU-COMPANY combinations.
+ case $basic_machine in
+ 	# Recognize the basic CPU types without company name.
+ 	# Some are omitted here because they have special meanings below.
+ 	1750a | 580 \
+ 	| a29k \
++	| aarch64 | aarch64_be \
+ 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ 	| am33_2.0 \
+-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
++	| arc | arceb \
++	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
++	| avr | avr32 \
++	| be32 | be64 \
+ 	| bfin \
+-	| c4x | clipper \
++	| c4x | c8051 | clipper \
+ 	| d10v | d30v | dlx | dsp16xx \
++	| epiphany \
+ 	| fido | fr30 | frv \
+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
++	| hexagon \
+ 	| i370 | i860 | i960 | ia64 \
+ 	| ip2k | iq2000 \
++	| k1om \
++	| le32 | le64 \
+ 	| lm32 \
+ 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+-	| maxq | mb | microblaze | mcore | mep | metag \
++	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+ 	| mips | mipsbe | mipseb | mipsel | mipsle \
+ 	| mips16 \
+ 	| mips64 | mips64el \
+ 	| mips64octeon | mips64octeonel \
+ 	| mips64orion | mips64orionel \
+ 	| mips64r5900 | mips64r5900el \
+ 	| mips64vr | mips64vrel \
+ 	| mips64vr4100 | mips64vr4100el \
+@@ -271,84 +282,118 @@ case $basic_machine in
+ 	| mips64vr5000 | mips64vr5000el \
+ 	| mips64vr5900 | mips64vr5900el \
+ 	| mipsisa32 | mipsisa32el \
+ 	| mipsisa32r2 | mipsisa32r2el \
+ 	| mipsisa64 | mipsisa64el \
+ 	| mipsisa64r2 | mipsisa64r2el \
+ 	| mipsisa64sb1 | mipsisa64sb1el \
+ 	| mipsisa64sr71k | mipsisa64sr71kel \
++	| mipsr5900 | mipsr5900el \
+ 	| mipstx39 | mipstx39el \
+ 	| mn10200 | mn10300 \
+ 	| moxie \
+ 	| mt \
+ 	| msp430 \
+-	| nios | nios2 \
++	| nds32 | nds32le | nds32be \
++	| nios | nios2 | nios2eb | nios2el \
+ 	| ns16k | ns32k \
+-	| or32 \
++	| open8 \
++	| or1k | or32 \
+ 	| pdp10 | pdp11 | pj | pjl \
+-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
++	| powerpc | powerpc64 | powerpc64le | powerpcle \
+ 	| pyramid \
++	| rl78 | rx \
+ 	| score \
+ 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ 	| sh64 | sh64le \
+ 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+ 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+-	| spu | strongarm \
+-	| tahoe | thumb | tic4x | tic80 | tron \
+-	| v850 | v850e \
++	| spu \
++	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
++	| ubicom32 \
++	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+ 	| we32k \
+-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
++	| x86 | xc16x | xstormy16 | xtensa \
+ 	| z8k | z80)
+ 		basic_machine=$basic_machine-unknown
+ 		;;
+-	m6811 | m68hc11 | m6812 | m68hc12)
+-		# Motorola 68HC11/12.
++	c54x)
++		basic_machine=tic54x-unknown
++		;;
++	c55x)
++		basic_machine=tic55x-unknown
++		;;
++	c6x)
++		basic_machine=tic6x-unknown
++		;;
++	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
+ 		basic_machine=$basic_machine-unknown
+ 		os=-none
+ 		;;
+ 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+ 		;;
+ 	ms1)
+ 		basic_machine=mt-unknown
+ 		;;
+ 
++	strongarm | thumb | xscale)
++		basic_machine=arm-unknown
++		;;
++	xgate)
++		basic_machine=$basic_machine-unknown
++		os=-none
++		;;
++	xscaleeb)
++		basic_machine=armeb-unknown
++		;;
++
++	xscaleel)
++		basic_machine=armel-unknown
++		;;
++
+ 	# We use `pc' rather than `unknown'
+ 	# because (1) that's what they normally are, and
+ 	# (2) the word "unknown" tends to confuse beginning users.
+ 	i*86 | x86_64)
+ 	  basic_machine=$basic_machine-pc
+ 	  ;;
+ 	# Object if more than one company name word.
+ 	*-*-*)
+ 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ 		exit 1
+ 		;;
+ 	# Recognize the basic CPU types with company name.
+ 	580-* \
+ 	| a29k-* \
++	| aarch64-* | aarch64_be-* \
+ 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
++	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+ 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+ 	| avr-* | avr32-* \
++	| be32-* | be64-* \
+ 	| bfin-* | bs2000-* \
+-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+-	| clipper-* | craynv-* | cydra-* \
++	| c[123]* | c30-* | [cjt]90-* | c4x-* \
++	| c8051-* | clipper-* | craynv-* | cydra-* \
+ 	| d10v-* | d30v-* | dlx-* \
+ 	| elxsi-* \
+ 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ 	| h8300-* | h8500-* \
+ 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
++	| hexagon-* \
+ 	| i*86-* | i860-* | i960-* | ia64-* \
+ 	| ip2k-* | iq2000-* \
++	| k1om-* \
++	| le32-* | le64-* \
+ 	| lm32-* \
+ 	| m32c-* | m32r-* | m32rle-* \
+ 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
++	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
++	| microblaze-* | microblazeel-* \
+ 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ 	| mips16-* \
+ 	| mips64-* | mips64el-* \
+ 	| mips64octeon-* | mips64octeonel-* \
+ 	| mips64orion-* | mips64orionel-* \
+ 	| mips64r5900-* | mips64r5900el-* \
+ 	| mips64vr-* | mips64vrel-* \
+ 	| mips64vr4100-* | mips64vr4100el-* \
+@@ -356,38 +401,44 @@ case $basic_machine in
+ 	| mips64vr5000-* | mips64vr5000el-* \
+ 	| mips64vr5900-* | mips64vr5900el-* \
+ 	| mipsisa32-* | mipsisa32el-* \
+ 	| mipsisa32r2-* | mipsisa32r2el-* \
+ 	| mipsisa64-* | mipsisa64el-* \
+ 	| mipsisa64r2-* | mipsisa64r2el-* \
+ 	| mipsisa64sb1-* | mipsisa64sb1el-* \
+ 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
++	| mipsr5900-* | mipsr5900el-* \
+ 	| mipstx39-* | mipstx39el-* \
+ 	| mmix-* \
+ 	| mt-* \
+ 	| msp430-* \
+-	| nios-* | nios2-* \
++	| nds32-* | nds32le-* | nds32be-* \
++	| nios-* | nios2-* | nios2eb-* | nios2el-* \
+ 	| none-* | np1-* | ns16k-* | ns32k-* \
++	| open8-* \
+ 	| orion-* \
+ 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
++	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+ 	| pyramid-* \
+-	| romp-* | rs6000-* \
++	| rl78-* | romp-* | rs6000-* | rx-* \
+ 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ 	| sparclite-* \
+-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+-	| tahoe-* | thumb-* \
+-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
++	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
++	| tahoe-* \
++	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++	| tile*-* \
+ 	| tron-* \
+-	| v850-* | v850e-* | vax-* \
++	| ubicom32-* \
++	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
++	| vax-* \
+ 	| we32k-* \
+-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
++	| x86-* | x86_64-* | xc16x-* | xps100-* \
+ 	| xstormy16-* | xtensa*-* \
+ 	| ymp-* \
+ 	| z8k-* | z80-*)
+ 		;;
+ 	# Recognize the basic CPU types without company name, with glob match.
+ 	xtensa*)
+ 		basic_machine=$basic_machine-unknown
+ 		;;
+@@ -402,17 +453,17 @@ case $basic_machine in
+ 		;;
+ 	3b*)
+ 		basic_machine=we32k-att
+ 		;;
+ 	a29khif)
+ 		basic_machine=a29k-amd
+ 		os=-udi
+ 		;;
+-    	abacus)
++	abacus)
+ 		basic_machine=abacus-unknown
+ 		;;
+ 	adobe68k)
+ 		basic_machine=m68010-adobe
+ 		os=-scout
+ 		;;
+ 	alliant | fx80)
+ 		basic_machine=fx80-alliant
+@@ -472,21 +523,30 @@ case $basic_machine in
+ 	blackfin-*)
+ 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		os=-linux
+ 		;;
+ 	bluegene*)
+ 		basic_machine=powerpc-ibm
+ 		os=-cnk
+ 		;;
++	c54x-*)
++		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	c55x-*)
++		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	c6x-*)
++		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	c90)
+ 		basic_machine=c90-cray
+ 		os=-unicos
+ 		;;
+-        cegcc)
++	cegcc)
+ 		basic_machine=arm-unknown
+ 		os=-cegcc
+ 		;;
+ 	convex-c1)
+ 		basic_machine=c1-convex
+ 		os=-bsd
+ 		;;
+ 	convex-c2)
+@@ -508,17 +568,17 @@ case $basic_machine in
+ 	cray | j90)
+ 		basic_machine=j90-cray
+ 		os=-unicos
+ 		;;
+ 	craynv)
+ 		basic_machine=craynv-cray
+ 		os=-unicosmp
+ 		;;
+-	cr16)
++	cr16 | cr16-*)
+ 		basic_machine=cr16-unknown
+ 		os=-elf
+ 		;;
+ 	crds | unos)
+ 		basic_machine=m68k-crds
+ 		;;
+ 	crisv32 | crisv32-* | etraxfs*)
+ 		basic_machine=crisv32-axis
+@@ -666,17 +726,16 @@ case $basic_machine in
+ 		;;
+ 	hppro)
+ 		basic_machine=hppa1.1-hp
+ 		os=-proelf
+ 		;;
+ 	i370-ibm* | ibm*)
+ 		basic_machine=i370-ibm
+ 		;;
+-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+ 	i*86v32)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv32
+ 		;;
+ 	i*86v4*)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv4
+ 		;;
+@@ -724,21 +783,25 @@ case $basic_machine in
+ 	magnum | m3230)
+ 		basic_machine=mips-mips
+ 		os=-sysv
+ 		;;
+ 	merlin)
+ 		basic_machine=ns32k-utek
+ 		os=-sysv
+ 		;;
+-        microblaze)
++	microblaze*)
+ 		basic_machine=microblaze-xilinx
+ 		;;
++	mingw64)
++		basic_machine=x86_64-pc
++		os=-mingw64
++		;;
+ 	mingw32)
+-		basic_machine=i386-pc
++		basic_machine=i686-pc
+ 		os=-mingw32
+ 		;;
+ 	mingw32ce)
+ 		basic_machine=arm-unknown
+ 		os=-mingw32ce
+ 		;;
+ 	miniframe)
+ 		basic_machine=m68000-convergent
+@@ -763,20 +826,28 @@ case $basic_machine in
+ 		;;
+ 	msdos)
+ 		basic_machine=i386-pc
+ 		os=-msdos
+ 		;;
+ 	ms1-*)
+ 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ 		;;
++	msys)
++		basic_machine=i686-pc
++		os=-msys
++		;;
+ 	mvs)
+ 		basic_machine=i370-ibm
+ 		os=-mvs
+ 		;;
++	nacl)
++		basic_machine=le32-unknown
++		os=-nacl
++		;;
+ 	ncr3000)
+ 		basic_machine=i486-ncr
+ 		os=-sysv4
+ 		;;
+ 	netbsd386)
+ 		basic_machine=i386-unknown
+ 		os=-netbsd
+ 		;;
+@@ -831,16 +902,22 @@ case $basic_machine in
+ 		;;
+ 	nonstopux)
+ 		basic_machine=mips-compaq
+ 		os=-nonstopux
+ 		;;
+ 	np1)
+ 		basic_machine=np1-gould
+ 		;;
++	neo-tandem)
++		basic_machine=neo-tandem
++		;;
++	nse-tandem)
++		basic_machine=nse-tandem
++		;;
+ 	nsr-tandem)
+ 		basic_machine=nsr-tandem
+ 		;;
+ 	op50n-* | op60c-*)
+ 		basic_machine=hppa1.1-oki
+ 		os=-proelf
+ 		;;
+ 	openrisc | openrisc-*)
+@@ -913,19 +990,20 @@ case $basic_machine in
+ 	pentium4-*)
+ 		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	pn)
+ 		basic_machine=pn-gould
+ 		;;
+ 	power)	basic_machine=power-ibm
+ 		;;
+-	ppc)	basic_machine=powerpc-unknown
++	ppc | ppcbe)	basic_machine=powerpc-unknown
+ 		;;
+-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
++	ppc-* | ppcbe-*)
++		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	ppcle | powerpclittle | ppc-le | powerpc-little)
+ 		basic_machine=powerpcle-unknown
+ 		;;
+ 	ppcle-* | powerpclittle-*)
+ 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	ppc64)	basic_machine=powerpc64-unknown
+@@ -940,17 +1018,21 @@ case $basic_machine in
+ 		;;
+ 	ps2)
+ 		basic_machine=i386-ibm
+ 		;;
+ 	pw32)
+ 		basic_machine=i586-unknown
+ 		os=-pw32
+ 		;;
+-	rdos)
++	rdos | rdos64)
++		basic_machine=x86_64-pc
++		os=-rdos
++		;;
++	rdos32)
+ 		basic_machine=i386-pc
+ 		os=-rdos
+ 		;;
+ 	rom68k)
+ 		basic_machine=m68k-rom68k
+ 		os=-coff
+ 		;;
+ 	rm[46]00)
+@@ -1009,16 +1091,19 @@ case $basic_machine in
+ 		;;
+ 	st2000)
+ 		basic_machine=m68k-tandem
+ 		;;
+ 	stratus)
+ 		basic_machine=i860-stratus
+ 		os=-sysv4
+ 		;;
++	strongarm-* | thumb-*)
++		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	sun2)
+ 		basic_machine=m68000-sun
+ 		;;
+ 	sun2os3)
+ 		basic_machine=m68000-sun
+ 		os=-sunos3
+ 		;;
+ 	sun2os4)
+@@ -1065,30 +1150,18 @@ case $basic_machine in
+ 	t3e)
+ 		basic_machine=alphaev5-cray
+ 		os=-unicos
+ 		;;
+ 	t90)
+ 		basic_machine=t90-cray
+ 		os=-unicos
+ 		;;
+-	tic54x | c54x*)
+-		basic_machine=tic54x-unknown
+-		os=-coff
+-		;;
+-	tic55x | c55x*)
+-		basic_machine=tic55x-unknown
+-		os=-coff
+-		;;
+-	tic6x | c6x*)
+-		basic_machine=tic6x-unknown
+-		os=-coff
+-		;;
+ 	tile*)
+-		basic_machine=tile-unknown
++		basic_machine=$basic_machine-unknown
+ 		os=-linux-gnu
+ 		;;
+ 	tx39)
+ 		basic_machine=mipstx39-unknown
+ 		;;
+ 	tx39el)
+ 		basic_machine=mipstx39el-unknown
+ 		;;
+@@ -1148,16 +1221,19 @@ case $basic_machine in
+ 		;;
+ 	xbox)
+ 		basic_machine=i686-pc
+ 		os=-mingw32
+ 		;;
+ 	xps | xps100)
+ 		basic_machine=xps100-honeywell
+ 		;;
++	xscale-* | xscalee[bl]-*)
++		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
++		;;
+ 	ymp)
+ 		basic_machine=ymp-cray
+ 		os=-unicos
+ 		;;
+ 	z8k-*-coff)
+ 		basic_machine=z8k-unknown
+ 		os=-sim
+ 		;;
+@@ -1245,19 +1321,22 @@ case $basic_machine in
+ 		;;
+ esac
+ 
+ # Decode manufacturer-specific aliases for certain operating systems.
+ 
+ if [ x"$os" != x"" ]
+ then
+ case $os in
+-        # First match some system type aliases
+-        # that might get confused with valid system types.
++	# First match some system type aliases
++	# that might get confused with valid system types.
+ 	# -solaris* is a basic system type, with this one exception.
++	-auroraux)
++		os=-auroraux
++		;;
+ 	-solaris1 | -solaris1.*)
+ 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ 		;;
+ 	-solaris)
+ 		os=-solaris2
+ 		;;
+ 	-svr4*)
+ 		os=-sysv4
+@@ -1269,39 +1348,40 @@ case $os in
+ 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+ 		;;
+ 	# First accept the basic system types.
+ 	# The portable systems comes first.
+ 	# 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* | -solaris* | -sym* \
+-	      | -kopensolaris* \
++	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
++	      | -sym* | -kopensolaris* | -plan9* \
+ 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+ 	      | -aos* | -aros* \
+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+ 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+-	      | -openbsd* | -solidbsd* \
++	      | -bitrig* | -openbsd* | -solidbsd* \
+ 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* | -cegcc* \
+-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
++	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
++	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+ 	      | -uxpv* | -beos* | -mpeix* | -udk* \
+ 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+ 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -winmo*)
++	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	-qnx*)
+ 		case $basic_machine in
+ 		    x86-* | i*86-*)
+ 			;;
+ 		    *)
+ 			os=-nto$os
+@@ -1330,22 +1410,19 @@ case $os in
+ 		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+ 		;;
+ 	-sunos6*)
+ 		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+ 		;;
+ 	-opened*)
+ 		os=-openedition
+ 		;;
+-        -os400*)
++	-os400*)
+ 		os=-os400
+ 		;;
+-	-wince-winmo*)
+-		os=-wince-winmo
+-		;;
+ 	-wince*)
+ 		os=-wince
+ 		;;
+ 	-osfrose*)
+ 		os=-osfrose
+ 		;;
+ 	-osf*)
+ 		os=-osf
+@@ -1382,17 +1459,17 @@ case $os in
+ 		;;
+ 	# Preserve the version number of sinix5.
+ 	-sinix5.*)
+ 		os=`echo $os | sed -e 's|sinix|sysv|'`
+ 		;;
+ 	-sinix*)
+ 		os=-sysv4
+ 		;;
+-        -tpf*)
++	-tpf*)
+ 		os=-tpf
+ 		;;
+ 	-triton*)
+ 		os=-sysv3
+ 		;;
+ 	-oss*)
+ 		os=-sysv3
+ 		;;
+@@ -1418,28 +1495,24 @@ case $os in
+ 		os=-xenix
+ 		;;
+ 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ 		os=-mint
+ 		;;
+ 	-aros*)
+ 		os=-aros
+ 		;;
+-	-kaos*)
+-		os=-kaos
+-		;;
+ 	-zvmoe)
+ 		os=-zvmoe
+ 		;;
+ 	-dicos*)
+ 		os=-dicos
+ 		;;
+-        -android*)
+-	        os=-android
+-                ;;
++	-nacl*)
++		;;
+ 	-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
+ 		exit 1
+ 		;;
+@@ -1452,33 +1525,48 @@ else
+ 
+ # Note that if you're going to try to match "-MANUFACTURER" here (say,
+ # "-sun"), then you have to tell the case statement up towards the top
+ # that MANUFACTURER isn't an operating system.  Otherwise, code above
+ # will signal an error saying that MANUFACTURER isn't an operating
+ # system, and we'll never get to this point.
+ 
+ case $basic_machine in
+-        score-*)
++	score-*)
+ 		os=-elf
+ 		;;
+-        spu-*)
++	spu-*)
+ 		os=-elf
+ 		;;
+ 	*-acorn)
+ 		os=-riscix1.2
+ 		;;
+ 	arm*-rebel)
+ 		os=-linux
+ 		;;
+ 	arm*-semi)
+ 		os=-aout
+ 		;;
+-        c4x-* | tic4x-*)
+-        	os=-coff
++	c4x-* | tic4x-*)
++		os=-coff
++		;;
++	c8051-*)
++		os=-elf
++		;;
++	hexagon-*)
++		os=-elf
++		;;
++	tic54x-*)
++		os=-coff
++		;;
++	tic55x-*)
++		os=-coff
++		;;
++	tic6x-*)
++		os=-coff
+ 		;;
+ 	# This must come before the *-dec entry.
+ 	pdp10-*)
+ 		os=-tops20
+ 		;;
+ 	pdp11-*)
+ 		os=-none
+ 		;;
+@@ -1488,32 +1576,32 @@ case $basic_machine in
+ 	m68*-apollo)
+ 		os=-domain
+ 		;;
+ 	i386-sun)
+ 		os=-sunos4.0.2
+ 		;;
+ 	m68000-sun)
+ 		os=-sunos3
+-		# This also exists in the configure program, but was not the
+-		# default.
+-		# os=-sunos4
+ 		;;
+ 	m68*-cisco)
+ 		os=-aout
+ 		;;
+-        mep-*)
++	mep-*)
+ 		os=-elf
+ 		;;
+ 	mips*-cisco)
+ 		os=-elf
+ 		;;
+ 	mips*-*)
+ 		os=-elf
+ 		;;
++	or1k-*)
++		os=-elf
++		;;
+ 	or32-*)
+ 		os=-coff
+ 		;;
+ 	*-tti)	# must be before sparc entry or we get the wrong os.
+ 		os=-sysv3
+ 		;;
+ 	sparc-* | *-sun)
+ 		os=-sunos4.1.1
+@@ -1522,17 +1610,17 @@ case $basic_machine in
+ 		os=-beos
+ 		;;
+ 	*-haiku)
+ 		os=-haiku
+ 		;;
+ 	*-ibm)
+ 		os=-aix
+ 		;;
+-    	*-knuth)
++	*-knuth)
+ 		os=-mmixware
+ 		;;
+ 	*-wec)
+ 		os=-proelf
+ 		;;
+ 	*-winbond)
+ 		os=-proelf
+ 		;;
+@@ -1684,19 +1772,16 @@ case $basic_machine in
+ 				vendor=apple
+ 				;;
+ 			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ 				vendor=atari
+ 				;;
+ 			-vos*)
+ 				vendor=stratus
+ 				;;
+-			*-android*|*-linuxandroid*)
+-				vendor=linux-
+-				;;
+ 		esac
+ 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+ 		;;
+ esac
+ 
+ echo $basic_machine$os
+ exit
+ 
diff --git a/mozilla-ppc64le-javascript.patch b/mozilla-ppc64le-javascript.patch
deleted file mode 100644
index 5547ada7..00000000
--- a/mozilla-ppc64le-javascript.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-# HG changeset patch
-# Parent e6f9fc7c1611990ed9fdafd3ff19c79fd356a1d6
-# User Ulrich Weigand <uweigand@de.ibm.com>
-Bug 976648 - powerpc64le-linux support - JavaScript build/config
-
-diff --git a/js/src/assembler/wtf/Platform.h b/js/src/assembler/wtf/Platform.h
---- a/js/src/assembler/wtf/Platform.h
-+++ b/js/src/assembler/wtf/Platform.h
-@@ -160,26 +160,32 @@
- /* WTF_CPU_PPC - PowerPC 32-bit */
- #if   defined(__ppc__)     \
-     || defined(__PPC__)     \
-     || defined(__powerpc__) \
-     || defined(__powerpc)   \
-     || defined(__POWERPC__) \
-     || defined(_M_PPC)      \
-     || defined(__PPC)
-+#if !defined(__ppc64__) && !defined(__PPC64__)
- #define WTF_CPU_PPC 1
-+#endif
-+#if !defined(__LITTLE_ENDIAN__)
- #define WTF_CPU_BIG_ENDIAN 1
- #endif
-+#endif
- 
- /* WTF_CPU_PPC64 - PowerPC 64-bit */
- #if   defined(__ppc64__) \
-     || defined(__PPC64__)
- #define WTF_CPU_PPC64 1
-+#if !defined(__LITTLE_ENDIAN__)
- #define WTF_CPU_BIG_ENDIAN 1
- #endif
-+#endif
- 
- /* WTF_CPU_SH4 - SuperH SH-4 */
- #if defined(__SH4__)
- #define WTF_CPU_SH4 1
- #endif
- 
- /* WTF_CPU_SPARC32 - SPARC 32-bit */
- #if defined(__sparc) && !defined(__arch64__) || defined(__sparcv8)
-diff --git a/js/src/configure.in b/js/src/configure.in
---- a/js/src/configure.in
-+++ b/js/src/configure.in
-@@ -923,17 +923,17 @@ esac
- 
- # Only set CPU_ARCH if we recognize the value of OS_TEST
- 
- case "$OS_TEST" in
- *86 | i86pc)
-     CPU_ARCH=x86
-     ;;
- 
--powerpc64 | ppc64)
-+powerpc64 | ppc64 | powerpc64le | ppc64le)
-     CPU_ARCH=ppc64
-     ;;
- 
- powerpc | ppc | rs6000)
-     CPU_ARCH=ppc
-     ;;
- 
- Alpha | alpha | ALPHA)
-diff --git a/js/src/jscpucfg.h b/js/src/jscpucfg.h
---- a/js/src/jscpucfg.h
-+++ b/js/src/jscpucfg.h
-@@ -22,17 +22,17 @@
- 
- # ifdef __WATCOMC__
- #  define HAVE_VA_LIST_AS_ARRAY 1
- # endif
- 
- # define IS_LITTLE_ENDIAN 1
- # undef  IS_BIG_ENDIAN
- 
--#elif defined(__APPLE__)
-+#elif defined(__APPLE__) || defined(__powerpc__) || defined(__ppc__)
- # if __LITTLE_ENDIAN__
- #  define IS_LITTLE_ENDIAN 1
- #  undef  IS_BIG_ENDIAN
- # elif __BIG_ENDIAN__
- #  undef  IS_LITTLE_ENDIAN
- #  define IS_BIG_ENDIAN 1
- # endif
- 
-@@ -84,18 +84,17 @@
- #  if defined(_STACK_GROWS_UPWARD)
- #   define JS_STACK_GROWTH_DIRECTION (1)
- #  elif defined(_STACK_GROWS_DOWNWARD)
- #   define JS_STACK_GROWTH_DIRECTION (-1)
- #  endif
- # endif
- 
- #elif defined(__sparc) || defined(__sparc__) || \
--      defined(_POWER) || defined(__powerpc__) || \
--      defined(__ppc__) || defined(__hppa) || \
-+      defined(_POWER) || defined(__hppa) || \
-       defined(_MIPSEB) || defined(_BIG_ENDIAN)
- /* IA64 running HP-UX will have _BIG_ENDIAN defined.
-  * IA64 running Linux will have endian.h and be handled above.
-  */
- # undef IS_LITTLE_ENDIAN
- # define IS_BIG_ENDIAN 1
- 
- #else /* !defined(__sparc) && !defined(__sparc__) && ... */
diff --git a/mozilla-ppc64le-libffi.patch b/mozilla-ppc64le-libffi.patch
deleted file mode 100644
index 4a005aea..00000000
--- a/mozilla-ppc64le-libffi.patch
+++ /dev/null
@@ -1,3206 +0,0 @@
-# HG changeset patch
-# Parent 16cf73a02802e3b4a77ccd77794346441638e2a7
-# User Ulrich Weigand <uweigand@de.ibm.com>
-Bug 976648 - powerpc64le-linux support - libffi backport
-
-diff --git a/js/src/ctypes/libffi/aclocal.m4 b/js/src/ctypes/libffi/aclocal.m4
---- a/js/src/ctypes/libffi/aclocal.m4
-+++ b/js/src/ctypes/libffi/aclocal.m4
-@@ -1277,31 +1277,34 @@ ia64-*-hpux*)
- 	  LD="${LD-ld} -64"
- 	  ;;
-       esac
-     fi
-   fi
-   rm -rf conftest*
-   ;;
- 
--x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
- s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
-   if AC_TRY_EVAL(ac_compile); then
-     case `/usr/bin/file conftest.o` in
-       *32-bit*)
- 	case $host in
- 	  x86_64-*kfreebsd*-gnu)
- 	    LD="${LD-ld} -m elf_i386_fbsd"
- 	    ;;
- 	  x86_64-*linux*)
- 	    LD="${LD-ld} -m elf_i386"
- 	    ;;
--	  ppc64-*linux*|powerpc64-*linux*)
-+	  powerpc64le-*linux*)
-+	    LD="${LD-ld} -m elf32lppclinux"
-+	    ;;
-+	  powerpc64-*linux*)
- 	    LD="${LD-ld} -m elf32ppclinux"
- 	    ;;
- 	  s390x-*linux*)
- 	    LD="${LD-ld} -m elf_s390"
- 	    ;;
- 	  sparc64-*linux*)
- 	    LD="${LD-ld} -m elf32_sparc"
- 	    ;;
-@@ -1310,17 +1313,20 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
-       *64-bit*)
- 	case $host in
- 	  x86_64-*kfreebsd*-gnu)
- 	    LD="${LD-ld} -m elf_x86_64_fbsd"
- 	    ;;
- 	  x86_64-*linux*)
- 	    LD="${LD-ld} -m elf_x86_64"
- 	    ;;
--	  ppc*-*linux*|powerpc*-*linux*)
-+	  powerpcle-*linux*)
-+	    LD="${LD-ld} -m elf64lppc"
-+	    ;;
-+	  powerpc-*linux*)
- 	    LD="${LD-ld} -m elf64ppc"
- 	    ;;
- 	  s390*-*linux*|s390*-*tpf*)
- 	    LD="${LD-ld} -m elf64_s390"
- 	    ;;
- 	  sparc*-*linux*)
- 	    LD="${LD-ld} -m elf64_sparc"
- 	    ;;
-diff --git a/js/src/ctypes/libffi/configure b/js/src/ctypes/libffi/configure
---- a/js/src/ctypes/libffi/configure
-+++ b/js/src/ctypes/libffi/configure
-@@ -6293,17 +6293,17 @@ ia64-*-hpux*)
- 	  LD="${LD-ld} -64"
- 	  ;;
-       esac
-     fi
-   fi
-   rm -rf conftest*
-   ;;
- 
--x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
- s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
-@@ -6311,17 +6311,20 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
-       *32-bit*)
- 	case $host in
- 	  x86_64-*kfreebsd*-gnu)
- 	    LD="${LD-ld} -m elf_i386_fbsd"
- 	    ;;
- 	  x86_64-*linux*)
- 	    LD="${LD-ld} -m elf_i386"
- 	    ;;
--	  ppc64-*linux*|powerpc64-*linux*)
-+	  powerpc64le-*linux*)
-+	    LD="${LD-ld} -m elf32lppclinux"
-+	    ;;
-+	  powerpc64-*linux*)
- 	    LD="${LD-ld} -m elf32ppclinux"
- 	    ;;
- 	  s390x-*linux*)
- 	    LD="${LD-ld} -m elf_s390"
- 	    ;;
- 	  sparc64-*linux*)
- 	    LD="${LD-ld} -m elf32_sparc"
- 	    ;;
-@@ -6330,17 +6333,20 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
-       *64-bit*)
- 	case $host in
- 	  x86_64-*kfreebsd*-gnu)
- 	    LD="${LD-ld} -m elf_x86_64_fbsd"
- 	    ;;
- 	  x86_64-*linux*)
- 	    LD="${LD-ld} -m elf_x86_64"
- 	    ;;
--	  ppc*-*linux*|powerpc*-*linux*)
-+	  powerpcle-*linux*)
-+	    LD="${LD-ld} -m elf64lppc"
-+	    ;;
-+	  powerpc-*linux*)
- 	    LD="${LD-ld} -m elf64ppc"
- 	    ;;
- 	  s390*-*linux*|s390*-*tpf*)
- 	    LD="${LD-ld} -m elf64_s390"
- 	    ;;
- 	  sparc*-*linux*)
- 	    LD="${LD-ld} -m elf64_sparc"
- 	    ;;
-diff --git a/js/src/ctypes/libffi/m4/libtool.m4 b/js/src/ctypes/libffi/m4/libtool.m4
---- a/js/src/ctypes/libffi/m4/libtool.m4
-+++ b/js/src/ctypes/libffi/m4/libtool.m4
-@@ -1262,31 +1262,34 @@ ia64-*-hpux*)
- 	  LD="${LD-ld} -64"
- 	  ;;
-       esac
-     fi
-   fi
-   rm -rf conftest*
-   ;;
- 
--x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
- s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
-   if AC_TRY_EVAL(ac_compile); then
-     case `/usr/bin/file conftest.o` in
-       *32-bit*)
- 	case $host in
- 	  x86_64-*kfreebsd*-gnu)
- 	    LD="${LD-ld} -m elf_i386_fbsd"
- 	    ;;
- 	  x86_64-*linux*)
- 	    LD="${LD-ld} -m elf_i386"
- 	    ;;
--	  ppc64-*linux*|powerpc64-*linux*)
-+	  powerpc64le-*linux*)
-+	    LD="${LD-ld} -m elf32lppclinux"
-+	    ;;
-+	  powerpc64-*linux*)
- 	    LD="${LD-ld} -m elf32ppclinux"
- 	    ;;
- 	  s390x-*linux*)
- 	    LD="${LD-ld} -m elf_s390"
- 	    ;;
- 	  sparc64-*linux*)
- 	    LD="${LD-ld} -m elf32_sparc"
- 	    ;;
-@@ -1295,17 +1298,20 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
-       *64-bit*)
- 	case $host in
- 	  x86_64-*kfreebsd*-gnu)
- 	    LD="${LD-ld} -m elf_x86_64_fbsd"
- 	    ;;
- 	  x86_64-*linux*)
- 	    LD="${LD-ld} -m elf_x86_64"
- 	    ;;
--	  ppc*-*linux*|powerpc*-*linux*)
-+	  powerpcle-*linux*)
-+	    LD="${LD-ld} -m elf64lppc"
-+	    ;;
-+	  powerpc-*linux*)
- 	    LD="${LD-ld} -m elf64ppc"
- 	    ;;
- 	  s390*-*linux*|s390*-*tpf*)
- 	    LD="${LD-ld} -m elf64_s390"
- 	    ;;
- 	  sparc*-*linux*)
- 	    LD="${LD-ld} -m elf64_sparc"
- 	    ;;
-diff --git a/js/src/ctypes/libffi/src/powerpc/ffi.c b/js/src/ctypes/libffi/src/powerpc/ffi.c
---- a/js/src/ctypes/libffi/src/powerpc/ffi.c
-+++ b/js/src/ctypes/libffi/src/powerpc/ffi.c
-@@ -1,12 +1,14 @@
- /* -----------------------------------------------------------------------
--   ffi.c - Copyright (c) 1998 Geoffrey Keating
--   Copyright (C) 2007, 2008 Free Software Foundation, Inc
--   Copyright (C) 2008 Red Hat, Inc
-+   ffi.c - Copyright (C) 2011 Anthony Green
-+           Copyright (C) 2011 Kyle Moffett
-+           Copyright (C) 2008 Red Hat, Inc
-+           Copyright (C) 2007, 2008 Free Software Foundation, Inc
-+	   Copyright (c) 1998 Geoffrey Keating
- 
-    PowerPC Foreign Function Interface
- 
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the
-    ``Software''), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-@@ -34,42 +36,39 @@
- 
- extern void ffi_closure_SYSV (void);
- extern void FFI_HIDDEN ffi_closure_LINUX64 (void);
- 
- enum {
-   /* The assembly depends on these exact flags.  */
-   FLAG_RETURNS_SMST	= 1 << (31-31), /* Used for FFI_SYSV small structs.  */
-   FLAG_RETURNS_NOTHING  = 1 << (31-30), /* These go in cr7 */
-+#ifndef __NO_FPRS__
-   FLAG_RETURNS_FP       = 1 << (31-29),
-+#endif
-   FLAG_RETURNS_64BITS   = 1 << (31-28),
- 
-   FLAG_RETURNS_128BITS  = 1 << (31-27), /* cr6  */
--  FLAG_SYSV_SMST_R4     = 1 << (31-26), /* use r4 for FFI_SYSV 8 byte
--					   structs.  */
--  FLAG_SYSV_SMST_R3     = 1 << (31-25), /* use r3 for FFI_SYSV 4 byte
--					   structs.  */
--  /* Bits (31-24) through (31-19) store shift value for SMST */
- 
-   FLAG_ARG_NEEDS_COPY   = 1 << (31- 7),
-+  FLAG_ARG_NEEDS_PSAVE  = FLAG_ARG_NEEDS_COPY, /* Used by ELFv2 */
-+#ifndef __NO_FPRS__
-   FLAG_FP_ARGUMENTS     = 1 << (31- 6), /* cr1.eq; specified by ABI */
-+#endif
-   FLAG_4_GPR_ARGUMENTS  = 1 << (31- 5),
-   FLAG_RETVAL_REFERENCE = 1 << (31- 4)
- };
- 
- /* About the SYSV ABI.  */
--unsigned int NUM_GPR_ARG_REGISTERS = 8;
-+#define ASM_NEEDS_REGISTERS 4
-+#define NUM_GPR_ARG_REGISTERS 8
- #ifndef __NO_FPRS__
--unsigned int NUM_FPR_ARG_REGISTERS = 8;
--#else
--unsigned int NUM_FPR_ARG_REGISTERS = 0;
-+# define NUM_FPR_ARG_REGISTERS 8
- #endif
- 
--enum { ASM_NEEDS_REGISTERS = 4 };
--
- /* ffi_prep_args_SYSV is called by the assembly routine once stack space
-    has been allocated for the function's arguments.
- 
-    The stack layout we want looks like this:
- 
-    |   Return address from ffi_call_SYSV 4bytes	|	higher addresses
-    |--------------------------------------------|
-    |   Previous backchain pointer	4	|       stack pointer here
-@@ -108,100 +107,119 @@ ffi_prep_args_SYSV (extended_cif *ecif, 
-   /* 'stacktop' points at the previous backchain pointer.  */
-   valp stacktop;
- 
-   /* 'gpr_base' points at the space for gpr3, and grows upwards as
-      we use GPR registers.  */
-   valp gpr_base;
-   int intarg_count;
- 
-+#ifndef __NO_FPRS__
-   /* 'fpr_base' points at the space for fpr1, and grows upwards as
-      we use FPR registers.  */
-   valp fpr_base;
-   int fparg_count;
-+#endif
- 
-   /* 'copy_space' grows down as we put structures in it.  It should
-      stay 16-byte aligned.  */
-   valp copy_space;
- 
-   /* 'next_arg' grows up as we put parameters in it.  */
-   valp next_arg;
- 
--  int i, ii MAYBE_UNUSED;
-+  int i;
-   ffi_type **ptr;
-+#ifndef __NO_FPRS__
-   double double_tmp;
-+#endif
-   union {
-     void **v;
-     char **c;
-     signed char **sc;
-     unsigned char **uc;
-     signed short **ss;
-     unsigned short **us;
-     unsigned int **ui;
-     long long **ll;
-     float **f;
-     double **d;
-   } p_argv;
-   size_t struct_copy_size;
-   unsigned gprvalue;
- 
--  if (ecif->cif->abi == FFI_LINUX_SOFT_FLOAT)
--    NUM_FPR_ARG_REGISTERS = 0;
--
-   stacktop.c = (char *) stack + bytes;
-   gpr_base.u = stacktop.u - ASM_NEEDS_REGISTERS - NUM_GPR_ARG_REGISTERS;
-   intarg_count = 0;
-+#ifndef __NO_FPRS__
-   fpr_base.d = gpr_base.d - NUM_FPR_ARG_REGISTERS;
-   fparg_count = 0;
-   copy_space.c = ((flags & FLAG_FP_ARGUMENTS) ? fpr_base.c : gpr_base.c);
-+#else
-+  copy_space.c = gpr_base.c;
-+#endif
-   next_arg.u = stack + 2;
- 
-   /* Check that everything starts aligned properly.  */
--  FFI_ASSERT (((unsigned) (char *) stack & 0xF) == 0);
--  FFI_ASSERT (((unsigned) copy_space.c & 0xF) == 0);
--  FFI_ASSERT (((unsigned) stacktop.c & 0xF) == 0);
-+  FFI_ASSERT (((unsigned long) (char *) stack & 0xF) == 0);
-+  FFI_ASSERT (((unsigned long) copy_space.c & 0xF) == 0);
-+  FFI_ASSERT (((unsigned long) stacktop.c & 0xF) == 0);
-   FFI_ASSERT ((bytes & 0xF) == 0);
-   FFI_ASSERT (copy_space.c >= next_arg.c);
- 
-   /* Deal with return values that are actually pass-by-reference.  */
-   if (flags & FLAG_RETVAL_REFERENCE)
-     {
-       *gpr_base.u++ = (unsigned long) (char *) ecif->rvalue;
-       intarg_count++;
-     }
- 
-   /* Now for the arguments.  */
-   p_argv.v = ecif->avalue;
-   for (ptr = ecif->cif->arg_types, i = ecif->cif->nargs;
-        i > 0;
-        i--, ptr++, p_argv.v++)
-     {
--      switch ((*ptr)->type)
--	{
-+      unsigned short typenum = (*ptr)->type;
-+
-+      /* We may need to handle some values depending on ABI */
-+      if (ecif->cif->abi == FFI_LINUX_SOFT_FLOAT) {
-+		if (typenum == FFI_TYPE_FLOAT)
-+			typenum = FFI_TYPE_UINT32;
-+		if (typenum == FFI_TYPE_DOUBLE)
-+			typenum = FFI_TYPE_UINT64;
-+		if (typenum == FFI_TYPE_LONGDOUBLE)
-+			typenum = FFI_TYPE_UINT128;
-+      } else if (ecif->cif->abi != FFI_LINUX) {
-+#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
-+		if (typenum == FFI_TYPE_LONGDOUBLE)
-+			typenum = FFI_TYPE_STRUCT;
-+#endif
-+      }
-+
-+      /* Now test the translated value */
-+      switch (typenum) {
-+#ifndef __NO_FPRS__
- 	case FFI_TYPE_FLOAT:
- 	  /* With FFI_LINUX_SOFT_FLOAT floats are handled like UINT32.  */
--	  if (ecif->cif->abi == FFI_LINUX_SOFT_FLOAT)
--	    goto soft_float_prep;
- 	  double_tmp = **p_argv.f;
- 	  if (fparg_count >= NUM_FPR_ARG_REGISTERS)
- 	    {
- 	      *next_arg.f = (float) double_tmp;
- 	      next_arg.u += 1;
- 	      intarg_count++;
- 	    }
- 	  else
- 	    *fpr_base.d++ = double_tmp;
- 	  fparg_count++;
- 	  FFI_ASSERT (flags & FLAG_FP_ARGUMENTS);
- 	  break;
- 
- 	case FFI_TYPE_DOUBLE:
- 	  /* With FFI_LINUX_SOFT_FLOAT doubles are handled like UINT64.  */
--	  if (ecif->cif->abi == FFI_LINUX_SOFT_FLOAT)
--	    goto soft_double_prep;
- 	  double_tmp = **p_argv.d;
- 
- 	  if (fparg_count >= NUM_FPR_ARG_REGISTERS)
- 	    {
- 	      if (intarg_count >= NUM_GPR_ARG_REGISTERS
- 		  && intarg_count % 2 != 0)
- 		{
- 		  intarg_count++;
-@@ -213,53 +231,16 @@ ffi_prep_args_SYSV (extended_cif *ecif, 
- 	  else
- 	    *fpr_base.d++ = double_tmp;
- 	  fparg_count++;
- 	  FFI_ASSERT (flags & FLAG_FP_ARGUMENTS);
- 	  break;
- 
- #if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
- 	case FFI_TYPE_LONGDOUBLE:
--	  if ((ecif->cif->abi != FFI_LINUX)
--		&& (ecif->cif->abi != FFI_LINUX_SOFT_FLOAT))
--	    goto do_struct;
--	  /* The soft float ABI for long doubles works like this,
--	     a long double is passed in four consecutive gprs if available.
--	     A maximum of 2 long doubles can be passed in gprs.
--	     If we do not have 4 gprs left, the long double is passed on the
--	     stack, 4-byte aligned.  */
--	  if (ecif->cif->abi == FFI_LINUX_SOFT_FLOAT)
--	    {
--	      unsigned int int_tmp = (*p_argv.ui)[0];
--	      if (intarg_count >= NUM_GPR_ARG_REGISTERS - 3)
--		{
--		  if (intarg_count < NUM_GPR_ARG_REGISTERS)
--		    intarg_count += NUM_GPR_ARG_REGISTERS - intarg_count;
--		  *next_arg.u = int_tmp;
--		  next_arg.u++;
--		  for (ii = 1; ii < 4; ii++)
--		    {
--		      int_tmp = (*p_argv.ui)[ii];
--		      *next_arg.u = int_tmp;
--		      next_arg.u++;
--		    }
--		}
--	      else
--		{
--		  *gpr_base.u++ = int_tmp;
--		  for (ii = 1; ii < 4; ii++)
--		    {
--		      int_tmp = (*p_argv.ui)[ii];
--		      *gpr_base.u++ = int_tmp;
--		    }
--		}
--	      intarg_count +=4;
--	    }
--	  else
--	    {
- 	      double_tmp = (*p_argv.d)[0];
- 
- 	      if (fparg_count >= NUM_FPR_ARG_REGISTERS - 1)
- 		{
- 		  if (intarg_count >= NUM_GPR_ARG_REGISTERS
- 		      && intarg_count % 2 != 0)
- 		    {
- 		      intarg_count++;
-@@ -275,23 +256,50 @@ ffi_prep_args_SYSV (extended_cif *ecif, 
- 		{
- 		  *fpr_base.d++ = double_tmp;
- 		  double_tmp = (*p_argv.d)[1];
- 		  *fpr_base.d++ = double_tmp;
- 		}
- 
- 	      fparg_count += 2;
- 	      FFI_ASSERT (flags & FLAG_FP_ARGUMENTS);
--	    }
- 	  break;
- #endif
-+#endif /* have FPRs */
-+
-+	/*
-+	 * The soft float ABI for long doubles works like this, a long double
-+	 * is passed in four consecutive GPRs if available.  A maximum of 2
-+	 * long doubles can be passed in gprs.  If we do not have 4 GPRs
-+	 * left, the long double is passed on the stack, 4-byte aligned.
-+	 */
-+	case FFI_TYPE_UINT128: {
-+		unsigned int int_tmp = (*p_argv.ui)[0];
-+		unsigned int ii;
-+		if (intarg_count >= NUM_GPR_ARG_REGISTERS - 3) {
-+			if (intarg_count < NUM_GPR_ARG_REGISTERS)
-+				intarg_count += NUM_GPR_ARG_REGISTERS - intarg_count;
-+			*(next_arg.u++) = int_tmp;
-+			for (ii = 1; ii < 4; ii++) {
-+				int_tmp = (*p_argv.ui)[ii];
-+				*(next_arg.u++) = int_tmp;
-+			}
-+		} else {
-+			*(gpr_base.u++) = int_tmp;
-+			for (ii = 1; ii < 4; ii++) {
-+				int_tmp = (*p_argv.ui)[ii];
-+				*(gpr_base.u++) = int_tmp;
-+			}
-+		}
-+		intarg_count += 4;
-+		break;
-+	}
- 
- 	case FFI_TYPE_UINT64:
- 	case FFI_TYPE_SINT64:
--	soft_double_prep:
- 	  if (intarg_count == NUM_GPR_ARG_REGISTERS-1)
- 	    intarg_count++;
- 	  if (intarg_count >= NUM_GPR_ARG_REGISTERS)
- 	    {
- 	      if (intarg_count % 2 != 0)
- 		{
- 		  intarg_count++;
- 		  next_arg.u++;
-@@ -314,19 +322,16 @@ ffi_prep_args_SYSV (extended_cif *ecif, 
- 		  gpr_base.u++;
- 		}
- 	      *gpr_base.ll++ = **p_argv.ll;
- 	    }
- 	  intarg_count += 2;
- 	  break;
- 
- 	case FFI_TYPE_STRUCT:
--#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
--	do_struct:
--#endif
- 	  struct_copy_size = ((*ptr)->size + 15) & ~0xF;
- 	  copy_space.c -= struct_copy_size;
- 	  memcpy (copy_space.c, *p_argv.c, (*ptr)->size);
- 
- 	  gprvalue = (unsigned long) copy_space.c;
- 
- 	  FFI_ASSERT (copy_space.c > next_arg.c);
- 	  FFI_ASSERT (flags & FLAG_ARG_NEEDS_COPY);
-@@ -344,45 +349,91 @@ ffi_prep_args_SYSV (extended_cif *ecif, 
- 	case FFI_TYPE_SINT16:
- 	  gprvalue = **p_argv.ss;
- 	  goto putgpr;
- 
- 	case FFI_TYPE_INT:
- 	case FFI_TYPE_UINT32:
- 	case FFI_TYPE_SINT32:
- 	case FFI_TYPE_POINTER:
--	soft_float_prep:
- 
- 	  gprvalue = **p_argv.ui;
- 
- 	putgpr:
- 	  if (intarg_count >= NUM_GPR_ARG_REGISTERS)
- 	    *next_arg.u++ = gprvalue;
- 	  else
- 	    *gpr_base.u++ = gprvalue;
- 	  intarg_count++;
- 	  break;
- 	}
-     }
- 
-   /* Check that we didn't overrun the stack...  */
-   FFI_ASSERT (copy_space.c >= next_arg.c);
-   FFI_ASSERT (gpr_base.u <= stacktop.u - ASM_NEEDS_REGISTERS);
-+  /* The assert below is testing that the number of integer arguments agrees
-+     with the number found in ffi_prep_cif_machdep().  However, intarg_count
-+     is incremented whenever we place an FP arg on the stack, so account for
-+     that before our assert test.  */
-+#ifndef __NO_FPRS__
-+  if (fparg_count > NUM_FPR_ARG_REGISTERS)
-+    intarg_count -= fparg_count - NUM_FPR_ARG_REGISTERS;
-   FFI_ASSERT (fpr_base.u
- 	      <= stacktop.u - ASM_NEEDS_REGISTERS - NUM_GPR_ARG_REGISTERS);
-+#endif
-   FFI_ASSERT (flags & FLAG_4_GPR_ARGUMENTS || intarg_count <= 4);
- }
- 
- /* About the LINUX64 ABI.  */
- enum {
-   NUM_GPR_ARG_REGISTERS64 = 8,
-   NUM_FPR_ARG_REGISTERS64 = 13
- };
- enum { ASM_NEEDS_REGISTERS64 = 4 };
- 
-+#if _CALL_ELF == 2
-+static unsigned int
-+discover_homogeneous_aggregate (const ffi_type *t, unsigned int *elnum)
-+{
-+  switch (t->type)
-+    {
-+    case FFI_TYPE_FLOAT:
-+    case FFI_TYPE_DOUBLE:
-+      *elnum = 1;
-+      return (int) t->type;
-+
-+    case FFI_TYPE_STRUCT:;
-+      {
-+	unsigned int base_elt = 0, total_elnum = 0;
-+	ffi_type **el = t->elements;
-+	while (*el)
-+	  {
-+	    unsigned int el_elt, el_elnum = 0;
-+	    el_elt = discover_homogeneous_aggregate (*el, &el_elnum);
-+	    if (el_elt == 0
-+		|| (base_elt && base_elt != el_elt))
-+	      return 0;
-+	    base_elt = el_elt;
-+	    total_elnum += el_elnum;
-+	    if (total_elnum > 8)
-+	      return 0;
-+	    el++;
-+	  }
-+	*elnum = total_elnum;
-+	return base_elt;
-+      }
-+
-+    default:
-+      return 0;
-+    }
-+}
-+#endif
-+
-+
- /* ffi_prep_args64 is called by the assembly routine once stack space
-    has been allocated for the function's arguments.
- 
-    The stack layout we want looks like this:
- 
-    |   Ret addr from ffi_call_LINUX64	8bytes	|	higher addresses
-    |--------------------------------------------|
-    |   CR save area			8bytes	|
-@@ -418,141 +469,216 @@ ffi_prep_args64 (extended_cif *ecif, uns
-   const unsigned long bytes = ecif->cif->bytes;
-   const unsigned long flags = ecif->cif->flags;
- 
-   typedef union {
-     char *c;
-     unsigned long *ul;
-     float *f;
-     double *d;
-+    size_t p;
-   } valp;
- 
-   /* 'stacktop' points at the previous backchain pointer.  */
-   valp stacktop;
- 
-   /* 'next_arg' points at the space for gpr3, and grows upwards as
-      we use GPR registers, then continues at rest.  */
-   valp gpr_base;
-   valp gpr_end;
-   valp rest;
-   valp next_arg;
- 
-   /* 'fpr_base' points at the space for fpr3, and grows upwards as
-      we use FPR registers.  */
-   valp fpr_base;
--  int fparg_count;
-+  unsigned int fparg_count;
- 
--  int i, words;
-+  unsigned int i, words, nargs, nfixedargs;
-   ffi_type **ptr;
-   double double_tmp;
-   union {
-     void **v;
-     char **c;
-     signed char **sc;
-     unsigned char **uc;
-     signed short **ss;
-     unsigned short **us;
-     signed int **si;
-     unsigned int **ui;
-     unsigned long **ul;
-     float **f;
-     double **d;
-   } p_argv;
-   unsigned long gprvalue;
-+#ifdef __STRUCT_PARM_ALIGN__
-+  unsigned long align;
-+#endif
- 
-   stacktop.c = (char *) stack + bytes;
-   gpr_base.ul = stacktop.ul - ASM_NEEDS_REGISTERS64 - NUM_GPR_ARG_REGISTERS64;
-   gpr_end.ul = gpr_base.ul + NUM_GPR_ARG_REGISTERS64;
-+#if _CALL_ELF == 2
-+  rest.ul = stack + 4 + NUM_GPR_ARG_REGISTERS64;
-+#else
-   rest.ul = stack + 6 + NUM_GPR_ARG_REGISTERS64;
-+#endif
-   fpr_base.d = gpr_base.d - NUM_FPR_ARG_REGISTERS64;
-   fparg_count = 0;
-   next_arg.ul = gpr_base.ul;
- 
-   /* Check that everything starts aligned properly.  */
-   FFI_ASSERT (((unsigned long) (char *) stack & 0xF) == 0);
-   FFI_ASSERT (((unsigned long) stacktop.c & 0xF) == 0);
-   FFI_ASSERT ((bytes & 0xF) == 0);
- 
-   /* Deal with return values that are actually pass-by-reference.  */
-   if (flags & FLAG_RETVAL_REFERENCE)
-     *next_arg.ul++ = (unsigned long) (char *) ecif->rvalue;
- 
-   /* Now for the arguments.  */
-   p_argv.v = ecif->avalue;
--  for (ptr = ecif->cif->arg_types, i = ecif->cif->nargs;
--       i > 0;
--       i--, ptr++, p_argv.v++)
-+  nargs = ecif->cif->nargs;
-+  nfixedargs = ecif->cif->nfixedargs;
-+  for (ptr = ecif->cif->arg_types, i = 0;
-+       i < nargs;
-+       i++, ptr++, p_argv.v++)
-     {
-+      unsigned int elt, elnum;
-+
-       switch ((*ptr)->type)
- 	{
- 	case FFI_TYPE_FLOAT:
- 	  double_tmp = **p_argv.f;
--	  *next_arg.f = (float) double_tmp;
-+	  if (fparg_count < NUM_FPR_ARG_REGISTERS64 && i < nfixedargs)
-+	    *fpr_base.d++ = double_tmp;
-+	  else
-+	    *next_arg.f = (float) double_tmp;
- 	  if (++next_arg.ul == gpr_end.ul)
- 	    next_arg.ul = rest.ul;
--	  if (fparg_count < NUM_FPR_ARG_REGISTERS64)
--	    *fpr_base.d++ = double_tmp;
- 	  fparg_count++;
- 	  FFI_ASSERT (flags & FLAG_FP_ARGUMENTS);
- 	  break;
- 
- 	case FFI_TYPE_DOUBLE:
- 	  double_tmp = **p_argv.d;
--	  *next_arg.d = double_tmp;
-+	  if (fparg_count < NUM_FPR_ARG_REGISTERS64 && i < nfixedargs)
-+	    *fpr_base.d++ = double_tmp;
-+	  else
-+	    *next_arg.d = double_tmp;
- 	  if (++next_arg.ul == gpr_end.ul)
- 	    next_arg.ul = rest.ul;
--	  if (fparg_count < NUM_FPR_ARG_REGISTERS64)
--	    *fpr_base.d++ = double_tmp;
- 	  fparg_count++;
- 	  FFI_ASSERT (flags & FLAG_FP_ARGUMENTS);
- 	  break;
- 
- #if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
- 	case FFI_TYPE_LONGDOUBLE:
- 	  double_tmp = (*p_argv.d)[0];
--	  *next_arg.d = double_tmp;
-+	  if (fparg_count < NUM_FPR_ARG_REGISTERS64 && i < nfixedargs)
-+	    *fpr_base.d++ = double_tmp;
-+	  else
-+	    *next_arg.d = double_tmp;
- 	  if (++next_arg.ul == gpr_end.ul)
- 	    next_arg.ul = rest.ul;
--	  if (fparg_count < NUM_FPR_ARG_REGISTERS64)
--	    *fpr_base.d++ = double_tmp;
- 	  fparg_count++;
- 	  double_tmp = (*p_argv.d)[1];
--	  *next_arg.d = double_tmp;
-+	  if (fparg_count < NUM_FPR_ARG_REGISTERS64 && i < nfixedargs)
-+	    *fpr_base.d++ = double_tmp;
-+	  else
-+	    *next_arg.d = double_tmp;
- 	  if (++next_arg.ul == gpr_end.ul)
- 	    next_arg.ul = rest.ul;
--	  if (fparg_count < NUM_FPR_ARG_REGISTERS64)
--	    *fpr_base.d++ = double_tmp;
- 	  fparg_count++;
- 	  FFI_ASSERT (__LDBL_MANT_DIG__ == 106);
- 	  FFI_ASSERT (flags & FLAG_FP_ARGUMENTS);
- 	  break;
- #endif
- 
- 	case FFI_TYPE_STRUCT:
--	  words = ((*ptr)->size + 7) / 8;
--	  if (next_arg.ul >= gpr_base.ul && next_arg.ul + words > gpr_end.ul)
-+#ifdef __STRUCT_PARM_ALIGN__
-+	  align = (*ptr)->alignment;
-+	  if (align > __STRUCT_PARM_ALIGN__)
-+	    align = __STRUCT_PARM_ALIGN__;
-+	  if (align > 1)
-+	    next_arg.p = ALIGN (next_arg.p, align);
-+#endif
-+	  elt = 0;
-+#if _CALL_ELF == 2
-+	  elt = discover_homogeneous_aggregate (*ptr, &elnum);
-+#endif
-+	  if (elt)
- 	    {
--	      size_t first = gpr_end.c - next_arg.c;
--	      memcpy (next_arg.c, *p_argv.c, first);
--	      memcpy (rest.c, *p_argv.c + first, (*ptr)->size - first);
--	      next_arg.c = rest.c + words * 8 - first;
-+	      union {
-+		void *v;
-+		float *f;
-+		double *d;
-+	      } arg;
-+
-+	      arg.v = *p_argv.v;
-+	      if (elt == FFI_TYPE_FLOAT)
-+		{
-+		  do
-+		    {
-+		      double_tmp = *arg.f++;
-+		      if (fparg_count < NUM_FPR_ARG_REGISTERS64
-+			  && i < nfixedargs)
-+			*fpr_base.d++ = double_tmp;
-+		      else
-+			*next_arg.f = (float) double_tmp;
-+		      if (++next_arg.f == gpr_end.f)
-+			next_arg.f = rest.f;
-+		      fparg_count++;
-+		    }
-+		  while (--elnum != 0);
-+		  if ((next_arg.p & 3) != 0)
-+		    {
-+		      if (++next_arg.f == gpr_end.f)
-+			next_arg.f = rest.f;
-+		    }
-+		}
-+	      else
-+		do
-+		  {
-+		    double_tmp = *arg.d++;
-+		    if (fparg_count < NUM_FPR_ARG_REGISTERS64 && i < nfixedargs)
-+		      *fpr_base.d++ = double_tmp;
-+		    else
-+		      *next_arg.d = double_tmp;
-+		    if (++next_arg.d == gpr_end.d)
-+		      next_arg.d = rest.d;
-+		    fparg_count++;
-+		  }
-+		while (--elnum != 0);
- 	    }
- 	  else
- 	    {
--	      char *where = next_arg.c;
-+	      words = ((*ptr)->size + 7) / 8;
-+	      if (next_arg.ul >= gpr_base.ul && next_arg.ul + words > gpr_end.ul)
-+		{
-+		  size_t first = gpr_end.c - next_arg.c;
-+		  memcpy (next_arg.c, *p_argv.c, first);
-+		  memcpy (rest.c, *p_argv.c + first, (*ptr)->size - first);
-+		  next_arg.c = rest.c + words * 8 - first;
-+		}
-+	      else
-+		{
-+		  char *where = next_arg.c;
- 
--	      /* Structures with size less than eight bytes are passed
--		 left-padded.  */
--	      if ((*ptr)->size < 8)
--		where += 8 - (*ptr)->size;
--
--	      memcpy (where, *p_argv.c, (*ptr)->size);
--	      next_arg.ul += words;
--	      if (next_arg.ul == gpr_end.ul)
--		next_arg.ul = rest.ul;
-+#ifndef __LITTLE_ENDIAN__
-+		  /* Structures with size less than eight bytes are passed
-+		     left-padded.  */
-+		  if ((*ptr)->size < 8)
-+		    where += 8 - (*ptr)->size;
-+#endif
-+		  memcpy (where, *p_argv.c, (*ptr)->size);
-+		  next_arg.ul += words;
-+		  if (next_arg.ul == gpr_end.ul)
-+		    next_arg.ul = rest.ul;
-+		}
- 	    }
- 	  break;
- 
- 	case FFI_TYPE_UINT8:
- 	  gprvalue = **p_argv.uc;
- 	  goto putgpr;
- 	case FFI_TYPE_SINT8:
- 	  gprvalue = **p_argv.sc;
-@@ -586,53 +712,55 @@ ffi_prep_args64 (extended_cif *ecif, uns
-   FFI_ASSERT (flags & FLAG_4_GPR_ARGUMENTS
- 	      || (next_arg.ul >= gpr_base.ul
- 		  && next_arg.ul <= gpr_base.ul + 4));
- }
- 
- 
- 
- /* Perform machine dependent cif processing */
--ffi_status
--ffi_prep_cif_machdep (ffi_cif *cif)
-+static ffi_status
-+ffi_prep_cif_machdep_core (ffi_cif *cif)
- {
-   /* All this is for the SYSV and LINUX64 ABI.  */
--  int i;
-   ffi_type **ptr;
-   unsigned bytes;
--  int fparg_count = 0, intarg_count = 0;
--  unsigned flags = 0;
-+  unsigned i, fparg_count = 0, intarg_count = 0;
-+  unsigned flags = cif->flags;
-   unsigned struct_copy_size = 0;
-   unsigned type = cif->rtype->type;
-   unsigned size = cif->rtype->size;
- 
--  if (cif->abi == FFI_LINUX_SOFT_FLOAT)
--    NUM_FPR_ARG_REGISTERS = 0;
--
-+  /* The machine-independent calculation of cif->bytes doesn't work
-+     for us.  Redo the calculation.  */
-   if (cif->abi != FFI_LINUX64)
-     {
--      /* All the machine-independent calculation of cif->bytes will be wrong.
--	 Redo the calculation for SYSV.  */
--
-       /* Space for the frame pointer, callee's LR, and the asm's temp regs.  */
-       bytes = (2 + ASM_NEEDS_REGISTERS) * sizeof (int);
- 
-       /* Space for the GPR registers.  */
-       bytes += NUM_GPR_ARG_REGISTERS * sizeof (int);
-     }
-   else
-     {
-       /* 64-bit ABI.  */
-+#if _CALL_ELF == 2
-+      /* Space for backchain, CR, LR, TOC and the asm's temp regs.  */
-+      bytes = (4 + ASM_NEEDS_REGISTERS64) * sizeof (long);
- 
-+      /* Space for the general registers.  */
-+      bytes += NUM_GPR_ARG_REGISTERS64 * sizeof (long);
-+#else
-       /* Space for backchain, CR, LR, cc/ld doubleword, TOC and the asm's temp
- 	 regs.  */
-       bytes = (6 + ASM_NEEDS_REGISTERS64) * sizeof (long);
- 
-       /* Space for the mandatory parm save area and general registers.  */
-       bytes += 2 * NUM_GPR_ARG_REGISTERS64 * sizeof (long);
-+#endif
-     }
- 
-   /* Return value handling.  The rules for SYSV are as follows:
-      - 32-bit (or less) integer values are returned in gpr3;
-      - Structures of size <= 4 bytes also returned in gpr3;
-      - 64-bit integer values and structures between 5 and 8 bytes are returned
-      in gpr3 and gpr4;
-      - Single/double FP values are returned in fpr1;
-@@ -641,71 +769,93 @@ ffi_prep_cif_machdep (ffi_cif *cif)
-      - long doubles (if not equivalent to double) are returned in
-      fpr1,fpr2 for Linux and as for large structs for SysV.
-      For LINUX64:
-      - integer values in gpr3;
-      - Structures/Unions by reference;
-      - Single/double FP values in fpr1, long double in fpr1,fpr2.
-      - soft-float float/doubles are treated as UINT32/UINT64 respectivley.
-      - soft-float long doubles are returned in gpr3-gpr6.  */
-+  /* First translate for softfloat/nonlinux */
-+  if (cif->abi == FFI_LINUX_SOFT_FLOAT)
-+    {
-+      if (type == FFI_TYPE_FLOAT)
-+	type = FFI_TYPE_UINT32;
-+      if (type == FFI_TYPE_DOUBLE)
-+	type = FFI_TYPE_UINT64;
-+      if (type == FFI_TYPE_LONGDOUBLE)
-+	type = FFI_TYPE_UINT128;
-+    }
-+  else if (cif->abi != FFI_LINUX
-+	   && cif->abi != FFI_LINUX64)
-+    {
-+#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
-+      if (type == FFI_TYPE_LONGDOUBLE)
-+	type = FFI_TYPE_STRUCT;
-+#endif
-+    }
-+
-   switch (type)
-     {
-+#ifndef __NO_FPRS__
- #if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
-     case FFI_TYPE_LONGDOUBLE:
--      if (cif->abi != FFI_LINUX && cif->abi != FFI_LINUX64
--	&& cif->abi != FFI_LINUX_SOFT_FLOAT)
--	goto byref;
-       flags |= FLAG_RETURNS_128BITS;
-       /* Fall through.  */
- #endif
-     case FFI_TYPE_DOUBLE:
-       flags |= FLAG_RETURNS_64BITS;
-       /* Fall through.  */
-     case FFI_TYPE_FLOAT:
--      /* With FFI_LINUX_SOFT_FLOAT no fp registers are used.  */
--      if (cif->abi != FFI_LINUX_SOFT_FLOAT)
--	flags |= FLAG_RETURNS_FP;
-+      flags |= FLAG_RETURNS_FP;
-       break;
-+#endif
- 
-+    case FFI_TYPE_UINT128:
-+      flags |= FLAG_RETURNS_128BITS;
-+      /* Fall through.  */
-     case FFI_TYPE_UINT64:
-     case FFI_TYPE_SINT64:
-       flags |= FLAG_RETURNS_64BITS;
-       break;
- 
-     case FFI_TYPE_STRUCT:
--      if (cif->abi == FFI_SYSV)
-+      /*
-+       * The final SYSV ABI says that structures smaller or equal 8 bytes
-+       * are returned in r3/r4.  The FFI_GCC_SYSV ABI instead returns them
-+       * in memory.
-+       *
-+       * NOTE: The assembly code can safely assume that it just needs to
-+       *       store both r3 and r4 into a 8-byte word-aligned buffer, as
-+       *       we allocate a temporary buffer in ffi_call() if this flag is
-+       *       set.
-+       */
-+      if (cif->abi == FFI_SYSV && size <= 8)
- 	{
--	  /* The final SYSV ABI says that structures smaller or equal 8 bytes
--	     are returned in r3/r4. The FFI_GCC_SYSV ABI instead returns them
--	     in memory.  */
--
--	  /* Treat structs with size <= 8 bytes.  */
--	  if (size <= 8)
-+	  flags |= FLAG_RETURNS_SMST;
-+	  break;
-+	}
-+#if _CALL_ELF == 2
-+      if (cif->abi == FFI_LINUX64)
-+	{
-+	  unsigned int elt, elnum;
-+	  elt = discover_homogeneous_aggregate (cif->rtype, &elnum);
-+	  if (elt)
-+	    {
-+	      if (elt == FFI_TYPE_DOUBLE)
-+		flags |= FLAG_RETURNS_64BITS;
-+	      flags |= FLAG_RETURNS_FP | FLAG_RETURNS_SMST;
-+	      break;
-+	    }
-+	  if (size <= 16)
- 	    {
- 	      flags |= FLAG_RETURNS_SMST;
--	      /* These structs are returned in r3. We pack the type and the
--		 precalculated shift value (needed in the sysv.S) into flags.
--		 The same applies for the structs returned in r3/r4.  */
--	      if (size <= 4)
--		{
--		  flags |= FLAG_SYSV_SMST_R3;
--		  flags |= 8 * (4 - size) << 8;
--		  break;
--		}
--	      /* These structs are returned in r3 and r4. See above.   */
--	      if  (size <= 8)
--		{
--		  flags |= FLAG_SYSV_SMST_R3 | FLAG_SYSV_SMST_R4;
--		  flags |= 8 * (8 - size) << 8;
--		  break;
--		}
-+	      break;
- 	    }
- 	}
--#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
--    byref:
- #endif
-       intarg_count++;
-       flags |= FLAG_RETVAL_REFERENCE;
-       /* Fall through.  */
-     case FFI_TYPE_VOID:
-       flags |= FLAG_RETURNS_NOTHING;
-       break;
- 
-@@ -717,218 +867,334 @@ ffi_prep_cif_machdep (ffi_cif *cif)
-   if (cif->abi != FFI_LINUX64)
-     /* The first NUM_GPR_ARG_REGISTERS words of integer arguments, and the
-        first NUM_FPR_ARG_REGISTERS fp arguments, go in registers; the rest
-        goes on the stack.  Structures and long doubles (if not equivalent
-        to double) are passed as a pointer to a copy of the structure.
-        Stuff on the stack needs to keep proper alignment.  */
-     for (ptr = cif->arg_types, i = cif->nargs; i > 0; i--, ptr++)
-       {
--	switch ((*ptr)->type)
--	  {
-+	unsigned short typenum = (*ptr)->type;
-+
-+	/* We may need to handle some values depending on ABI */
-+	if (cif->abi == FFI_LINUX_SOFT_FLOAT) {
-+		if (typenum == FFI_TYPE_FLOAT)
-+			typenum = FFI_TYPE_UINT32;
-+		if (typenum == FFI_TYPE_DOUBLE)
-+			typenum = FFI_TYPE_UINT64;
-+		if (typenum == FFI_TYPE_LONGDOUBLE)
-+			typenum = FFI_TYPE_UINT128;
-+	} else if (cif->abi != FFI_LINUX && cif->abi != FFI_LINUX64) {
-+#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
-+		if (typenum == FFI_TYPE_LONGDOUBLE)
-+			typenum = FFI_TYPE_STRUCT;
-+#endif
-+	}
-+
-+	switch (typenum) {
-+#ifndef __NO_FPRS__
- 	  case FFI_TYPE_FLOAT:
--	    /* With FFI_LINUX_SOFT_FLOAT floats are handled like UINT32.  */
--	    if (cif->abi == FFI_LINUX_SOFT_FLOAT)
--	      goto soft_float_cif;
- 	    fparg_count++;
- 	    /* floating singles are not 8-aligned on stack */
- 	    break;
- 
- #if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
- 	  case FFI_TYPE_LONGDOUBLE:
--	    if (cif->abi != FFI_LINUX && cif->abi != FFI_LINUX_SOFT_FLOAT)
--	      goto do_struct;
--	    if (cif->abi == FFI_LINUX_SOFT_FLOAT)
--	      {
--		if (intarg_count >= NUM_GPR_ARG_REGISTERS - 3
--		  || intarg_count < NUM_GPR_ARG_REGISTERS)
--		  /* A long double in FFI_LINUX_SOFT_FLOAT can use only
--		     a set of four consecutive gprs. If we have not enough,
--		     we have to adjust the intarg_count value.  */
--		  intarg_count += NUM_GPR_ARG_REGISTERS - intarg_count;
--		intarg_count += 4;
--		break;
--	      }
--	    else
--	      fparg_count++;
-+	    fparg_count++;
- 	    /* Fall thru */
- #endif
- 	  case FFI_TYPE_DOUBLE:
--	    /* With FFI_LINUX_SOFT_FLOAT doubles are handled like UINT64.  */
--	    if (cif->abi == FFI_LINUX_SOFT_FLOAT)
--	      goto soft_double_cif;
- 	    fparg_count++;
- 	    /* If this FP arg is going on the stack, it must be
- 	       8-byte-aligned.  */
- 	    if (fparg_count > NUM_FPR_ARG_REGISTERS
- 		&& intarg_count >= NUM_GPR_ARG_REGISTERS
- 		&& intarg_count % 2 != 0)
- 	      intarg_count++;
- 	    break;
-+#endif
-+	  case FFI_TYPE_UINT128:
-+		/*
-+		 * A long double in FFI_LINUX_SOFT_FLOAT can use only a set
-+		 * of four consecutive gprs. If we do not have enough, we
-+		 * have to adjust the intarg_count value.
-+		 */
-+		if (intarg_count >= NUM_GPR_ARG_REGISTERS - 3
-+				&& intarg_count < NUM_GPR_ARG_REGISTERS)
-+			intarg_count = NUM_GPR_ARG_REGISTERS;
-+		intarg_count += 4;
-+		break;
- 
- 	  case FFI_TYPE_UINT64:
- 	  case FFI_TYPE_SINT64:
--	  soft_double_cif:
- 	    /* 'long long' arguments are passed as two words, but
- 	       either both words must fit in registers or both go
- 	       on the stack.  If they go on the stack, they must
- 	       be 8-byte-aligned.
- 
- 	       Also, only certain register pairs can be used for
- 	       passing long long int -- specifically (r3,r4), (r5,r6),
- 	       (r7,r8), (r9,r10).
- 	    */
- 	    if (intarg_count == NUM_GPR_ARG_REGISTERS-1
- 		|| intarg_count % 2 != 0)
- 	      intarg_count++;
- 	    intarg_count += 2;
- 	    break;
- 
- 	  case FFI_TYPE_STRUCT:
--#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
--	  do_struct:
--#endif
- 	    /* We must allocate space for a copy of these to enforce
- 	       pass-by-value.  Pad the space up to a multiple of 16
- 	       bytes (the maximum alignment required for anything under
- 	       the SYSV ABI).  */
- 	    struct_copy_size += ((*ptr)->size + 15) & ~0xF;
- 	    /* Fall through (allocate space for the pointer).  */
- 
--	  default:
--	  soft_float_cif:
-+	  case FFI_TYPE_POINTER:
-+	  case FFI_TYPE_INT:
-+	  case FFI_TYPE_UINT32:
-+	  case FFI_TYPE_SINT32:
-+	  case FFI_TYPE_UINT16:
-+	  case FFI_TYPE_SINT16:
-+	  case FFI_TYPE_UINT8:
-+	  case FFI_TYPE_SINT8:
- 	    /* Everything else is passed as a 4-byte word in a GPR, either
- 	       the object itself or a pointer to it.  */
- 	    intarg_count++;
- 	    break;
-+	  default:
-+		FFI_ASSERT (0);
- 	  }
-       }
-   else
-     for (ptr = cif->arg_types, i = cif->nargs; i > 0; i--, ptr++)
-       {
-+	unsigned int elt, elnum;
-+#ifdef __STRUCT_PARM_ALIGN__
-+	unsigned int align;
-+#endif
-+
- 	switch ((*ptr)->type)
- 	  {
- #if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
- 	  case FFI_TYPE_LONGDOUBLE:
--	    if (cif->abi == FFI_LINUX_SOFT_FLOAT)
--	      intarg_count += 4;
--	    else
--	      {
--		fparg_count += 2;
--		intarg_count += 2;
--	      }
-+	    fparg_count += 2;
-+	    intarg_count += 2;
-+	    if (fparg_count > NUM_FPR_ARG_REGISTERS64)
-+	      flags |= FLAG_ARG_NEEDS_PSAVE;
- 	    break;
- #endif
- 	  case FFI_TYPE_FLOAT:
- 	  case FFI_TYPE_DOUBLE:
- 	    fparg_count++;
- 	    intarg_count++;
-+	    if (fparg_count > NUM_FPR_ARG_REGISTERS64)
-+	      flags |= FLAG_ARG_NEEDS_PSAVE;
- 	    break;
- 
- 	  case FFI_TYPE_STRUCT:
-+#ifdef __STRUCT_PARM_ALIGN__
-+	    align = (*ptr)->alignment;
-+	    if (align > __STRUCT_PARM_ALIGN__)
-+	      align = __STRUCT_PARM_ALIGN__;
-+	    align = align / 8;
-+	    if (align > 1)
-+	      intarg_count = ALIGN (intarg_count, align);
-+#endif
- 	    intarg_count += ((*ptr)->size + 7) / 8;
-+	    elt = 0;
-+#if _CALL_ELF == 2
-+	    elt = discover_homogeneous_aggregate (*ptr, &elnum);
-+#endif
-+	    if (elt)
-+	      {
-+		fparg_count += elnum;
-+		if (fparg_count > NUM_FPR_ARG_REGISTERS64)
-+		  flags |= FLAG_ARG_NEEDS_PSAVE;
-+	      }
-+	    else
-+	      {
-+		if (intarg_count > NUM_GPR_ARG_REGISTERS64)
-+		  flags |= FLAG_ARG_NEEDS_PSAVE;
-+	      }
- 	    break;
- 
--	  default:
-+	  case FFI_TYPE_POINTER:
-+	  case FFI_TYPE_UINT64:
-+	  case FFI_TYPE_SINT64:
-+	  case FFI_TYPE_INT:
-+	  case FFI_TYPE_UINT32:
-+	  case FFI_TYPE_SINT32:
-+	  case FFI_TYPE_UINT16:
-+	  case FFI_TYPE_SINT16:
-+	  case FFI_TYPE_UINT8:
-+	  case FFI_TYPE_SINT8:
- 	    /* Everything else is passed as a 8-byte word in a GPR, either
- 	       the object itself or a pointer to it.  */
- 	    intarg_count++;
-+	    if (intarg_count > NUM_GPR_ARG_REGISTERS64)
-+	      flags |= FLAG_ARG_NEEDS_PSAVE;
- 	    break;
-+	  default:
-+	    FFI_ASSERT (0);
- 	  }
-       }
- 
-+#ifndef __NO_FPRS__
-   if (fparg_count != 0)
-     flags |= FLAG_FP_ARGUMENTS;
-+#endif
-   if (intarg_count > 4)
-     flags |= FLAG_4_GPR_ARGUMENTS;
-   if (struct_copy_size != 0)
-     flags |= FLAG_ARG_NEEDS_COPY;
- 
-   if (cif->abi != FFI_LINUX64)
-     {
-+#ifndef __NO_FPRS__
-       /* Space for the FPR registers, if needed.  */
-       if (fparg_count != 0)
- 	bytes += NUM_FPR_ARG_REGISTERS * sizeof (double);
-+#endif
- 
-       /* Stack space.  */
-       if (intarg_count > NUM_GPR_ARG_REGISTERS)
- 	bytes += (intarg_count - NUM_GPR_ARG_REGISTERS) * sizeof (int);
-+#ifndef __NO_FPRS__
-       if (fparg_count > NUM_FPR_ARG_REGISTERS)
- 	bytes += (fparg_count - NUM_FPR_ARG_REGISTERS) * sizeof (double);
-+#endif
-     }
-   else
-     {
-+#ifndef __NO_FPRS__
-       /* Space for the FPR registers, if needed.  */
-       if (fparg_count != 0)
- 	bytes += NUM_FPR_ARG_REGISTERS64 * sizeof (double);
-+#endif
- 
-       /* Stack space.  */
-+#if _CALL_ELF == 2
-+      if ((flags & FLAG_ARG_NEEDS_PSAVE) != 0)
-+	bytes += intarg_count * sizeof (long);
-+#else
-       if (intarg_count > NUM_GPR_ARG_REGISTERS64)
- 	bytes += (intarg_count - NUM_GPR_ARG_REGISTERS64) * sizeof (long);
-+#endif
-     }
- 
-   /* The stack space allocated needs to be a multiple of 16 bytes.  */
-   bytes = (bytes + 15) & ~0xF;
- 
-   /* Add in the space for the copied structures.  */
-   bytes += struct_copy_size;
- 
-   cif->flags = flags;
-   cif->bytes = bytes;
- 
-   return FFI_OK;
- }
- 
-+ffi_status
-+ffi_prep_cif_machdep (ffi_cif *cif)
-+{
-+  cif->nfixedargs = cif->nargs;
-+  return ffi_prep_cif_machdep_core (cif);
-+}
-+
-+ffi_status
-+ffi_prep_cif_machdep_var (ffi_cif *cif,
-+			  unsigned int nfixedargs,
-+			  unsigned int ntotalargs MAYBE_UNUSED)
-+{
-+  cif->nfixedargs = nfixedargs;
-+#if _CALL_ELF == 2
-+  if (cif->abi == FFI_LINUX64)
-+    cif->flags |= FLAG_ARG_NEEDS_PSAVE;
-+#endif
-+  return ffi_prep_cif_machdep_core (cif);
-+}
-+
- extern void ffi_call_SYSV(extended_cif *, unsigned, unsigned, unsigned *,
- 			  void (*fn)(void));
- extern void FFI_HIDDEN ffi_call_LINUX64(extended_cif *, unsigned long,
- 					unsigned long, unsigned long *,
- 					void (*fn)(void));
- 
- void
- ffi_call(ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
- {
-+  /*
-+   * The final SYSV ABI says that structures smaller or equal 8 bytes
-+   * are returned in r3/r4.  The FFI_GCC_SYSV ABI instead returns them
-+   * in memory.
-+   *
-+   * We bounce-buffer SYSV small struct return values so that sysv.S
-+   * can write r3 and r4 to memory without worrying about struct size.
-+   *
-+   * For ELFv2 ABI, use a bounce buffer for homogeneous structs too,
-+   * for similar reasons.
-+   */
-+  unsigned long smst_buffer[8];
-   extended_cif ecif;
- 
-   ecif.cif = cif;
-   ecif.avalue = avalue;
- 
--  /* If the return value is a struct and we don't have a return	*/
--  /* value address then we need to make one		        */
--
--  if ((rvalue == NULL) && (cif->rtype->type == FFI_TYPE_STRUCT))
--    {
--      ecif.rvalue = alloca(cif->rtype->size);
--    }
--  else
--    ecif.rvalue = rvalue;
--
-+  ecif.rvalue = rvalue;
-+  if ((cif->flags & FLAG_RETURNS_SMST) != 0)
-+    ecif.rvalue = smst_buffer;
-+  /* Ensure that we have a valid struct return value.
-+     FIXME: Isn't this just papering over a user problem?  */
-+  else if (!rvalue && cif->rtype->type == FFI_TYPE_STRUCT)
-+    ecif.rvalue = alloca (cif->rtype->size);
- 
-   switch (cif->abi)
-     {
- #ifndef POWERPC64
-+# ifndef __NO_FPRS__
-     case FFI_SYSV:
-     case FFI_GCC_SYSV:
-     case FFI_LINUX:
-+# endif
-     case FFI_LINUX_SOFT_FLOAT:
-       ffi_call_SYSV (&ecif, -cif->bytes, cif->flags, ecif.rvalue, fn);
-       break;
- #else
-     case FFI_LINUX64:
-       ffi_call_LINUX64 (&ecif, -(long) cif->bytes, cif->flags, ecif.rvalue, fn);
-       break;
- #endif
-     default:
-       FFI_ASSERT (0);
-       break;
-     }
-+
-+  /* Check for a bounce-buffered return value */
-+  if (rvalue && ecif.rvalue == smst_buffer)
-+    {
-+      unsigned int rsize = cif->rtype->size;
-+#ifndef __LITTLE_ENDIAN__
-+      /* The SYSV ABI returns a structure of up to 4 bytes in size
-+	 left-padded in r3.  */
-+      if (cif->abi == FFI_SYSV && rsize <= 4)
-+	memcpy (rvalue, (char *) smst_buffer + 4 - rsize, rsize);
-+      /* The SYSV ABI returns a structure of up to 8 bytes in size
-+	 left-padded in r3/r4, and the ELFv2 ABI similarly returns a
-+	 structure of up to 8 bytes in size left-padded in r3.  */
-+      else if (rsize <= 8)
-+	memcpy (rvalue, (char *) smst_buffer + 8 - rsize, rsize);
-+      else
-+#endif
-+	memcpy (rvalue, smst_buffer, rsize);
-+    }
- }
- 
- 
--#ifndef POWERPC64
-+#if !defined POWERPC64 || _CALL_ELF == 2
- #define MIN_CACHE_LINE_SIZE 8
- 
- static void
- flush_icache (char *wraddr, char *xaddr, int size)
- {
-   int i;
-   for (i = 0; i < size; i += MIN_CACHE_LINE_SIZE)
-     __asm__ volatile ("icbi 0,%0;" "dcbf 0,%1;"
-@@ -942,26 +1208,48 @@ flush_icache (char *wraddr, char *xaddr,
- ffi_status
- ffi_prep_closure_loc (ffi_closure *closure,
- 		      ffi_cif *cif,
- 		      void (*fun) (ffi_cif *, void *, void **, void *),
- 		      void *user_data,
- 		      void *codeloc)
- {
- #ifdef POWERPC64
-+# if _CALL_ELF == 2
-+  unsigned int *tramp = (unsigned int *) &closure->tramp[0];
-+
-+  if (cif->abi != FFI_LINUX64)
-+    return FFI_BAD_ABI;
-+
-+  tramp[0] = 0xe96c0018;	/* 0:	ld	11,2f-0b(12)	*/
-+  tramp[1] = 0xe98c0010;	/*	ld	12,1f-0b(12)	*/
-+  tramp[2] = 0x7d8903a6;	/*	mtctr	12		*/
-+  tramp[3] = 0x4e800420;	/*	bctr			*/
-+				/* 1:	.quad	function_addr	*/
-+				/* 2:	.quad	context		*/
-+  *(void **) &tramp[4] = (void *) ffi_closure_LINUX64;
-+  *(void **) &tramp[6] = codeloc;
-+  flush_icache ((char *)tramp, (char *)codeloc, FFI_TRAMPOLINE_SIZE);
-+# else
-   void **tramp = (void **) &closure->tramp[0];
- 
--  FFI_ASSERT (cif->abi == FFI_LINUX64);
-+  if (cif->abi != FFI_LINUX64)
-+    return FFI_BAD_ABI;
-   /* Copy function address and TOC from ffi_closure_LINUX64.  */
-   memcpy (tramp, (char *) ffi_closure_LINUX64, 16);
-   tramp[2] = codeloc;
-+# endif
- #else
-   unsigned int *tramp;
- 
--  FFI_ASSERT (cif->abi == FFI_GCC_SYSV || cif->abi == FFI_SYSV);
-+  if (! (cif->abi == FFI_GCC_SYSV 
-+	 || cif->abi == FFI_SYSV
-+	 || cif->abi == FFI_LINUX
-+	 || cif->abi == FFI_LINUX_SOFT_FLOAT))
-+    return FFI_BAD_ABI;
- 
-   tramp = (unsigned int *) &closure->tramp[0];
-   tramp[0] = 0x7c0802a6;  /*   mflr    r0 */
-   tramp[1] = 0x4800000d;  /*   bl      10 <trampoline_initial+0x10> */
-   tramp[4] = 0x7d6802a6;  /*   mflr    r11 */
-   tramp[5] = 0x7c0803a6;  /*   mtlr    r0 */
-   tramp[6] = 0x800b0000;  /*   lwz     r0,0(r11) */
-   tramp[7] = 0x816b0004;  /*   lwz     r11,4(r11) */
-@@ -1006,110 +1294,215 @@ ffi_closure_helper_SYSV (ffi_closure *cl
-   /* rvalue is the pointer to space for return value in closure assembly */
-   /* pgr is the pointer to where r3-r10 are stored in ffi_closure_SYSV */
-   /* pfr is the pointer to where f1-f8 are stored in ffi_closure_SYSV  */
-   /* pst is the pointer to outgoing parameter stack in original caller */
- 
-   void **          avalue;
-   ffi_type **      arg_types;
-   long             i, avn;
--  long             nf;   /* number of floating registers already used */
--  long             ng;   /* number of general registers already used */
--  ffi_cif *        cif;
--  double           temp;
--  unsigned         size;
-+#ifndef __NO_FPRS__
-+  long             nf = 0;   /* number of floating registers already used */
-+#endif
-+  long             ng = 0;   /* number of general registers already used */
- 
--  cif = closure->cif;
-+  ffi_cif *cif = closure->cif;
-+  unsigned       size     = cif->rtype->size;
-+  unsigned short rtypenum = cif->rtype->type;
-+
-   avalue = alloca (cif->nargs * sizeof (void *));
--  size = cif->rtype->size;
- 
--  nf = 0;
--  ng = 0;
-+  /* First translate for softfloat/nonlinux */
-+  if (cif->abi == FFI_LINUX_SOFT_FLOAT) {
-+	if (rtypenum == FFI_TYPE_FLOAT)
-+		rtypenum = FFI_TYPE_UINT32;
-+	if (rtypenum == FFI_TYPE_DOUBLE)
-+		rtypenum = FFI_TYPE_UINT64;
-+	if (rtypenum == FFI_TYPE_LONGDOUBLE)
-+		rtypenum = FFI_TYPE_UINT128;
-+  } else if (cif->abi != FFI_LINUX && cif->abi != FFI_LINUX64) {
-+#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
-+	if (rtypenum == FFI_TYPE_LONGDOUBLE)
-+		rtypenum = FFI_TYPE_STRUCT;
-+#endif
-+  }
-+
- 
-   /* Copy the caller's structure return value address so that the closure
-      returns the data directly to the caller.
-      For FFI_SYSV the result is passed in r3/r4 if the struct size is less
-      or equal 8 bytes.  */
--
--  if ((cif->rtype->type == FFI_TYPE_STRUCT
--       && !((cif->abi == FFI_SYSV) && (size <= 8)))
--#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
--      || (cif->rtype->type == FFI_TYPE_LONGDOUBLE
--	  && cif->abi != FFI_LINUX && cif->abi != FFI_LINUX_SOFT_FLOAT)
--#endif
--      )
--    {
-+  if (rtypenum == FFI_TYPE_STRUCT && ((cif->abi != FFI_SYSV) || (size > 8))) {
-       rvalue = (void *) *pgr;
-       ng++;
-       pgr++;
-     }
- 
-   i = 0;
-   avn = cif->nargs;
-   arg_types = cif->arg_types;
- 
-   /* Grab the addresses of the arguments from the stack frame.  */
--  while (i < avn)
--    {
--      switch (arg_types[i]->type)
--	{
-+  while (i < avn) {
-+      unsigned short typenum = arg_types[i]->type;
-+
-+      /* We may need to handle some values depending on ABI */
-+      if (cif->abi == FFI_LINUX_SOFT_FLOAT) {
-+		if (typenum == FFI_TYPE_FLOAT)
-+			typenum = FFI_TYPE_UINT32;
-+		if (typenum == FFI_TYPE_DOUBLE)
-+			typenum = FFI_TYPE_UINT64;
-+		if (typenum == FFI_TYPE_LONGDOUBLE)
-+			typenum = FFI_TYPE_UINT128;
-+      } else if (cif->abi != FFI_LINUX && cif->abi != FFI_LINUX64) {
-+#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
-+		if (typenum == FFI_TYPE_LONGDOUBLE)
-+			typenum = FFI_TYPE_STRUCT;
-+#endif
-+      }
-+
-+      switch (typenum) {
-+#ifndef __NO_FPRS__
-+	case FFI_TYPE_FLOAT:
-+	  /* unfortunately float values are stored as doubles
-+	   * in the ffi_closure_SYSV code (since we don't check
-+	   * the type in that routine).
-+	   */
-+
-+	  /* there are 8 64bit floating point registers */
-+
-+	  if (nf < 8)
-+	    {
-+	      double temp = pfr->d;
-+	      pfr->f = (float) temp;
-+	      avalue[i] = pfr;
-+	      nf++;
-+	      pfr++;
-+	    }
-+	  else
-+	    {
-+	      /* FIXME? here we are really changing the values
-+	       * stored in the original calling routines outgoing
-+	       * parameter stack.  This is probably a really
-+	       * naughty thing to do but...
-+	       */
-+	      avalue[i] = pst;
-+	      pst += 1;
-+	    }
-+	  break;
-+
-+	case FFI_TYPE_DOUBLE:
-+	  /* On the outgoing stack all values are aligned to 8 */
-+	  /* there are 8 64bit floating point registers */
-+
-+	  if (nf < 8)
-+	    {
-+	      avalue[i] = pfr;
-+	      nf++;
-+	      pfr++;
-+	    }
-+	  else
-+	    {
-+	      if (((long) pst) & 4)
-+		pst++;
-+	      avalue[i] = pst;
-+	      pst += 2;
-+	    }
-+	  break;
-+
-+#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
-+	case FFI_TYPE_LONGDOUBLE:
-+	  if (nf < 7)
-+	    {
-+	      avalue[i] = pfr;
-+	      pfr += 2;
-+	      nf += 2;
-+	    }
-+	  else
-+	    {
-+	      if (((long) pst) & 4)
-+		pst++;
-+	      avalue[i] = pst;
-+	      pst += 4;
-+	      nf = 8;
-+	    }
-+	  break;
-+#endif
-+#endif /* have FPRS */
-+
-+	case FFI_TYPE_UINT128:
-+		/*
-+		 * Test if for the whole long double, 4 gprs are available.
-+		 * otherwise the stuff ends up on the stack.
-+		 */
-+		if (ng < 5) {
-+			avalue[i] = pgr;
-+			pgr += 4;
-+			ng += 4;
-+		} else {
-+			avalue[i] = pst;
-+			pst += 4;
-+			ng = 8+4;
-+		}
-+		break;
-+
- 	case FFI_TYPE_SINT8:
- 	case FFI_TYPE_UINT8:
-+#ifndef __LITTLE_ENDIAN__
- 	  /* there are 8 gpr registers used to pass values */
- 	  if (ng < 8)
- 	    {
- 	      avalue[i] = (char *) pgr + 3;
- 	      ng++;
- 	      pgr++;
- 	    }
- 	  else
- 	    {
- 	      avalue[i] = (char *) pst + 3;
- 	      pst++;
- 	    }
- 	  break;
-+#endif
- 
- 	case FFI_TYPE_SINT16:
- 	case FFI_TYPE_UINT16:
-+#ifndef __LITTLE_ENDIAN__
- 	  /* there are 8 gpr registers used to pass values */
- 	  if (ng < 8)
- 	    {
- 	      avalue[i] = (char *) pgr + 2;
- 	      ng++;
- 	      pgr++;
- 	    }
- 	  else
- 	    {
- 	      avalue[i] = (char *) pst + 2;
- 	      pst++;
- 	    }
- 	  break;
-+#endif
- 
- 	case FFI_TYPE_SINT32:
- 	case FFI_TYPE_UINT32:
- 	case FFI_TYPE_POINTER:
--	soft_float_closure:
- 	  /* there are 8 gpr registers used to pass values */
- 	  if (ng < 8)
- 	    {
- 	      avalue[i] = pgr;
- 	      ng++;
- 	      pgr++;
- 	    }
- 	  else
- 	    {
- 	      avalue[i] = pst;
- 	      pst++;
- 	    }
- 	  break;
- 
- 	case FFI_TYPE_STRUCT:
--#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
--	do_struct:
--#endif
- 	  /* Structs are passed by reference. The address will appear in a
- 	     gpr if it is one of the first 8 arguments.  */
- 	  if (ng < 8)
- 	    {
- 	      avalue[i] = (void *) *pgr;
- 	      ng++;
- 	      pgr++;
- 	    }
-@@ -1117,17 +1510,16 @@ ffi_closure_helper_SYSV (ffi_closure *cl
- 	    {
- 	      avalue[i] = (void *) *pst;
- 	      pst++;
- 	    }
- 	  break;
- 
- 	case FFI_TYPE_SINT64:
- 	case FFI_TYPE_UINT64:
--	soft_double_closure:
- 	  /* passing long long ints are complex, they must
- 	   * be passed in suitable register pairs such as
- 	   * (r3,r4) or (r5,r6) or (r6,r7), or (r7,r8) or (r9,r10)
- 	   * and if the entire pair aren't available then the outgoing
- 	   * parameter stack is used for both but an alignment of 8
- 	   * must will be kept.  So we must either look in pgr
- 	   * or pst to find the correct address for this type
- 	   * of parameter.
-@@ -1149,277 +1541,239 @@ ffi_closure_helper_SYSV (ffi_closure *cl
- 	      if (((long) pst) & 4)
- 		pst++;
- 	      avalue[i] = pst;
- 	      pst += 2;
- 	      ng = 8;
- 	    }
- 	  break;
- 
--	case FFI_TYPE_FLOAT:
--	  /* With FFI_LINUX_SOFT_FLOAT floats are handled like UINT32.  */
--	  if (cif->abi == FFI_LINUX_SOFT_FLOAT)
--	    goto soft_float_closure;
--	  /* unfortunately float values are stored as doubles
--	   * in the ffi_closure_SYSV code (since we don't check
--	   * the type in that routine).
--	   */
--
--	  /* there are 8 64bit floating point registers */
--
--	  if (nf < 8)
--	    {
--	      temp = pfr->d;
--	      pfr->f = (float) temp;
--	      avalue[i] = pfr;
--	      nf++;
--	      pfr++;
--	    }
--	  else
--	    {
--	      /* FIXME? here we are really changing the values
--	       * stored in the original calling routines outgoing
--	       * parameter stack.  This is probably a really
--	       * naughty thing to do but...
--	       */
--	      avalue[i] = pst;
--	      pst += 1;
--	    }
--	  break;
--
--	case FFI_TYPE_DOUBLE:
--	  /* With FFI_LINUX_SOFT_FLOAT doubles are handled like UINT64.  */
--	  if (cif->abi == FFI_LINUX_SOFT_FLOAT)
--	    goto soft_double_closure;
--	  /* On the outgoing stack all values are aligned to 8 */
--	  /* there are 8 64bit floating point registers */
--
--	  if (nf < 8)
--	    {
--	      avalue[i] = pfr;
--	      nf++;
--	      pfr++;
--	    }
--	  else
--	    {
--	      if (((long) pst) & 4)
--		pst++;
--	      avalue[i] = pst;
--	      pst += 2;
--	    }
--	  break;
--
--#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
--	case FFI_TYPE_LONGDOUBLE:
--	  if (cif->abi != FFI_LINUX && cif->abi != FFI_LINUX_SOFT_FLOAT)
--	    goto do_struct;
--	  if (cif->abi == FFI_LINUX_SOFT_FLOAT)
--	    { /* Test if for the whole long double, 4 gprs are available.
--		 otherwise the stuff ends up on the stack.  */
--	      if (ng < 5)
--		{
--		  avalue[i] = pgr;
--		  pgr += 4;
--		  ng += 4;
--		}
--	      else
--		{
--		  avalue[i] = pst;
--		  pst += 4;
--		  ng = 8;
--		}
--	      break;
--	    }
--	  if (nf < 7)
--	    {
--	      avalue[i] = pfr;
--	      pfr += 2;
--	      nf += 2;
--	    }
--	  else
--	    {
--	      if (((long) pst) & 4)
--		pst++;
--	      avalue[i] = pst;
--	      pst += 4;
--	      nf = 8;
--	    }
--	  break;
--#endif
--
- 	default:
--	  FFI_ASSERT (0);
-+		FFI_ASSERT (0);
- 	}
- 
-       i++;
-     }
- 
- 
-   (closure->fun) (cif, rvalue, avalue, closure->user_data);
- 
-   /* Tell ffi_closure_SYSV how to perform return type promotions.
-      Because the FFI_SYSV ABI returns the structures <= 8 bytes in r3/r4
-      we have to tell ffi_closure_SYSV how to treat them. We combine the base
-      type FFI_SYSV_TYPE_SMALL_STRUCT - 1  with the size of the struct.
-      So a one byte struct gets the return type 16. Return type 1 to 15 are
-      already used and we never have a struct with size zero. That is the reason
-      for the subtraction of 1. See the comment in ffitarget.h about ordering.
-   */
--  if (cif->abi == FFI_SYSV && cif->rtype->type == FFI_TYPE_STRUCT
--      && size <= 8)
-+  if (cif->abi == FFI_SYSV && rtypenum == FFI_TYPE_STRUCT && size <= 8)
-     return (FFI_SYSV_TYPE_SMALL_STRUCT - 1) + size;
--#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
--  else if (cif->rtype->type == FFI_TYPE_LONGDOUBLE
--	   && cif->abi != FFI_LINUX && cif->abi != FFI_LINUX_SOFT_FLOAT)
--    return FFI_TYPE_STRUCT;
--#endif
--  /* With FFI_LINUX_SOFT_FLOAT floats and doubles are handled like UINT32
--     respectivley UINT64.  */
--  if (cif->abi == FFI_LINUX_SOFT_FLOAT)
--    {
--      switch (cif->rtype->type)
--	{
--	case FFI_TYPE_FLOAT:
--	  return FFI_TYPE_UINT32;
--	  break;
--	case FFI_TYPE_DOUBLE:
--	  return FFI_TYPE_UINT64;
--	  break;
--#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
--	case FFI_TYPE_LONGDOUBLE:
--	  return FFI_TYPE_UINT128;
--	  break;
--#endif
--	default:
--	  return cif->rtype->type;
--	}
--    }
--  else
--    {
--      return cif->rtype->type;
--    }
-+  return rtypenum;
- }
- 
- int FFI_HIDDEN ffi_closure_helper_LINUX64 (ffi_closure *, void *,
- 					   unsigned long *, ffi_dblfl *);
- 
- int FFI_HIDDEN
- ffi_closure_helper_LINUX64 (ffi_closure *closure, void *rvalue,
- 			    unsigned long *pst, ffi_dblfl *pfr)
- {
-   /* rvalue is the pointer to space for return value in closure assembly */
-   /* pst is the pointer to parameter save area
-      (r3-r10 are stored into its first 8 slots by ffi_closure_LINUX64) */
-   /* pfr is the pointer to where f1-f13 are stored in ffi_closure_LINUX64 */
- 
-   void **avalue;
-   ffi_type **arg_types;
--  long i, avn;
-+  unsigned long i, avn, nfixedargs;
-   ffi_cif *cif;
-   ffi_dblfl *end_pfr = pfr + NUM_FPR_ARG_REGISTERS64;
-+#ifdef __STRUCT_PARM_ALIGN__
-+  unsigned long align;
-+#endif
- 
-   cif = closure->cif;
-   avalue = alloca (cif->nargs * sizeof (void *));
- 
--  /* Copy the caller's structure return value address so that the closure
--     returns the data directly to the caller.  */
--  if (cif->rtype->type == FFI_TYPE_STRUCT)
-+  /* Copy the caller's structure return value address so that the
-+     closure returns the data directly to the caller.  */
-+  if (cif->rtype->type == FFI_TYPE_STRUCT
-+      && (cif->flags & FLAG_RETURNS_SMST) == 0)
-     {
-       rvalue = (void *) *pst;
-       pst++;
-     }
- 
-   i = 0;
-   avn = cif->nargs;
-+  nfixedargs = cif->nfixedargs;
-   arg_types = cif->arg_types;
- 
-   /* Grab the addresses of the arguments from the stack frame.  */
-   while (i < avn)
-     {
-+      unsigned int elt, elnum;
-+
-       switch (arg_types[i]->type)
- 	{
- 	case FFI_TYPE_SINT8:
- 	case FFI_TYPE_UINT8:
-+#ifndef __LITTLE_ENDIAN__
- 	  avalue[i] = (char *) pst + 7;
- 	  pst++;
- 	  break;
-+#endif
- 
- 	case FFI_TYPE_SINT16:
- 	case FFI_TYPE_UINT16:
-+#ifndef __LITTLE_ENDIAN__
- 	  avalue[i] = (char *) pst + 6;
- 	  pst++;
- 	  break;
-+#endif
- 
- 	case FFI_TYPE_SINT32:
- 	case FFI_TYPE_UINT32:
-+#ifndef __LITTLE_ENDIAN__
- 	  avalue[i] = (char *) pst + 4;
- 	  pst++;
- 	  break;
-+#endif
- 
- 	case FFI_TYPE_SINT64:
- 	case FFI_TYPE_UINT64:
- 	case FFI_TYPE_POINTER:
- 	  avalue[i] = pst;
- 	  pst++;
- 	  break;
- 
- 	case FFI_TYPE_STRUCT:
--	  /* Structures with size less than eight bytes are passed
--	     left-padded.  */
--	  if (arg_types[i]->size < 8)
--	    avalue[i] = (char *) pst + 8 - arg_types[i]->size;
-+#ifdef __STRUCT_PARM_ALIGN__
-+	  align = arg_types[i]->alignment;
-+	  if (align > __STRUCT_PARM_ALIGN__)
-+	    align = __STRUCT_PARM_ALIGN__;
-+	  if (align > 1)
-+	    pst = (unsigned long *) ALIGN ((size_t) pst, align);
-+#endif
-+	  elt = 0;
-+#if _CALL_ELF == 2
-+	  elt = discover_homogeneous_aggregate (arg_types[i], &elnum);
-+#endif
-+	  if (elt)
-+	    {
-+	      union {
-+		void *v;
-+		unsigned long *ul;
-+		float *f;
-+		double *d;
-+		size_t p;
-+	      } to, from;
-+
-+	      /* Repackage the aggregate from its parts.  The
-+		 aggregate size is not greater than the space taken by
-+		 the registers so store back to the register/parameter
-+		 save arrays.  */
-+	      if (pfr + elnum <= end_pfr)
-+		to.v = pfr;
-+	      else
-+		to.v = pst;
-+
-+	      avalue[i] = to.v;
-+	      from.ul = pst;
-+	      if (elt == FFI_TYPE_FLOAT)
-+		{
-+		  do
-+		    {
-+		      if (pfr < end_pfr && i < nfixedargs)
-+			{
-+			  *to.f = (float) pfr->d;
-+			  pfr++;
-+			}
-+		      else
-+			*to.f = *from.f;
-+		      to.f++;
-+		      from.f++;
-+		    }
-+		  while (--elnum != 0);
-+		}
-+	      else
-+		{
-+		  do
-+		    {
-+		      if (pfr < end_pfr && i < nfixedargs)
-+			{
-+			  *to.d = pfr->d;
-+			  pfr++;
-+			}
-+		      else
-+			*to.d = *from.d;
-+		      to.d++;
-+		      from.d++;
-+		    }
-+		  while (--elnum != 0);
-+		}
-+	    }
- 	  else
--	    avalue[i] = pst;
-+	    {
-+#ifndef __LITTLE_ENDIAN__
-+	      /* Structures with size less than eight bytes are passed
-+		 left-padded.  */
-+	      if (arg_types[i]->size < 8)
-+		avalue[i] = (char *) pst + 8 - arg_types[i]->size;
-+	      else
-+#endif
-+		avalue[i] = pst;
-+	    }
- 	  pst += (arg_types[i]->size + 7) / 8;
- 	  break;
- 
- 	case FFI_TYPE_FLOAT:
- 	  /* unfortunately float values are stored as doubles
- 	   * in the ffi_closure_LINUX64 code (since we don't check
- 	   * the type in that routine).
- 	   */
- 
- 	  /* there are 13 64bit floating point registers */
- 
--	  if (pfr < end_pfr)
-+	  if (pfr < end_pfr && i < nfixedargs)
- 	    {
- 	      double temp = pfr->d;
- 	      pfr->f = (float) temp;
- 	      avalue[i] = pfr;
- 	      pfr++;
- 	    }
- 	  else
- 	    avalue[i] = pst;
- 	  pst++;
- 	  break;
- 
- 	case FFI_TYPE_DOUBLE:
- 	  /* On the outgoing stack all values are aligned to 8 */
- 	  /* there are 13 64bit floating point registers */
- 
--	  if (pfr < end_pfr)
-+	  if (pfr < end_pfr && i < nfixedargs)
- 	    {
- 	      avalue[i] = pfr;
- 	      pfr++;
- 	    }
- 	  else
- 	    avalue[i] = pst;
- 	  pst++;
- 	  break;
- 
- #if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
- 	case FFI_TYPE_LONGDOUBLE:
--	  if (pfr + 1 < end_pfr)
-+	  if (pfr + 1 < end_pfr && i + 1 < nfixedargs)
- 	    {
- 	      avalue[i] = pfr;
- 	      pfr += 2;
- 	    }
- 	  else
- 	    {
--	      if (pfr < end_pfr)
-+	      if (pfr < end_pfr && i < nfixedargs)
- 		{
- 		  /* Passed partly in f13 and partly on the stack.
- 		     Move it all to the stack.  */
- 		  *pst = *(unsigned long *) pfr;
- 		  pfr++;
- 		}
- 	      avalue[i] = pst;
- 	    }
-@@ -1433,10 +1787,19 @@ ffi_closure_helper_LINUX64 (ffi_closure 
- 
-       i++;
-     }
- 
- 
-   (closure->fun) (cif, rvalue, avalue, closure->user_data);
- 
-   /* Tell ffi_closure_LINUX64 how to perform return type promotions.  */
-+  if ((cif->flags & FLAG_RETURNS_SMST) != 0)
-+    {
-+      if ((cif->flags & FLAG_RETURNS_FP) == 0)
-+	return FFI_V2_TYPE_SMALL_STRUCT + cif->rtype->size - 1;
-+      else if ((cif->flags & FLAG_RETURNS_64BITS) != 0)
-+	return FFI_V2_TYPE_DOUBLE_HOMOG;
-+      else
-+	return FFI_V2_TYPE_FLOAT_HOMOG;
-+    }
-   return cif->rtype->type;
- }
-diff --git a/js/src/ctypes/libffi/src/powerpc/ffitarget.h b/js/src/ctypes/libffi/src/powerpc/ffitarget.h
---- a/js/src/ctypes/libffi/src/powerpc/ffitarget.h
-+++ b/js/src/ctypes/libffi/src/powerpc/ffitarget.h
-@@ -1,11 +1,13 @@
- /* -----------------------------------------------------------------*-C-*-
--   ffitarget.h - Copyright (c) 1996-2003  Red Hat, Inc.
--   Copyright (C) 2007, 2008 Free Software Foundation, Inc
-+   ffitarget.h - Copyright (c) 2012  Anthony Green
-+                 Copyright (C) 2007, 2008, 2010 Free Software Foundation, Inc
-+                 Copyright (c) 1996-2003  Red Hat, Inc.
-+
-    Target configuration macros for PowerPC.
- 
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the
-    ``Software''), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to
-@@ -23,16 +25,20 @@
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.
- 
-    ----------------------------------------------------------------------- */
- 
- #ifndef LIBFFI_TARGET_H
- #define LIBFFI_TARGET_H
- 
-+#ifndef LIBFFI_H
-+#error "Please do not include ffitarget.h directly into your source.  Use ffi.h instead."
-+#endif
-+
- /* ---- System specific configurations ----------------------------------- */
- 
- #if defined (POWERPC) && defined (__powerpc64__)	/* linux64 */
- #ifndef POWERPC64
- #define POWERPC64
- #endif
- #elif defined (POWERPC_DARWIN) && defined (__ppc64__)	/* Darwin */
- #ifndef POWERPC64
-@@ -52,28 +58,24 @@ typedef enum ffi_abi {
-   FFI_FIRST_ABI = 0,
- 
- #ifdef POWERPC
-   FFI_SYSV,
-   FFI_GCC_SYSV,
-   FFI_LINUX64,
-   FFI_LINUX,
-   FFI_LINUX_SOFT_FLOAT,
--# ifdef POWERPC64
-+# if defined(POWERPC64)
-   FFI_DEFAULT_ABI = FFI_LINUX64,
-+# elif defined(__NO_FPRS__)
-+  FFI_DEFAULT_ABI = FFI_LINUX_SOFT_FLOAT,
-+# elif (__LDBL_MANT_DIG__ == 106)
-+  FFI_DEFAULT_ABI = FFI_LINUX,
- # else
--#  if (!defined(__NO_FPRS__) && (__LDBL_MANT_DIG__ == 106))
--  FFI_DEFAULT_ABI = FFI_LINUX,
--#  else
--#   ifdef __NO_FPRS__
--  FFI_DEFAULT_ABI = FFI_LINUX_SOFT_FLOAT,
--#   else
-   FFI_DEFAULT_ABI = FFI_GCC_SYSV,
--#   endif
--#  endif
- # endif
- #endif
- 
- #ifdef POWERPC_AIX
-   FFI_AIX,
-   FFI_DARWIN,
-   FFI_DEFAULT_ABI = FFI_AIX,
- #endif
-@@ -96,32 +98,45 @@ typedef enum ffi_abi {
-   FFI_LAST_ABI
- } ffi_abi;
- #endif
- 
- /* ---- Definitions for closures ----------------------------------------- */
- 
- #define FFI_CLOSURES 1
- #define FFI_NATIVE_RAW_API 0
-+#if defined (POWERPC) || defined (POWERPC_FREEBSD)
-+# define FFI_TARGET_SPECIFIC_VARIADIC 1
-+# define FFI_EXTRA_CIF_FIELDS unsigned nfixedargs
-+#endif
- 
- /* For additional types like the below, take care about the order in
-    ppc_closures.S. They must follow after the FFI_TYPE_LAST.  */
- 
- /* Needed for soft-float long-double-128 support.  */
- #define FFI_TYPE_UINT128 (FFI_TYPE_LAST + 1)
- 
- /* Needed for FFI_SYSV small structure returns.
-    We use two flag bits, (FLAG_SYSV_SMST_R3, FLAG_SYSV_SMST_R4) which are
-    defined in ffi.c, to determine the exact return type and its size.  */
- #define FFI_SYSV_TYPE_SMALL_STRUCT (FFI_TYPE_LAST + 2)
- 
--#if defined(POWERPC64) || defined(POWERPC_AIX)
--#define FFI_TRAMPOLINE_SIZE 24
--#else /* POWERPC || POWERPC_AIX */
--#define FFI_TRAMPOLINE_SIZE 40
-+/* Used by ELFv2 for homogenous structure returns.  */
-+#define FFI_V2_TYPE_FLOAT_HOMOG		(FFI_TYPE_LAST + 1)
-+#define FFI_V2_TYPE_DOUBLE_HOMOG	(FFI_TYPE_LAST + 2)
-+#define FFI_V2_TYPE_SMALL_STRUCT	(FFI_TYPE_LAST + 3)
-+
-+#if _CALL_ELF == 2
-+# define FFI_TRAMPOLINE_SIZE 32
-+#else
-+# if defined(POWERPC64) || defined(POWERPC_AIX)
-+#  define FFI_TRAMPOLINE_SIZE 24
-+# else /* POWERPC || POWERPC_AIX */
-+#  define FFI_TRAMPOLINE_SIZE 40
-+# endif
- #endif
- 
- #ifndef LIBFFI_ASM
- #if defined(POWERPC_DARWIN) || defined(POWERPC_AIX)
- struct ffi_aix_trampoline_struct {
-     void * code_pointer;	/* Pointer to ffi_closure_ASM */
-     void * toc;			/* TOC */
-     void * static_chain;	/* Pointer to closure */
-diff --git a/js/src/ctypes/libffi/src/powerpc/linux64.S b/js/src/ctypes/libffi/src/powerpc/linux64.S
---- a/js/src/ctypes/libffi/src/powerpc/linux64.S
-+++ b/js/src/ctypes/libffi/src/powerpc/linux64.S
-@@ -25,56 +25,86 @@
-    DEALINGS IN THE SOFTWARE.
-    ----------------------------------------------------------------------- */
- 
- #define LIBFFI_ASM
- #include <fficonfig.h>
- #include <ffi.h>
- 
- #ifdef __powerpc64__
--	.hidden	ffi_call_LINUX64, .ffi_call_LINUX64
--	.globl	ffi_call_LINUX64, .ffi_call_LINUX64
-+	.hidden	ffi_call_LINUX64
-+	.globl	ffi_call_LINUX64
-+# if _CALL_ELF == 2
-+	.text
-+ffi_call_LINUX64:
-+	addis	%r2, %r12, .TOC.-ffi_call_LINUX64@ha
-+	addi	%r2, %r2, .TOC.-ffi_call_LINUX64@l
-+	.localentry ffi_call_LINUX64, . - ffi_call_LINUX64
-+# else
- 	.section	".opd","aw"
- 	.align	3
- ffi_call_LINUX64:
-+#  ifdef _CALL_LINUX
-+	.quad	.L.ffi_call_LINUX64,.TOC.@tocbase,0
-+	.type	ffi_call_LINUX64,@function
-+	.text
-+.L.ffi_call_LINUX64:
-+#  else
-+	.hidden	.ffi_call_LINUX64
-+	.globl	.ffi_call_LINUX64
- 	.quad	.ffi_call_LINUX64,.TOC.@tocbase,0
- 	.size	ffi_call_LINUX64,24
- 	.type	.ffi_call_LINUX64,@function
- 	.text
- .ffi_call_LINUX64:
-+#  endif
-+# endif
- .LFB1:
- 	mflr	%r0
- 	std	%r28, -32(%r1)
- 	std	%r29, -24(%r1)
- 	std	%r30, -16(%r1)
- 	std	%r31, -8(%r1)
- 	std	%r0, 16(%r1)
- 
- 	mr	%r28, %r1	/* our AP.  */
- .LCFI0:
- 	stdux	%r1, %r1, %r4
- 	mr	%r31, %r5	/* flags, */
- 	mr	%r30, %r6	/* rvalue, */
- 	mr	%r29, %r7	/* function address.  */
-+/* Save toc pointer, not for the ffi_prep_args64 call, but for the later
-+   bctrl function call.  */
-+# if _CALL_ELF == 2
-+	std	%r2, 24(%r1)
-+# else
- 	std	%r2, 40(%r1)
-+# endif
- 
- 	/* Call ffi_prep_args64.  */
- 	mr	%r4, %r1
-+# if defined _CALL_LINUX || _CALL_ELF == 2
-+	bl	ffi_prep_args64
-+# else
- 	bl	.ffi_prep_args64
-+# endif
- 
--	ld	%r0, 0(%r29)
-+# if _CALL_ELF == 2
-+	mr	%r12, %r29
-+# else
-+	ld	%r12, 0(%r29)
- 	ld	%r2, 8(%r29)
- 	ld	%r11, 16(%r29)
--
-+# endif
- 	/* Now do the call.  */
- 	/* Set up cr1 with bits 4-7 of the flags.  */
- 	mtcrf	0x40, %r31
- 
- 	/* Get the address to call into CTR.  */
--	mtctr	%r0
-+	mtctr	%r12
- 	/* Load all those argument registers.  */
- 	ld	%r3, -32-(8*8)(%r28)
- 	ld	%r4, -32-(7*8)(%r28)
- 	ld	%r5, -32-(6*8)(%r28)
- 	ld	%r6, -32-(5*8)(%r28)
- 	bf-	5, 1f
- 	ld	%r7, -32-(4*8)(%r28)
- 	ld	%r8, -32-(3*8)(%r28)
-@@ -99,50 +129,93 @@ 1:
- 	lfd	%f13, -32-(9*8)(%r28)
- 2:
- 
- 	/* Make the call.  */
- 	bctrl
- 
- 	/* This must follow the call immediately, the unwinder
- 	   uses this to find out if r2 has been saved or not.  */
-+# if _CALL_ELF == 2
-+	ld	%r2, 24(%r1)
-+# else
- 	ld	%r2, 40(%r1)
-+# endif
- 
- 	/* Now, deal with the return value.  */
- 	mtcrf	0x01, %r31
--	bt-	30, .Ldone_return_value
--	bt-	29, .Lfp_return_value
-+	bt	31, .Lstruct_return_value
-+	bt	30, .Ldone_return_value
-+	bt	29, .Lfp_return_value
- 	std	%r3, 0(%r30)
- 	/* Fall through...  */
- 
- .Ldone_return_value:
- 	/* Restore the registers we used and return.  */
- 	mr	%r1, %r28
- 	ld	%r0, 16(%r28)
--	ld	%r28, -32(%r1)
-+	ld	%r28, -32(%r28)
- 	mtlr	%r0
- 	ld	%r29, -24(%r1)
- 	ld	%r30, -16(%r1)
- 	ld	%r31, -8(%r1)
- 	blr
- 
- .Lfp_return_value:
- 	bf	28, .Lfloat_return_value
- 	stfd	%f1, 0(%r30)
- 	mtcrf	0x02, %r31 /* cr6  */
- 	bf	27, .Ldone_return_value
- 	stfd	%f2, 8(%r30)
- 	b	.Ldone_return_value
- .Lfloat_return_value:
- 	stfs	%f1, 0(%r30)
- 	b	.Ldone_return_value
-+
-+.Lstruct_return_value:
-+	bf	29, .Lsmall_struct
-+	bf	28, .Lfloat_homog_return_value
-+	stfd	%f1, 0(%r30)
-+	stfd	%f2, 8(%r30)
-+	stfd	%f3, 16(%r30)
-+	stfd	%f4, 24(%r30)
-+	stfd	%f5, 32(%r30)
-+	stfd	%f6, 40(%r30)
-+	stfd	%f7, 48(%r30)
-+	stfd	%f8, 56(%r30)
-+	b	.Ldone_return_value
-+
-+.Lfloat_homog_return_value:
-+	stfs	%f1, 0(%r30)
-+	stfs	%f2, 4(%r30)
-+	stfs	%f3, 8(%r30)
-+	stfs	%f4, 12(%r30)
-+	stfs	%f5, 16(%r30)
-+	stfs	%f6, 20(%r30)
-+	stfs	%f7, 24(%r30)
-+	stfs	%f8, 28(%r30)
-+	b	.Ldone_return_value
-+
-+.Lsmall_struct:
-+	std	%r3, 0(%r30)
-+	std	%r4, 8(%r30)
-+	b	.Ldone_return_value
-+
- .LFE1:
- 	.long	0
- 	.byte	0,12,0,1,128,4,0,0
-+# if _CALL_ELF == 2
-+	.size	ffi_call_LINUX64,.-ffi_call_LINUX64
-+# else
-+#  ifdef _CALL_LINUX
-+	.size	ffi_call_LINUX64,.-.L.ffi_call_LINUX64
-+#  else
- 	.size	.ffi_call_LINUX64,.-.ffi_call_LINUX64
-+#  endif
-+# endif
- 
- 	.section	.eh_frame,EH_FRAME_FLAGS,@progbits
- .Lframe1:
- 	.4byte	.LECIE1-.LSCIE1	 # Length of Common Information Entry
- .LSCIE1:
- 	.4byte	0x0	 # CIE Identifier Tag
- 	.byte	0x1	 # CIE Version
- 	.ascii "zR\0"	 # CIE Augmentation
-@@ -175,13 +248,13 @@ 2:
- 	.byte	0x9e	 # DW_CFA_offset, column 0x1e
- 	.uleb128 0x2
- 	.byte	0x9d	 # DW_CFA_offset, column 0x1d
- 	.uleb128 0x3
- 	.byte	0x9c	 # DW_CFA_offset, column 0x1c
- 	.uleb128 0x4
- 	.align 3
- .LEFDE1:
-+
-+# if (defined __ELF__ && defined __linux__) || _CALL_ELF == 2
-+	.section	.note.GNU-stack,"",@progbits
-+# endif
- #endif
--
--#if defined __ELF__ && defined __linux__
--	.section	.note.GNU-stack,"",@progbits
--#endif
-diff --git a/js/src/ctypes/libffi/src/powerpc/linux64_closure.S b/js/src/ctypes/libffi/src/powerpc/linux64_closure.S
---- a/js/src/ctypes/libffi/src/powerpc/linux64_closure.S
-+++ b/js/src/ctypes/libffi/src/powerpc/linux64_closure.S
-@@ -27,179 +27,330 @@
- #define LIBFFI_ASM
- #include <fficonfig.h>
- #include <ffi.h>
- 
- 	.file	"linux64_closure.S"
- 
- #ifdef __powerpc64__
- 	FFI_HIDDEN (ffi_closure_LINUX64)
--	FFI_HIDDEN (.ffi_closure_LINUX64)
--	.globl  ffi_closure_LINUX64, .ffi_closure_LINUX64
-+	.globl  ffi_closure_LINUX64
-+# if _CALL_ELF == 2
-+	.text
-+ffi_closure_LINUX64:
-+	addis	%r2, %r12, .TOC.-ffi_closure_LINUX64@ha
-+	addi	%r2, %r2, .TOC.-ffi_closure_LINUX64@l
-+	.localentry ffi_closure_LINUX64, . - ffi_closure_LINUX64
-+# else
- 	.section        ".opd","aw"
- 	.align  3
- ffi_closure_LINUX64:
-+#  ifdef _CALL_LINUX
-+	.quad   .L.ffi_closure_LINUX64,.TOC.@tocbase,0
-+	.type   ffi_closure_LINUX64,@function
-+	.text
-+.L.ffi_closure_LINUX64:
-+#  else
-+	FFI_HIDDEN (.ffi_closure_LINUX64)
-+	.globl  .ffi_closure_LINUX64
- 	.quad   .ffi_closure_LINUX64,.TOC.@tocbase,0
- 	.size   ffi_closure_LINUX64,24
- 	.type   .ffi_closure_LINUX64,@function
- 	.text
- .ffi_closure_LINUX64:
-+#  endif
-+# endif
-+
-+# if _CALL_ELF == 2
-+#  32 byte special reg save area + 64 byte parm save area
-+#  + 64 byte retval area + 13*8 fpr save area + round to 16
-+#  define STACKFRAME 272
-+#  define PARMSAVE 32
-+#  define RETVAL PARMSAVE+64
-+# else
-+#  48 bytes special reg save area + 64 bytes parm save area
-+#  + 16 bytes retval area + 13*8 bytes fpr save area + round to 16
-+#  define STACKFRAME 240
-+#  define PARMSAVE 48
-+#  define RETVAL PARMSAVE+64
-+# endif
-+
- .LFB1:
--	# save general regs into parm save area
--	std	%r3, 48(%r1)
--	std	%r4, 56(%r1)
--	std	%r5, 64(%r1)
--	std	%r6, 72(%r1)
-+# if _CALL_ELF == 2
-+	ld	%r12, FFI_TRAMPOLINE_SIZE(%r11)		# closure->cif
- 	mflr	%r0
-+	lwz	%r12, 28(%r12)				# cif->flags
-+	mtcrf	0x40, %r12
-+	addi	%r12, %r1, PARMSAVE
-+	bt	7, .Lparmsave
-+	# Our caller has not allocated a parameter save area.
-+	# We need to allocate one here and use it to pass gprs to
-+	# ffi_closure_helper_LINUX64.
-+	addi	%r12, %r1, -STACKFRAME+PARMSAVE
-+.Lparmsave:
-+	std	%r0, 16(%r1)
-+	# Save general regs into parm save area
-+	std	%r3, 0(%r12)
-+	std	%r4, 8(%r12)
-+	std	%r5, 16(%r12)
-+	std	%r6, 24(%r12)
-+	std	%r7, 32(%r12)
-+	std	%r8, 40(%r12)
-+	std	%r9, 48(%r12)
-+	std	%r10, 56(%r12)
- 
--	std	%r7, 80(%r1)
--	std	%r8, 88(%r1)
--	std	%r9, 96(%r1)
--	std	%r10, 104(%r1)
-+	# load up the pointer to the parm save area
-+	mr	%r5, %r12
-+# else
-+	mflr	%r0
-+	# Save general regs into parm save area
-+	# This is the parameter save area set up by our caller.
-+	std	%r3, PARMSAVE+0(%r1)
-+	std	%r4, PARMSAVE+8(%r1)
-+	std	%r5, PARMSAVE+16(%r1)
-+	std	%r6, PARMSAVE+24(%r1)
-+	std	%r7, PARMSAVE+32(%r1)
-+	std	%r8, PARMSAVE+40(%r1)
-+	std	%r9, PARMSAVE+48(%r1)
-+	std	%r10, PARMSAVE+56(%r1)
-+
- 	std	%r0, 16(%r1)
- 
--	# mandatory 48 bytes special reg save area + 64 bytes parm save area
--	# + 16 bytes retval area + 13*8 bytes fpr save area + round to 16
--	stdu	%r1, -240(%r1)
-+	# load up the pointer to the parm save area
-+	addi	%r5, %r1, PARMSAVE
-+# endif
-+
-+	# next save fpr 1 to fpr 13
-+	stfd	%f1, -104+(0*8)(%r1)
-+	stfd	%f2, -104+(1*8)(%r1)
-+	stfd	%f3, -104+(2*8)(%r1)
-+	stfd	%f4, -104+(3*8)(%r1)
-+	stfd	%f5, -104+(4*8)(%r1)
-+	stfd	%f6, -104+(5*8)(%r1)
-+	stfd	%f7, -104+(6*8)(%r1)
-+	stfd	%f8, -104+(7*8)(%r1)
-+	stfd	%f9, -104+(8*8)(%r1)
-+	stfd	%f10, -104+(9*8)(%r1)
-+	stfd	%f11, -104+(10*8)(%r1)
-+	stfd	%f12, -104+(11*8)(%r1)
-+	stfd	%f13, -104+(12*8)(%r1)
-+
-+	# load up the pointer to the saved fpr registers */
-+	addi	%r6, %r1, -104
-+
-+	# load up the pointer to the result storage
-+	addi	%r4, %r1, -STACKFRAME+RETVAL
-+
-+	stdu	%r1, -STACKFRAME(%r1)
- .LCFI0:
- 
--	# next save fpr 1 to fpr 13
--	stfd  %f1, 128+(0*8)(%r1)
--	stfd  %f2, 128+(1*8)(%r1)
--	stfd  %f3, 128+(2*8)(%r1)
--	stfd  %f4, 128+(3*8)(%r1)
--	stfd  %f5, 128+(4*8)(%r1)
--	stfd  %f6, 128+(5*8)(%r1)
--	stfd  %f7, 128+(6*8)(%r1)
--	stfd  %f8, 128+(7*8)(%r1)
--	stfd  %f9, 128+(8*8)(%r1)
--	stfd  %f10, 128+(9*8)(%r1)
--	stfd  %f11, 128+(10*8)(%r1)
--	stfd  %f12, 128+(11*8)(%r1)
--	stfd  %f13, 128+(12*8)(%r1)
--
--	# set up registers for the routine that actually does the work
- 	# get the context pointer from the trampoline
--	mr %r3, %r11
--
--	# now load up the pointer to the result storage
--	addi %r4, %r1, 112
--
--	# now load up the pointer to the parameter save area
--	# in the previous frame
--	addi %r5, %r1, 240 + 48
--
--	# now load up the pointer to the saved fpr registers */
--	addi %r6, %r1, 128
-+	mr	%r3, %r11
- 
- 	# make the call
-+# if defined _CALL_LINUX || _CALL_ELF == 2
-+	bl ffi_closure_helper_LINUX64
-+# else
- 	bl .ffi_closure_helper_LINUX64
-+# endif
- .Lret:
- 
- 	# now r3 contains the return type
- 	# so use it to look up in a table
- 	# so we know how to deal with each type
- 
- 	# look up the proper starting point in table
- 	# by using return type as offset
-+	ld %r0, STACKFRAME+16(%r1)
-+	cmpldi %r3, FFI_V2_TYPE_SMALL_STRUCT
-+	bge .Lsmall
- 	mflr %r4		# move address of .Lret to r4
- 	sldi %r3, %r3, 4	# now multiply return type by 16
- 	addi %r4, %r4, .Lret_type0 - .Lret
--	ld %r0, 240+16(%r1)
- 	add %r3, %r3, %r4	# add contents of table to table address
- 	mtctr %r3
- 	bctr			# jump to it
- 
- # Each of the ret_typeX code fragments has to be exactly 16 bytes long
- # (4 instructions). For cache effectiveness we align to a 16 byte boundary
- # first.
- 	.align 4
- 
- .Lret_type0:
- # case FFI_TYPE_VOID
- 	mtlr %r0
--	addi %r1, %r1, 240
-+	addi %r1, %r1, STACKFRAME
- 	blr
- 	nop
- # case FFI_TYPE_INT
--	lwa %r3, 112+4(%r1)
-+# ifdef __LITTLE_ENDIAN__
-+	lwa %r3, RETVAL+0(%r1)
-+# else
-+	lwa %r3, RETVAL+4(%r1)
-+# endif
- 	mtlr %r0
--	addi %r1, %r1, 240
-+	addi %r1, %r1, STACKFRAME
- 	blr
- # case FFI_TYPE_FLOAT
--	lfs %f1, 112+0(%r1)
-+	lfs %f1, RETVAL+0(%r1)
- 	mtlr %r0
--	addi %r1, %r1, 240
-+	addi %r1, %r1, STACKFRAME
- 	blr
- # case FFI_TYPE_DOUBLE
--	lfd %f1, 112+0(%r1)
-+	lfd %f1, RETVAL+0(%r1)
- 	mtlr %r0
--	addi %r1, %r1, 240
-+	addi %r1, %r1, STACKFRAME
- 	blr
- # case FFI_TYPE_LONGDOUBLE
--	lfd %f1, 112+0(%r1)
-+	lfd %f1, RETVAL+0(%r1)
- 	mtlr %r0
--	lfd %f2, 112+8(%r1)
-+	lfd %f2, RETVAL+8(%r1)
- 	b .Lfinish
- # case FFI_TYPE_UINT8
--	lbz %r3, 112+7(%r1)
-+# ifdef __LITTLE_ENDIAN__
-+	lbz %r3, RETVAL+0(%r1)
-+# else
-+	lbz %r3, RETVAL+7(%r1)
-+# endif
- 	mtlr %r0
--	addi %r1, %r1, 240
-+	addi %r1, %r1, STACKFRAME
- 	blr
- # case FFI_TYPE_SINT8
--	lbz %r3, 112+7(%r1)
-+# ifdef __LITTLE_ENDIAN__
-+	lbz %r3, RETVAL+0(%r1)
-+# else
-+	lbz %r3, RETVAL+7(%r1)
-+# endif
- 	extsb %r3,%r3
- 	mtlr %r0
- 	b .Lfinish
- # case FFI_TYPE_UINT16
--	lhz %r3, 112+6(%r1)
-+# ifdef __LITTLE_ENDIAN__
-+	lhz %r3, RETVAL+0(%r1)
-+# else
-+	lhz %r3, RETVAL+6(%r1)
-+# endif
- 	mtlr %r0
- .Lfinish:
--	addi %r1, %r1, 240
-+	addi %r1, %r1, STACKFRAME
- 	blr
- # case FFI_TYPE_SINT16
--	lha %r3, 112+6(%r1)
-+# ifdef __LITTLE_ENDIAN__
-+	lha %r3, RETVAL+0(%r1)
-+# else
-+	lha %r3, RETVAL+6(%r1)
-+# endif
- 	mtlr %r0
--	addi %r1, %r1, 240
-+	addi %r1, %r1, STACKFRAME
- 	blr
- # case FFI_TYPE_UINT32
--	lwz %r3, 112+4(%r1)
-+# ifdef __LITTLE_ENDIAN__
-+	lwz %r3, RETVAL+0(%r1)
-+# else
-+	lwz %r3, RETVAL+4(%r1)
-+# endif
- 	mtlr %r0
--	addi %r1, %r1, 240
-+	addi %r1, %r1, STACKFRAME
- 	blr
- # case FFI_TYPE_SINT32
--	lwa %r3, 112+4(%r1)
-+# ifdef __LITTLE_ENDIAN__
-+	lwa %r3, RETVAL+0(%r1)
-+# else
-+	lwa %r3, RETVAL+4(%r1)
-+# endif
- 	mtlr %r0
--	addi %r1, %r1, 240
-+	addi %r1, %r1, STACKFRAME
- 	blr
- # case FFI_TYPE_UINT64
--	ld %r3, 112+0(%r1)
-+	ld %r3, RETVAL+0(%r1)
- 	mtlr %r0
--	addi %r1, %r1, 240
-+	addi %r1, %r1, STACKFRAME
- 	blr
- # case FFI_TYPE_SINT64
--	ld %r3, 112+0(%r1)
-+	ld %r3, RETVAL+0(%r1)
- 	mtlr %r0
--	addi %r1, %r1, 240
-+	addi %r1, %r1, STACKFRAME
- 	blr
- # case FFI_TYPE_STRUCT
- 	mtlr %r0
--	addi %r1, %r1, 240
-+	addi %r1, %r1, STACKFRAME
- 	blr
- 	nop
- # case FFI_TYPE_POINTER
--	ld %r3, 112+0(%r1)
-+	ld %r3, RETVAL+0(%r1)
- 	mtlr %r0
--	addi %r1, %r1, 240
-+	addi %r1, %r1, STACKFRAME
- 	blr
--# esac
-+# case FFI_V2_TYPE_FLOAT_HOMOG
-+	lfs %f1, RETVAL+0(%r1)
-+	lfs %f2, RETVAL+4(%r1)
-+	lfs %f3, RETVAL+8(%r1)
-+	b .Lmorefloat
-+# case FFI_V2_TYPE_DOUBLE_HOMOG
-+	lfd %f1, RETVAL+0(%r1)
-+	lfd %f2, RETVAL+8(%r1)
-+	lfd %f3, RETVAL+16(%r1)
-+	lfd %f4, RETVAL+24(%r1)
-+	mtlr %r0
-+	lfd %f5, RETVAL+32(%r1)
-+	lfd %f6, RETVAL+40(%r1)
-+	lfd %f7, RETVAL+48(%r1)
-+	lfd %f8, RETVAL+56(%r1)
-+	addi %r1, %r1, STACKFRAME
-+	blr
-+.Lmorefloat:
-+	lfs %f4, RETVAL+12(%r1)
-+	mtlr %r0
-+	lfs %f5, RETVAL+16(%r1)
-+	lfs %f6, RETVAL+20(%r1)
-+	lfs %f7, RETVAL+24(%r1)
-+	lfs %f8, RETVAL+28(%r1)
-+	addi %r1, %r1, STACKFRAME
-+	blr
-+.Lsmall:
-+# ifdef __LITTLE_ENDIAN__
-+	ld %r3,RETVAL+0(%r1)
-+	mtlr %r0
-+	ld %r4,RETVAL+8(%r1)
-+	addi %r1, %r1, STACKFRAME
-+	blr
-+# else
-+	# A struct smaller than a dword is returned in the low bits of r3
-+	# ie. right justified.  Larger structs are passed left justified
-+	# in r3 and r4.  The return value area on the stack will have
-+	# the structs as they are usually stored in memory.
-+	cmpldi %r3, FFI_V2_TYPE_SMALL_STRUCT + 7 # size 8 bytes?
-+	neg %r5, %r3
-+	ld %r3,RETVAL+0(%r1)
-+	blt .Lsmalldown
-+	mtlr %r0
-+	ld %r4,RETVAL+8(%r1)
-+	addi %r1, %r1, STACKFRAME
-+	blr
-+.Lsmalldown:
-+	addi %r5, %r5, FFI_V2_TYPE_SMALL_STRUCT + 7
-+	mtlr %r0
-+	sldi %r5, %r5, 3
-+	addi %r1, %r1, STACKFRAME
-+	srd %r3, %r3, %r5
-+	blr
-+# endif
-+
- .LFE1:
- 	.long	0
- 	.byte	0,12,0,1,128,0,0,0
-+# if _CALL_ELF == 2
-+	.size	ffi_closure_LINUX64,.-ffi_closure_LINUX64
-+# else
-+#  ifdef _CALL_LINUX
-+	.size	ffi_closure_LINUX64,.-.L.ffi_closure_LINUX64
-+#  else
- 	.size	.ffi_closure_LINUX64,.-.ffi_closure_LINUX64
-+#  endif
-+# endif
- 
- 	.section	.eh_frame,EH_FRAME_FLAGS,@progbits
- .Lframe1:
- 	.4byte	.LECIE1-.LSCIE1	 # Length of Common Information Entry
- .LSCIE1:
- 	.4byte	0x0	 # CIE Identifier Tag
- 	.byte	0x1	 # CIE Version
- 	.ascii "zR\0"	 # CIE Augmentation
-@@ -218,19 +369,19 @@ ffi_closure_LINUX64:
- .LASFDE1:
- 	.4byte	.LASFDE1-.Lframe1	 # FDE CIE offset
- 	.8byte	.LFB1-.	 # FDE initial location
- 	.8byte	.LFE1-.LFB1	 # FDE address range
- 	.uleb128 0x0	 # Augmentation size
- 	.byte	0x2	 # DW_CFA_advance_loc1
- 	.byte	.LCFI0-.LFB1
- 	.byte	0xe	 # DW_CFA_def_cfa_offset
--	.uleb128 240
-+	.uleb128 STACKFRAME
- 	.byte	0x11	 # DW_CFA_offset_extended_sf
- 	.uleb128 0x41
- 	.sleb128 -2
- 	.align 3
- .LEFDE1:
-+
-+# if defined __ELF__ && defined __linux__
-+	.section	.note.GNU-stack,"",@progbits
-+# endif
- #endif
--
--#if defined __ELF__ && defined __linux__
--	.section	.note.GNU-stack,"",@progbits
--#endif
-diff --git a/js/src/ctypes/libffi/src/powerpc/ppc_closure.S b/js/src/ctypes/libffi/src/powerpc/ppc_closure.S
---- a/js/src/ctypes/libffi/src/powerpc/ppc_closure.S
-+++ b/js/src/ctypes/libffi/src/powerpc/ppc_closure.S
-@@ -117,53 +117,88 @@ ENTRY(ffi_closure_SYSV)
- # case FFI_TYPE_INT
- 	lwz %r3,112+0(%r1)
- 	mtlr %r0
- .Lfinish:
- 	addi %r1,%r1,144
- 	blr
- 
- # case FFI_TYPE_FLOAT
-+#ifndef __NO_FPRS__
- 	lfs %f1,112+0(%r1)
- 	mtlr %r0
- 	addi %r1,%r1,144
-+#else
-+	nop
-+	nop
-+	nop
-+#endif
- 	blr
- 
- # case FFI_TYPE_DOUBLE
-+#ifndef __NO_FPRS__
- 	lfd %f1,112+0(%r1)
- 	mtlr %r0
- 	addi %r1,%r1,144
-+#else
-+	nop
-+	nop
-+	nop
-+#endif
- 	blr
- 
- # case FFI_TYPE_LONGDOUBLE
-+#ifndef __NO_FPRS__
- 	lfd %f1,112+0(%r1)
- 	lfd %f2,112+8(%r1)
- 	mtlr %r0
- 	b .Lfinish
-+#else
-+	nop
-+	nop
-+	nop
-+	blr
-+#endif
- 
- # case FFI_TYPE_UINT8
-+#ifdef __LITTLE_ENDIAN__
-+	lbz %r3,112+0(%r1)
-+#else
- 	lbz %r3,112+3(%r1)
-+#endif
- 	mtlr %r0
- 	addi %r1,%r1,144
- 	blr
- 
- # case FFI_TYPE_SINT8
-+#ifdef __LITTLE_ENDIAN__
-+	lbz %r3,112+0(%r1)
-+#else
- 	lbz %r3,112+3(%r1)
-+#endif
- 	extsb %r3,%r3
- 	mtlr %r0
- 	b .Lfinish
- 
- # case FFI_TYPE_UINT16
-+#ifdef __LITTLE_ENDIAN__
-+	lhz %r3,112+0(%r1)
-+#else
- 	lhz %r3,112+2(%r1)
-+#endif
- 	mtlr %r0
- 	addi %r1,%r1,144
- 	blr
- 
- # case FFI_TYPE_SINT16
-+#ifdef __LITTLE_ENDIAN__
-+	lha %r3,112+0(%r1)
-+#else
- 	lha %r3,112+2(%r1)
-+#endif
- 	mtlr %r0
- 	addi %r1,%r1,144
- 	blr
- 
- # case FFI_TYPE_UINT32
- 	lwz %r3,112+0(%r1)
- 	mtlr %r0
- 	addi %r1,%r1,144
-@@ -198,76 +233,99 @@ ENTRY(ffi_closure_SYSV)
- 	mtlr %r0
- 	addi %r1,%r1,144
- 	blr
- 
- # case FFI_TYPE_UINT128
- 	lwz %r3,112+0(%r1)
- 	lwz %r4,112+4(%r1)
- 	lwz %r5,112+8(%r1)
--	bl .Luint128
-+	b .Luint128
- 
- # The return types below are only used when the ABI type is FFI_SYSV.
- # case FFI_SYSV_TYPE_SMALL_STRUCT + 1. One byte struct.
- 	lbz %r3,112+0(%r1)
- 	mtlr %r0
- 	addi %r1,%r1,144
- 	blr
- 
- # case FFI_SYSV_TYPE_SMALL_STRUCT + 2. Two byte struct.
- 	lhz %r3,112+0(%r1)
- 	mtlr %r0
- 	addi %r1,%r1,144
- 	blr
- 
- # case FFI_SYSV_TYPE_SMALL_STRUCT + 3. Three byte struct.
- 	lwz %r3,112+0(%r1)
-+#ifdef __LITTLE_ENDIAN__
-+	mtlr %r0
-+	addi %r1,%r1,144
-+	blr
-+#else
- 	srwi %r3,%r3,8
- 	mtlr %r0
- 	b .Lfinish
-+#endif
- 
- # case FFI_SYSV_TYPE_SMALL_STRUCT + 4. Four byte struct.
- 	lwz %r3,112+0(%r1)
- 	mtlr %r0
- 	addi %r1,%r1,144
- 	blr
- 
- # case FFI_SYSV_TYPE_SMALL_STRUCT + 5. Five byte struct.
- 	lwz %r3,112+0(%r1)
- 	lwz %r4,112+4(%r1)
-+#ifdef __LITTLE_ENDIAN__
-+	mtlr %r0
-+	b .Lfinish
-+#else
- 	li %r5,24
- 	b .Lstruct567
-+#endif
- 
- # case FFI_SYSV_TYPE_SMALL_STRUCT + 6. Six byte struct.
- 	lwz %r3,112+0(%r1)
- 	lwz %r4,112+4(%r1)
-+#ifdef __LITTLE_ENDIAN__
-+	mtlr %r0
-+	b .Lfinish
-+#else
- 	li %r5,16
- 	b .Lstruct567
-+#endif
- 
- # case FFI_SYSV_TYPE_SMALL_STRUCT + 7. Seven byte struct.
- 	lwz %r3,112+0(%r1)
- 	lwz %r4,112+4(%r1)
-+#ifdef __LITTLE_ENDIAN__
-+	mtlr %r0
-+	b .Lfinish
-+#else
- 	li %r5,8
- 	b .Lstruct567
-+#endif
- 
- # case FFI_SYSV_TYPE_SMALL_STRUCT + 8. Eight byte struct.
- 	lwz %r3,112+0(%r1)
- 	lwz %r4,112+4(%r1)
- 	mtlr %r0
- 	b .Lfinish
- 
-+#ifndef __LITTLE_ENDIAN__
- .Lstruct567:
- 	subfic %r6,%r5,32
- 	srw %r4,%r4,%r5
- 	slw %r6,%r3,%r6
- 	srw %r3,%r3,%r5
- 	or %r4,%r6,%r4
- 	mtlr %r0
- 	addi %r1,%r1,144
- 	blr
-+#endif
- 
- .Luint128:
- 	lwz %r6,112+12(%r1)
- 	mtlr %r0
- 	addi %r1,%r1,144
- 	blr
- 
- END(ffi_closure_SYSV)
-diff --git a/js/src/ctypes/libffi/src/powerpc/sysv.S b/js/src/ctypes/libffi/src/powerpc/sysv.S
---- a/js/src/ctypes/libffi/src/powerpc/sysv.S
-+++ b/js/src/ctypes/libffi/src/powerpc/sysv.S
-@@ -78,37 +78,41 @@ ENTRY(ffi_call_SYSV)
- 	nop
- 	lwz	%r7,-16-(4*4)(%r28)
- 	lwz	%r8,-16-(3*4)(%r28)
- 	lwz	%r9,-16-(2*4)(%r28)
- 	lwz	%r10,-16-(1*4)(%r28)
- 	nop
- 1:
- 
-+#ifndef __NO_FPRS__
- 	/* Load all the FP registers.  */
- 	bf-	6,2f
- 	lfd	%f1,-16-(8*4)-(8*8)(%r28)
- 	lfd	%f2,-16-(8*4)-(7*8)(%r28)
- 	lfd	%f3,-16-(8*4)-(6*8)(%r28)
- 	lfd	%f4,-16-(8*4)-(5*8)(%r28)
- 	nop
- 	lfd	%f5,-16-(8*4)-(4*8)(%r28)
- 	lfd	%f6,-16-(8*4)-(3*8)(%r28)
- 	lfd	%f7,-16-(8*4)-(2*8)(%r28)
- 	lfd	%f8,-16-(8*4)-(1*8)(%r28)
-+#endif
- 2:
- 
- 	/* Make the call.  */
- 	bctrl
- 
- 	/* Now, deal with the return value.  */
- 	mtcrf	0x01,%r31 /* cr7  */
- 	bt-	31,L(small_struct_return_value)
- 	bt-	30,L(done_return_value)
-+#ifndef __NO_FPRS__
- 	bt-	29,L(fp_return_value)
-+#endif
- 	stw	%r3,0(%r30)
- 	bf+	28,L(done_return_value)
- 	stw	%r4,4(%r30)
- 	mtcrf	0x02,%r31 /* cr6  */
- 	bf	27,L(done_return_value)
- 	stw     %r5,8(%r30)
- 	stw	%r6,12(%r30)
- 	/* Fall through...  */
-@@ -119,41 +123,38 @@ L(done_return_value):
- 	lwz	%r31, -4(%r28)
- 	mtlr	%r9
- 	lwz	%r30, -8(%r28)
- 	lwz	%r29,-12(%r28)
- 	lwz	%r28,-16(%r28)
- 	lwz	%r1,0(%r1)
- 	blr
- 
-+#ifndef __NO_FPRS__
- L(fp_return_value):
- 	bf	28,L(float_return_value)
- 	stfd	%f1,0(%r30)
- 	mtcrf   0x02,%r31 /* cr6  */
- 	bf	27,L(done_return_value)
- 	stfd	%f2,8(%r30)
- 	b	L(done_return_value)
- L(float_return_value):
- 	stfs	%f1,0(%r30)
- 	b	L(done_return_value)
-+#endif
- 
- L(small_struct_return_value):
--	extrwi	%r6,%r31,2,19         /* number of bytes padding = shift/8 */
--	mtcrf	0x02,%r31	      /* copy flags to cr[24:27] (cr6) */
--	extrwi	%r5,%r31,5,19         /* r5 <- number of bits of padding */
--	subfic  %r6,%r6,4             /* r6 <- number of useful bytes in r3 */
--	bf-	25,L(done_return_value) /* struct in r3 ? if not, done. */
--/* smst_one_register: */
--	slw	%r3,%r3,%r5           /* Left-justify value in r3 */
--	mtxer	%r6                   /* move byte count to XER ... */
--	stswx	%r3,0,%r30            /* ... and store that many bytes */
--	bf+	26,L(done_return_value)  /* struct in r3:r4 ? */
--	add	%r6,%r6,%r30          /* adjust pointer */
--	stswi	%r4,%r6,4             /* store last four bytes */
--	b	L(done_return_value)
-+	/*
-+	 * The C code always allocates a properly-aligned 8-byte bounce
-+	 * buffer to make this assembly code very simple.  Just write out
-+	 * r3 and r4 to the buffer to allow the C code to handle the rest.
-+	 */
-+	stw %r3, 0(%r30)
-+	stw %r4, 4(%r30)
-+	b L(done_return_value)
- 
- .LFE1:
- END(ffi_call_SYSV)
- 
-       .section	".eh_frame",EH_FRAME_FLAGS,@progbits
- .Lframe1:
-       .4byte    .LECIE1-.LSCIE1  /*  Length of Common Information Entry */
- .LSCIE1:
diff --git a/mozilla-ppc64le-mfbt.patch b/mozilla-ppc64le-mfbt.patch
deleted file mode 100644
index 967a3234..00000000
--- a/mozilla-ppc64le-mfbt.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-# HG changeset patch
-# Parent 46508a61b834f02575c116a508aa37b66d50bd20
-# User Ulrich Weigand <uweigand@de.ibm.com>
-Bug 976648 - powerpc64le-linux support - mfbt endian config
-
-diff --git a/mfbt/Endian.h b/mfbt/Endian.h
---- a/mfbt/Endian.h
-+++ b/mfbt/Endian.h
-@@ -86,17 +86,17 @@
- #    error "CPU type is unknown"
- #  endif
- #elif defined(_WIN32)
- #  if defined(_M_IX86)
- #    define MOZ_LITTLE_ENDIAN 1
- #  else
- #    error "CPU type is unknown"
- #  endif
--#elif defined(__APPLE__)
-+#elif defined(__APPLE__) || defined(__powerpc__) || defined(__ppc__)
- #  if __LITTLE_ENDIAN__
- #    define MOZ_LITTLE_ENDIAN 1
- #  elif __BIG_ENDIAN__
- #    define MOZ_BIG_ENDIAN 1
- #  endif
- #elif defined(__GNUC__) && \
-       defined(__BYTE_ORDER__) && \
-       defined(__ORDER_LITTLE_ENDIAN__) && \
-@@ -114,18 +114,17 @@
- #  endif
- /*
-  * We can't include useful headers like <endian.h> or <sys/isa_defs.h>
-  * here because they're not present on all platforms.  Instead we have
-  * this big conditional that ideally will catch all the interesting
-  * cases.
-  */
- #elif defined(__sparc) || defined(__sparc__) || \
--      defined(_POWER) || defined(__powerpc__) || \
--      defined(__ppc__) || defined(__hppa) || \
-+      defined(_POWER) || defined(__hppa) || \
-       defined(_MIPSEB) || defined(__ARMEB__) || \
-       defined(__s390__) || defined(__AARCH64EB__) || \
-       (defined(__sh__) && defined(__LITTLE_ENDIAN__)) || \
-       (defined(__ia64) && defined(__BIG_ENDIAN__))
- #  define MOZ_BIG_ENDIAN 1
- #elif defined(__i386) || defined(__i386__) || \
-       defined(__x86_64) || defined(__x86_64__) || \
-       defined(_MIPSEL) || defined(__ARMEL__) || \
diff --git a/mozilla-ppc64le-webrtc.patch b/mozilla-ppc64le-webrtc.patch
deleted file mode 100644
index 3b1a6b43..00000000
--- a/mozilla-ppc64le-webrtc.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-# HG changeset patch
-# Parent acbe154db4c912f3ac853c0671cd3d5e52b1e716
-# User Ulrich Weigand <uweigand@de.ibm.com>
-Bug 976648 - powerpc64le-linux support - WebRTC endian config
-
-diff --git a/media/webrtc/trunk/webrtc/typedefs.h b/media/webrtc/trunk/webrtc/typedefs.h
---- a/media/webrtc/trunk/webrtc/typedefs.h
-+++ b/media/webrtc/trunk/webrtc/typedefs.h
-@@ -47,23 +47,33 @@
- //#define WEBRTC_ARCH_ARM_FAMILY
- //#define WEBRTC_ARCH_ARMEL
- #define WEBRTC_ARCH_32_BITS
- #define WEBRTC_ARCH_LITTLE_ENDIAN
- #define WEBRTC_LITTLE_ENDIAN
- #elif defined(__powerpc64__)
- #define WEBRTC_ARCH_PPC64 1
- #define WEBRTC_ARCH_64_BITS 1
-+#ifdef __LITTLE_ENDIAN__
-+#define WEBRTC_ARCH_LITTLE_ENDIAN
-+#define WEBRTC_LITTLE_ENDIAN
-+#else
- #define WEBRTC_ARCH_BIG_ENDIAN
- #define WEBRTC_BIG_ENDIAN
-+#endif
- #elif defined(__ppc__) || defined(__powerpc__)
- #define WEBRTC_ARCH_PPC 1
- #define WEBRTC_ARCH_32_BITS 1
-+#ifdef __LITTLE_ENDIAN__
-+#define WEBRTC_ARCH_LITTLE_ENDIAN
-+#define WEBRTC_LITTLE_ENDIAN
-+#else
- #define WEBRTC_ARCH_BIG_ENDIAN
- #define WEBRTC_BIG_ENDIAN
-+#endif
- #elif defined(__sparc64__)
- #define WEBRTC_ARCH_SPARC 1
- #define WEBRTC_ARCH_64_BITS 1
- #define WEBRTC_ARCH_BIG_ENDIAN
- #define WEBRTC_BIG_ENDIAN
- #elif defined(__sparc__)
- #define WEBRTC_ARCH_SPARC 1
- #define WEBRTC_ARCH_32_BITS 1
diff --git a/mozilla-ppc64le-xpcom.patch b/mozilla-ppc64le-xpcom.patch
deleted file mode 100644
index 0d28a311..00000000
--- a/mozilla-ppc64le-xpcom.patch
+++ /dev/null
@@ -1,298 +0,0 @@
-# HG changeset patch
-# Parent 571f8d1f1501d31bd7c0d0affdc7cdc8b21203a0
-# User Ulrich Weigand <uweigand@de.ibm.com>
-Bug 976648 - powerpc64le-linux support - xptcall port
-
-Index: mozilla/xpcom/reflect/xptcall/src/md/unix/moz.build
-===================================================================
---- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/moz.build
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/moz.build
-@@ -224,12 +224,12 @@ if CONFIG['OS_TEST'] == 'powerpc':
-             'xptcstubs_ppc_linux.cpp',
-         ]
- 
--if CONFIG['OS_TEST'] == 'powerpc64':
-+if CONFIG['OS_TEST'] in ('powerpc64', 'powerpc64le'):
-     if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD'):
-           SOURCES += [
--              'xptcinvoke_asm_ppc64_linux.s',
-+              'xptcinvoke_asm_ppc64_linux.S',
-               'xptcinvoke_ppc64_linux.cpp',
--              'xptcstubs_asm_ppc64_linux.s',
-+              'xptcstubs_asm_ppc64_linux.S',
-               'xptcstubs_ppc64_linux.cpp',
-           ]
- 
-diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.S
-rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s
-rename to xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.S
---- a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s
-+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.S
-@@ -17,12 +17,38 @@
- .set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
- .set f30,30; .set f31,31
- 
-+# The ABI defines a fixed stack frame area of 4 doublewords (ELFv2)
-+# or 6 doublewords (ELFv1); the last of these doublewords is used
-+# as TOC pointer save area.  The fixed area is followed by a parameter
-+# save area of 8 doublewords (used for vararg routines), followed
-+# by space for parameters passed on the stack.
-+#
-+# We set STACK_TOC to the offset of the TOC pointer save area, and
-+# STACK_PARAMS to the offset of the first on-stack parameter.
-+
-+#if _CALL_ELF == 2
-+#define STACK_TOC      24
-+#define STACK_PARAMS   96
-+#else
-+#define STACK_TOC      40
-+#define STACK_PARAMS   112
-+#endif
- 
- #
- # NS_InvokeByIndex(nsISupports* that, uint32_t methodIndex,
- #                    uint32_t paramCount, nsXPTCVariant* params)
- #
- 
-+#if _CALL_ELF == 2
-+        .section ".text"
-+        .type   NS_InvokeByIndex,@function
-+        .globl  NS_InvokeByIndex
-+        .align 2
-+NS_InvokeByIndex:
-+0:      addis 2,12,(.TOC.-0b)@ha
-+        addi 2,2,(.TOC.-0b)@l
-+        .localentry NS_InvokeByIndex,.-NS_InvokeByIndex
-+#else
-         .section ".toc","aw"
-         .section ".text"
-         .align 2
-@@ -34,6 +60,7 @@ NS_InvokeByIndex:
-         .previous
-         .type   NS_InvokeByIndex,@function
- .NS_InvokeByIndex:
-+#endif
-         mflr    0
-         std     0,16(r1)
- 
-@@ -50,13 +77,12 @@ NS_InvokeByIndex:
-         # we don't actually need stack space for those. We must ensure
-         # that the stack remains 16-byte aligned.
-         #
--        #  | ..128-byte stack frame.. |     | 7 GP | 13 FP | 3 NV |
--        #  |               |(params)........| regs | regs  | regs |
--        # (r1)...........(+112)....(+128)
--        #                               (-23*8).(-16*8).(-3*8)..(r31)
-+        #  | (fixed area + |                | 7 GP | 13 FP | 3 NV |
-+        #  |  param. save) |(params)........| regs | regs  | regs |
-+        # (r1)......(+STACK_PARAMS)...  (-23*8).(-16*8).(-3*8)..(r31)
- 
-         # +stack frame, -unused stack params, +regs storage, +1 for alignment
--        addi    r7,r5,((112/8)-7+7+13+3+1)
-+        addi    r7,r5,((STACK_PARAMS/8)-7+7+13+3+1)
-         rldicr  r7,r7,3,59              # multiply by 8 and mask with ~15
-         neg     r7,r7
-         stdux   r1,r1,r7
-@@ -67,12 +93,13 @@ NS_InvokeByIndex:
-         #                           uint64_t* d))
- 
-         # r5, r6 are passed through intact (paramCount, params)
--        # r7 (d) has to be r1+112 -- where parameters are passed on the stack.
-+        # r7 (d) has to be r1+STACK_PARAMS
-+        #        -- where parameters are passed on the stack.
-         # r3, r4 are above that, easier to address from r31 than from r1
- 
-         subi    r3,r31,(23*8)           # r3 --> GPRS
-         subi    r4,r31,(16*8)           # r4 --> FPRS
--        addi    r7,r1,112               # r7 --> params
-+        addi    r7,r1,STACK_PARAMS      # r7 --> params
-         bl      invoke_copy_to_stack
-         nop
- 
-@@ -83,14 +110,18 @@ NS_InvokeByIndex:
- 
-         sldi    r30,r30,3               # Find function descriptor 
-         add     r9,r9,r30
--        ld      r9,0(r9)
-+        ld      r12,0(r9)
- 
--        ld      r0,0(r9)                # Actual address from fd.
--        std     r2,40(r1)               # Save r2 (TOC pointer)
-+        std     r2,STACK_TOC(r1)        # Save r2 (TOC pointer)
- 
-+#if _CALL_ELF == 2
-+        mtctr   r12
-+#else
-+        ld      r0,0(r12)               # Actual address from fd.
-         mtctr   0
--        ld      r11,16(r9)              # Environment pointer from fd.
--        ld      r2,8(r9)                # TOC pointer from fd.
-+        ld      r11,16(r12)             # Environment pointer from fd.
-+        ld      r2,8(r12)               # TOC pointer from fd.
-+#endif
- 
-         # Load FP and GP registers as required
-         ld      r4, -(23*8)(r31) 
-@@ -117,7 +148,7 @@ NS_InvokeByIndex:
- 
-         bctrl                           # Do it
- 
--        ld      r2,40(r1)               # Load our own TOC pointer
-+        ld      r2,STACK_TOC(r1)        # Load our own TOC pointer
-         ld      r1,0(r1)                # Revert stack frame
-         ld      0,16(r1)                # Reload lr
-         ld      29,-24(r1)              # Restore NVGPRS
-@@ -126,7 +157,11 @@ NS_InvokeByIndex:
-         mtlr    0
-         blr
- 
-+#if _CALL_ELF == 2
-+        .size   NS_InvokeByIndex,.-NS_InvokeByIndex
-+#else
-         .size   NS_InvokeByIndex,.-.NS_InvokeByIndex
-+#endif
- 
-         # Magic indicating no need for an executable stack
-         .section .note.GNU-stack, "", @progbits ; .previous
-Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp
-===================================================================
---- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp
-@@ -74,7 +74,9 @@ invoke_copy_to_stack(uint64_t* gpregs,
-                 fpregs[i]   = s->val.f; // if passed in registers, floats are promoted to doubles
-             } else {
-                 float *p = (float *)d;
-+#ifndef __LITTLE_ENDIAN__
-                 p++;
-+#endif
-                 *p = s->val.f;
-             }
-         }
-diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.S
-rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s
-rename to xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.S
---- a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s
-+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.S
-@@ -17,6 +17,27 @@
- .set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
- .set f30,30; .set f31,31
- 
-+#if _CALL_ELF == 2
-+#define STACK_PARAMS   96
-+#else
-+#define STACK_PARAMS   112
-+#endif
-+
-+#if _CALL_ELF == 2
-+        .section ".text"
-+        .type   SharedStub,@function
-+        .globl  SharedStub
-+        # Make the symbol hidden so that the branch from the stub does
-+        # not go via a PLT.  This is not only better for performance,
-+        # but may be necessary to avoid linker errors since there is
-+        # no place to restore the TOC register in a sibling call.
-+        .hidden SharedStub
-+        .align 2
-+SharedStub:
-+0:      addis 2,12,(.TOC.-0b)@ha
-+        addi 2,2,(.TOC.-0b)@l
-+        .localentry SharedStub,.-SharedStub
-+#else
-         .section ".text"
-         .align 2
-         .globl SharedStub
-@@ -29,6 +50,7 @@ SharedStub:
-         .type   SharedStub,@function
- 
- .SharedStub:
-+#endif
-         mflr    r0
- 
-         std     r4, -56(r1)                     # Save all GPRS
-@@ -55,7 +77,7 @@ SharedStub:
- 
-         subi    r6,r1,56                        # r6 --> gprData
-         subi    r7,r1,160                       # r7 --> fprData
--        addi    r5,r1,112                       # r5 --> extra stack args
-+        addi    r5,r1,STACK_PARAMS              # r5 --> extra stack args
- 
-         std     r0, 16(r1)
- 	
-@@ -75,7 +97,11 @@ SharedStub:
-         mtlr    r0
-         blr
- 
-+#if _CALL_ELF == 2
-+        .size   SharedStub,.-SharedStub
-+#else
-         .size   SharedStub,.-.SharedStub
-+#endif
- 
-         # Magic indicating no need for an executable stack
-         .section .note.GNU-stack, "", @progbits ; .previous
-Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp
-===================================================================
---- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp
-@@ -83,7 +83,9 @@ PrepareAndDispatch(nsXPTCStubBase* self,
-                 dp->val.f = (float) fprData[i]; // in registers floats are passed as doubles
-             else {
-                 float *p = (float *)ap;
-+#ifndef __LITTLE_ENDIAN__
-                 p++;
-+#endif
-                 dp->val.f = *p;
-             }
-         } else { /* integer type or pointer */
-@@ -153,6 +155,43 @@ PrepareAndDispatch(nsXPTCStubBase* self,
- // etc.
- // Use assembler directives to get the names right...
- 
-+#if _CALL_ELF == 2
-+# define STUB_ENTRY(n)                                                  \
-+__asm__ (                                                               \
-+        ".section \".text\" \n\t"                                       \
-+        ".align 2 \n\t"                                                 \
-+        ".if "#n" < 10 \n\t"                                            \
-+        ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev \n\t"                    \
-+        ".type  _ZN14nsXPTCStubBase5Stub"#n"Ev,@function \n\n"          \
-+"_ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t"                                  \
-+        "0: addis 2,12,.TOC.-0b@ha \n\t"                                \
-+        "addi     2,2,.TOC.-0b@l \n\t"                                  \
-+        ".localentry _ZN14nsXPTCStubBase5Stub"#n"Ev,.-_ZN14nsXPTCStubBase5Stub"#n"Ev \n\t" \
-+                                                                        \
-+        ".elseif "#n" < 100 \n\t"                                       \
-+        ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev \n\t"                    \
-+        ".type  _ZN14nsXPTCStubBase6Stub"#n"Ev,@function \n\n"          \
-+"_ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t"                                  \
-+        "0: addis 2,12,.TOC.-0b@ha \n\t"                                \
-+        "addi     2,2,.TOC.-0b@l \n\t"                                  \
-+        ".localentry _ZN14nsXPTCStubBase6Stub"#n"Ev,.-_ZN14nsXPTCStubBase6Stub"#n"Ev \n\t" \
-+                                                                        \
-+        ".elseif "#n" < 1000 \n\t"                                      \
-+        ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev \n\t"                    \
-+        ".type  _ZN14nsXPTCStubBase7Stub"#n"Ev,@function \n\n"          \
-+"_ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t"                                  \
-+        "0: addis 2,12,.TOC.-0b@ha \n\t"                                \
-+        "addi     2,2,.TOC.-0b@l \n\t"                                  \
-+        ".localentry _ZN14nsXPTCStubBase7Stub"#n"Ev,.-_ZN14nsXPTCStubBase7Stub"#n"Ev \n\t" \
-+                                                                        \
-+        ".else  \n\t"                                                   \
-+        ".err   \"stub number "#n" >= 1000 not yet supported\"\n"       \
-+        ".endif \n\t"                                                   \
-+                                                                        \
-+        "li     11,"#n" \n\t"                                           \
-+        "b      SharedStub \n"                                          \
-+);
-+#else
- # define STUB_ENTRY(n)                                                  \
- __asm__ (                                                               \
-         ".section \".toc\",\"aw\" \n\t"                                 \
-@@ -195,6 +234,7 @@ __asm__ (
-         "li     11,"#n" \n\t"                                           \
-         "b      SharedStub \n"                                          \
- );
-+#endif
- 
- #define SENTINEL_ENTRY(n)                                               \
- nsresult nsXPTCStubBase::Sentinel##n()                                  \
diff --git a/mozilla-preferences.patch b/mozilla-preferences.patch
index 910ab747..e6159230 100644
--- a/mozilla-preferences.patch
+++ b/mozilla-preferences.patch
@@ -5,19 +5,19 @@ confusion and therefore is currently the only setting we switch in the unbranded
 package unconditionally.
 
 # HG changeset patch
-# Parent bf7f0353aa8e00b1deaa05b7cb84bb7ea4c9ce8f
+# Parent 5c086bb8e0fa4f1600aced485e6156b0cdcd1755
 
 diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
 --- a/modules/libpref/src/init/all.js
 +++ b/modules/libpref/src/init/all.js
-@@ -1554,17 +1554,17 @@ pref("intl.charsetmenu.browser.more5",  
- pref("intl.charsetmenu.mailedit",           "chrome://global/locale/intl.properties");
+@@ -1428,17 +1428,17 @@ pref("intl.charsetmenu.mailedit",       
  pref("intl.charsetmenu.browser.cache",      "");
  pref("intl.charsetmenu.mailview.cache",     "");
  pref("intl.charsetmenu.composer.cache",     "");
  pref("intl.charsetmenu.browser.cache.size", 5);
  pref("intl.charset.detector",               "chrome://global/locale/intl.properties");
  pref("intl.charset.fallback.override",      "");
+ pref("intl.charset.fallback.tld",           true);
  pref("intl.ellipsis",                       "chrome://global-platform/locale/intl.properties");
 -pref("intl.locale.matchOS",                 false);
 +pref("intl.locale.matchOS",                 true);
diff --git a/mozilla-shared-nss-db.patch b/mozilla-shared-nss-db.patch
index 584c5fcb..857d5c6e 100644
--- a/mozilla-shared-nss-db.patch
+++ b/mozilla-shared-nss-db.patch
@@ -7,7 +7,7 @@ References:
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -8113,16 +8113,31 @@ if test "$MOZ_ENABLE_SKIA"; then
+@@ -8069,16 +8069,31 @@ if test "$MOZ_ENABLE_SKIA"; then
      MOZ_ENABLE_SKIA_GPU=1
      AC_DEFINE(USE_SKIA_GPU)
      AC_SUBST(MOZ_ENABLE_SKIA_GPU)
@@ -79,7 +79,7 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
  #include "nsCertVerificationThread.h"
  #include "nsAppDirectoryServiceDefs.h"
  #include "nsComponentManagerUtils.h"
-@@ -1117,17 +1124,31 @@ nsNSSComponent::InitializeNSS()
+@@ -1129,17 +1136,31 @@ nsNSSComponent::InitializeNSS()
    if (NS_FAILED(rv)) {
      nsPSMInitPanic::SetPanic();
      return NS_ERROR_NOT_AVAILABLE;
@@ -115,8 +115,8 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
 --- a/toolkit/library/Makefile.in
 +++ b/toolkit/library/Makefile.in
-@@ -223,17 +223,17 @@ endif
- ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
+@@ -161,17 +161,17 @@ endif
+ ifneq (,$(filter WINNT,$(OS_ARCH)))
  SDK_LIBRARY = $(IMPORT_LIBRARY)
  else
  SDK_LIBRARY = $(SHARED_LIBRARY)
@@ -130,7 +130,7 @@ diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
  ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
  CXXFLAGS += $(TK_CFLAGS)
  OS_LIBS += \
-   -framework SystemConfiguration \
-   -framework QTKit \
-   -framework IOKit \
-   -F$(MACOS_PRIVATE_FRAMEWORKS_DIR) -framework CoreUI \
+   $(TK_LIBS) \
+   $(NULL)
+ endif
+ 
diff --git a/source-stamp.txt b/source-stamp.txt
index eea8ade1..8e08db12 100644
--- a/source-stamp.txt
+++ b/source-stamp.txt
@@ -1,2 +1,2 @@
-REV=0cd2e9a8ba6f
+REV=529a45c94e5a
 REPO=http://hg.mozilla.org/releases/mozilla-release