$ git diff --patch-with-stat --summary 4b0e4731b7a4fe5df148002c006108af549ffaf7..9d9ec4c7d6299aeba94d583dbf1f360b31f92b38

 .abf.yml                     | 140 +++++++++++++++++++++----------------------
 firefox-91-buildfixes.patch  |  21 +++++++
 firefox-glibc-dynstack.patch |  64 ++++++++++++++++++++
 firefox.spec                 |  49 +++++++--------
 4 files changed, 176 insertions(+), 98 deletions(-)
 create mode 100644 firefox-91-buildfixes.patch
 create mode 100644 firefox-glibc-dynstack.patch

diff --git a/.abf.yml b/.abf.yml
index 9a30e2a..d21762c 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,71 +1,71 @@
 sources:
-  af.xpi: dcd9d8c2ec265d0e9fe794b9f3d108f434815280
-  ar.xpi: c70ca157f4fb3ba3aa0d6579ce67b10999544661
-  ast.xpi: 55e683d3f15b77551b9f497645549383b74658e7
-  bg.xpi: 9d89865afaaabeab68a2e56159f80ad3500226f5
-  bn.xpi: c9725ee822772654c60ea7a752eb071bdfb42dec
-  br.xpi: 3bdf12ea7a792424fb2390178a1a0c7ef0366065
-  bs.xpi: 1ac27cb75e5934f244cff76cc2be055a9190a965
-  ca.xpi: 87486494a90a60b78afb78e62c2f217e85b97913
-  cs.xpi: 8e415731927545e1524821a4167da5ee951b652b
-  cy.xpi: 4bc872f509c499c1ad5f0b6419b94982f17ea963
-  da.xpi: a7c429ada29ced7bd935d8b22de4f1871f4dd5f1
-  de.xpi: 9a3ecf003afad0818b0826afc786fa6648622d3b
-  el.xpi: 54b2dcb844ad265e07188997d97c2511a2a1b4ba
-  en-GB.xpi: 345203842454d6a4ab6fc6b4f344ee0318cfd325
-  eo.xpi: bd1a263d780e4369035172e7e5ef6e8f738086ee
-  es-AR.xpi: 69e8320ab311e671de13ca41058ff5d28b95c755
-  es-CL.xpi: 208f9b6316f2ffd7fdd964784b8609f353bf1424
-  es-ES.xpi: 375d79f7712183ec84a6c358b9e18e9562c6d2bf
-  es-MX.xpi: 50187bc730d78a40518704dae90ca4a7bb32d24a
-  et.xpi: 429d5597aa4bf627de78cd01ea46992674294e1f
-  eu.xpi: 700b7569514a5fafb3b8d91e5619db95bf200e62
-  fa.xpi: 0bd77e1617709fbf68d23f6c6420d267d7a41cc9
-  fi.xpi: 539af314b69772aa6b53d935a0aba5d1c91ae9f1
-  firefox-90.0.2.source.tar.xz: bc8038e849f300623ffa868187d9d53ae655e31c
-  fr.xpi: fbab19022fe505e546e9749a69a539197ad8b4b1
-  fy-NL.xpi: f88366d9ecf0d2edcfbadf5805e2f6fe1c1d66bc
-  ga-IE.xpi: 5de3ae72fc95d05ca1178a4c1944e40c822f28c6
-  gd.xpi: 8a129c316c20dbc300d5c3401c5d5dac4326a633
-  gl.xpi: 88c044774559ebce13201fe1df2a576a273d2668
-  gu-IN.xpi: 23724cf20ab7a086739a57bcdc3115efb2301528
-  he.xpi: bde4f2c31ddc8097090cb6d1e118327d7684683c
-  hi-IN.xpi: 49acf059ae18190fa4bff5bc5a51cc3515c7b4af
-  hr.xpi: e39988241552aa480f0b0554135f56f69aacf69f
-  hu.xpi: 6c132a04c3203ea59e1c5c748c290144b1a246b7
-  hy-AM.xpi: 94f9ac0c0b8b9e7fd51aeb7b713e82f9e7842247
-  id.xpi: c94ef36ee5914f3ef5758a3baf48deef33e19f6c
-  is.xpi: fb195fd68f2f77475f04781f197d5baea66fe5bf
-  it.xpi: 1dfb4d3c23b10377fbc2b13c6a7e987b6fa7fd27
-  ja.xpi: e4b7842964f89798ce24e55edbb621a5dce4f217
-  kk.xpi: 9d37f72eb05be908892e8a1cfb8eafa3d4cf554d
-  km.xpi: 03a639599877d05bfad5cf9314e84dc399faa5fc
-  kn.xpi: c93914815dec06212176e1d8a7e4ae7af3c4c452
-  ko.xpi: 985875268a9fc443cd2e2f072e732809364529f0
-  lt.xpi: bd6dd9491a9c4fbc228e569655db29820f8ddec6
-  lv.xpi: fb31d3a595f76497a33abc08faac0818522fa77b
-  mk.xpi: 29466a36fcf382661594e9ef2d9d9627b9c5e2d8
-  mr.xpi: 0fde027777cd0ded8b4ce35efaa4088ae925a01b
-  nb-NO.xpi: 763de625f3edfbb5ed13f480201a94af127e5240
-  nl.xpi: 158a76f7817086b40cc526f6a830e9e8240b2362
-  nn-NO.xpi: d6bb83977178792a22681bbc0eec722e709cefae
-  pa-IN.xpi: 9eb3a39f5c4b0275d8ad96e14cf72115c4907b12
-  pl.xpi: 5c5ff9e2842806c9ed36dc6f57a3b1519af261fd
-  pt-BR.xpi: 352d0f27d6eee3752862ed8a3ec5ef481ecaed56
-  pt-PT.xpi: a6de71fc5f64ef8137f4a8c1d914fdad8219ff83
-  ro.xpi: 0ecc4357f86967835f0456b8d64bda39d9ca2209
-  ru.xpi: b836f1b862a286335be5072ddd013f2fd4d6c3f0
-  si.xpi: e0291fc1b89aef8c940e82d8d90285d5f299903b
-  sk.xpi: f74810b43ac7a47bc388ff047054c3591c0fc197
-  sl.xpi: cc2a2ee8f8592bb0c76c55c5bd8a5be31c4dfa60
-  sq.xpi: 589b1598fd6240ddf3b8072669ffa13c2d23bf2b
-  sr.xpi: 2110bb4e0eaeb71c49ec9f5952d9850ff2b19974
-  sv-SE.xpi: 0b1eb77b71bb657167fb942ceb2b26a220c388c3
-  ta.xpi: 762990cdcb57316f8f4f8dbf465a5828d4aea74f
-  te.xpi: 097066a83d9d2b05d091932cc999d4dd30eed6d5
-  th.xpi: 69f4aed71e64c19a7f37b5a11df6d6cd0b61dad1
-  tr.xpi: 88538b807f8ff7dd88243e4b0121ba0492449dac
-  uk.xpi: bd466209bd005dcd91b6fae5eb313747a7aea01b
-  vi.xpi: bc97998f30f75c70a67f7c5fc40c18ff66fb592e
-  zh-CN.xpi: 7e5ee3ccee67030fb414ca6f85572db2e1589a5b
-  zh-TW.xpi: 7be1f634cc07b07d402eed8986baeb42dbeaa84c
+  af.xpi: 2bfc895206bf931f61d277a9b50a0cd592cba1c6
+  ar.xpi: b26842f6ee9f226938e78bec420345d685ff3853
+  ast.xpi: 0978ab22e5839e3b03cbfd8bbee1df0e280a93c4
+  bg.xpi: 29e016b9e0be30b61c0ebea3870910121df7a15a
+  bn.xpi: 7b49542825d2e84de9ccaf35544ec88a9001bb98
+  br.xpi: 43049adf50b3636a3606db9410c820056873e7ef
+  bs.xpi: 3f260649906056e1f2e78945163c07d72fcae043
+  ca.xpi: 90e809f6fc0c1cefa3fc406969ed3796485377c2
+  cs.xpi: 583cf170101afb2cd29fecb0d4b741a26db197ed
+  cy.xpi: 771c81ac7b07045222f90244a03d1a8914778a73
+  da.xpi: 0741e512c20c71caa85e0aaacc159dc8355af32e
+  de.xpi: 52eb73fb9bb5d3fee9b8c890ccd619ffce518d0e
+  el.xpi: 3a89bdfcf55dc419d5691f7221a3e46a1bf17549
+  en-GB.xpi: 2565a28bdc25b8b0addf3be653237daa51357aab
+  eo.xpi: c71b4e8b414f192c12b218242372e0004ab38d25
+  es-AR.xpi: 320f64c51c12469ea5c369cb9ac468dec5921558
+  es-CL.xpi: bfdac0725a219e2879178ec710759b0e78b915ed
+  es-ES.xpi: 05868086d70274451c588cd741491ec2db90db54
+  es-MX.xpi: e904fbf927cf66a9c1de76c84fab7fbbed8eded2
+  et.xpi: 4e8b8a11012b8811555344a4886de4f02b50c0fc
+  eu.xpi: 7e7874635a028bb8337411a4a3d063971dacedb8
+  fa.xpi: 2989e8434b2a45a10e4a2b7699073c7f4092c40f
+  fi.xpi: d2ab6021216bee8a06fc8466ced030461a58997d
+  firefox-92.0.source.tar.xz: 777f5d182865ffa48dcc45657acd6374c33a9281
+  fr.xpi: c21a9acd3448e5ef8e15633d35e5350b20dbf781
+  fy-NL.xpi: e6f757357eb101a4741a761370340b28715c5a51
+  ga-IE.xpi: e9431bbd49b1b0148c2622e65f4d5862935ea348
+  gd.xpi: 12e75adb9d4b9daad094cc6c9e8bf24059cb7cd9
+  gl.xpi: 46812edd6600068766be3c289da7cfabcef5ddca
+  gu-IN.xpi: fc0f393a2c04decab7da9d75bbb49f31fd304972
+  he.xpi: 2a3b548a410a4020b6dfea3c25c18a56acaae089
+  hi-IN.xpi: 7083a91c1c43ddbb6176d08ad5abbe02b0f571a7
+  hr.xpi: bcf04a4392781b766a7133917c9026d75d3e4421
+  hu.xpi: 0d0dbf1433199e47d2b004a9f0f09be27b4d79df
+  hy-AM.xpi: 1dac20ce8419e897476fcfe4411d201031e674f1
+  id.xpi: 575ace79e805e155b93418509eb46f1506e617a1
+  is.xpi: 11b588a3ee875f611872cb506a23423330453ae3
+  it.xpi: 32a41f653ae0659f23c24e3b16536112b5df5fc5
+  ja.xpi: 689e03689230eb04cec790f375f7f3b5da8cbde2
+  kk.xpi: 4ade6ea22570ae9d1ee3da43c551e7491b8b8c1a
+  km.xpi: e0d228762d339ef9ca42b1e78592cab50f83e5c0
+  kn.xpi: 3f1651813114f1b9c7f5588eb76ae278f08cf839
+  ko.xpi: 44cdeb8576c039d01db008156266423f8bc11d7a
+  lt.xpi: 093396eb12a2e6bb9ffac2dc2a6203ed3c8faf37
+  lv.xpi: b0ae79ca39623aff7bc76e48cef875d10609caae
+  mk.xpi: f3f3f229fefe6e2fd64ef296cb6f6628280cc93a
+  mr.xpi: 830ed85fdc487905d00c6f5cdcbe9f59b7f14730
+  nb-NO.xpi: 33d9ed80b2ee74d90f2e0a405ae02f51f53c2696
+  nl.xpi: 2ccd135f09592d54dbf9227e42fad22f82f39878
+  nn-NO.xpi: cc1fd109002421b4bae94c21949407d7b4907d11
+  pa-IN.xpi: 45bd94a66ad768cd89ad9c136fdb01a35abdb43a
+  pl.xpi: 96d1ef9a2e8f2770a22f324730378e653c58ce67
+  pt-BR.xpi: e41aaebe37cc80447879113f2623034aefb826ee
+  pt-PT.xpi: 26a226323247440e36ca145ef1ce69621e13b4ea
+  ro.xpi: a87b040fd1774eee8e093099e6dd69159e76da9f
+  ru.xpi: 6abe2ea62fcc8b27a13b1756c98c9a137b4cbc50
+  si.xpi: e34b6d553b8e3da74e1e370d21f7a7efc9963faa
+  sk.xpi: 06925dca8496a5068489d503e94a9d3209c98cef
+  sl.xpi: 95c01ddd11f00ec05f6cc590a857a01d9df973d5
+  sq.xpi: 740a83beae09c9bf8638da0861bb756cabcb9c68
+  sr.xpi: cc68095d56276a3801eba210b29af80e70c7ce0b
+  sv-SE.xpi: d4aa9ebeb764df8297d8ba7620bac8f315c87d1e
+  ta.xpi: 5acb7052db6f5897e17dae93dc68ed9b725c4f98
+  te.xpi: 638f8c8b98c4ea4001e2e12f79a10ec060011943
+  th.xpi: 81d675637dc4c3cb4b96fbad41bfde568087f83b
+  tr.xpi: 4fd386289bd924c6fe85893ff5ed6e4ed53cb12f
+  uk.xpi: 1485bac7c0d375f0b1d649985ad9ea4ac50efaca
+  vi.xpi: 533a7e9932d21721e0c81b338939d9b368691861
+  zh-CN.xpi: 91228a4783fbb3cc2e72ab7c6d274f4828338a23
+  zh-TW.xpi: fb734877ac51bc4674833d4bbe4b2a48bc56c42d
diff --git a/firefox-91-buildfixes.patch b/firefox-91-buildfixes.patch
new file mode 100644
index 0000000..8a71c30
--- /dev/null
+++ b/firefox-91-buildfixes.patch
@@ -0,0 +1,21 @@
+diff -up firefox-91.0/security/sandbox/linux/launch/SandboxLaunch.cpp.omv~ firefox-91.0/security/sandbox/linux/launch/SandboxLaunch.cpp
+--- firefox-91.0/security/sandbox/linux/launch/SandboxLaunch.cpp.omv~	2021-08-17 22:34:09.599506604 +0200
++++ firefox-91.0/security/sandbox/linux/launch/SandboxLaunch.cpp	2021-08-17 22:34:24.493563307 +0200
+@@ -17,6 +17,8 @@
+ 
+ #include <utility>
+ 
++#include "../../../../mfbt/ArrayUtils.h"
++
+ #include "LinuxCapabilities.h"
+ #include "LinuxSched.h"
+ #include "SandboxChrootProto.h"
+@@ -516,7 +518,7 @@ MOZ_NEVER_INLINE MOZ_ASAN_BLACKLIST stat
+ #ifdef __hppa__
+   void* stackPtr = miniStack;
+ #else
+-  void* stackPtr = ArrayEnd(miniStack);
++  void* stackPtr = ArrayEnd<uint8_t>(miniStack);
+ #endif
+   return clone(CloneCallee, stackPtr, aFlags, aCtx);
+ }
diff --git a/firefox-glibc-dynstack.patch b/firefox-glibc-dynstack.patch
new file mode 100644
index 0000000..b0487d7
--- /dev/null
+++ b/firefox-glibc-dynstack.patch
@@ -0,0 +1,64 @@
+diff -ur firefox-90.0.orig/js/xpconnect/src/XPCJSContext.cpp firefox-90.0/js/xpconnect/src/XPCJSContext.cpp
+--- firefox-90.0.orig/js/xpconnect/src/XPCJSContext.cpp	2021-07-05 21:16:02.000000000 +0200
++++ firefox-90.0/js/xpconnect/src/XPCJSContext.cpp	2021-07-19 15:01:24.083460460 +0200
+@@ -85,14 +85,6 @@
+ using namespace xpc;
+ using namespace JS;
+ 
+-// The watchdog thread loop is pretty trivial, and should not require much stack
+-// space to do its job. So only give it 32KiB or the platform minimum.
+-#if !defined(PTHREAD_STACK_MIN)
+-#  define PTHREAD_STACK_MIN 0
+-#endif
+-static constexpr size_t kWatchdogStackSize =
+-    PTHREAD_STACK_MIN < 32 * 1024 ? 32 * 1024 : PTHREAD_STACK_MIN;
+-
+ static void WatchdogMain(void* arg);
+ class Watchdog;
+ class WatchdogManager;
+@@ -163,7 +155,7 @@
+       // watchdog, we need to join it on shutdown.
+       mThread = PR_CreateThread(PR_USER_THREAD, WatchdogMain, this,
+                                 PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
+-                                PR_JOINABLE_THREAD, kWatchdogStackSize);
++                                PR_JOINABLE_THREAD, 0);
+       if (!mThread) {
+         MOZ_CRASH("PR_CreateThread failed!");
+       }
+Only in firefox-90.0/js/xpconnect/src: XPCJSContext.cpp.firefox-glibc-dynstack
+diff -ur firefox-90.0.orig/security/sandbox/linux/launch/SandboxLaunch.cpp firefox-90.0/security/sandbox/linux/launch/SandboxLaunch.cpp
+--- firefox-90.0.orig/security/sandbox/linux/launch/SandboxLaunch.cpp	2021-07-05 18:20:36.000000000 +0200
++++ firefox-90.0/security/sandbox/linux/launch/SandboxLaunch.cpp	2021-07-20 08:39:17.272136982 +0200
+@@ -501,8 +501,7 @@
+ MOZ_NEVER_INLINE MOZ_ASAN_BLACKLIST static pid_t DoClone(int aFlags,
+                                                          jmp_buf* aCtx) {
+   static constexpr size_t kStackAlignment = 16;
+-  uint8_t miniStack[PTHREAD_STACK_MIN]
+-      __attribute__((aligned(kStackAlignment)));
++  uint8_t miniStack[4096] __attribute__((aligned(kStackAlignment)));
+ #ifdef __hppa__
+   void* stackPtr = miniStack;
+ #else
+@@ -523,13 +522,19 @@
+                                CLONE_CHILD_CLEARTID;
+   MOZ_RELEASE_ASSERT((aFlags & kBadFlags) == 0);
+ 
++  // Block signals due to small stack in DoClone.
++  sigset_t oldSigs;
++  BlockAllSignals(&oldSigs);
++
++  int ret = 0;
+   jmp_buf ctx;
+   if (setjmp(ctx) == 0) {
+     // In the parent and just called setjmp:
+-    return DoClone(aFlags | SIGCHLD, &ctx);
++    ret = DoClone(aFlags | SIGCHLD, &ctx);
+   }
++  RestoreSignals(&oldSigs);
+   // In the child and have longjmp'ed:
+-  return 0;
++  return ret;
+ }
+ 
+ static bool WriteStringToFile(const char* aPath, const char* aStr,
+Only in firefox-90.0/security/sandbox/linux/launch: SandboxLaunch.cpp~
diff --git a/firefox.spec b/firefox.spec
index 52f7457..bd4b2c2 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -1,5 +1,6 @@
 # Current OMV debug implementation is a crap IMO (angry.p)
 %define _empty_manifest_terminate_build 0
+
 #
 # WARNING, READ FIRST:
 #
@@ -38,7 +39,7 @@
 
 %define update_channel release
 
-%define xpidir http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/linux-x86_64/xpi/
+%define xpidir https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}%{?beta:%{beta}}/linux-x86_64/xpi/
 
 # Supported l10n language lists
 %define langlist af ar ast bg bn br bs ca cs cy da de el en_GB eo es_AR es_CL es_ES es_MX et eu fa fi fr fy ga_IE gd gl gu_IN he hi hr hu hy id is it ja kk ko km kn lt lv mk mr nb_NO nl nn_NO pa_IN pl pt_BR pt_PT ro ru si sk sl sq sr sv_SE ta te th tr uk vi zh_CN zh_TW
@@ -217,21 +218,19 @@
 # Locales
 %{expand:%(for lang in %{langlist}; do echo "%%global locale_$lang $(echo $lang | cut -d _ -f 1) "; done)}
 
+#define beta b4
+
 Summary:	Next generation web browser
 Name:		firefox
 Epoch:		0
 # IMPORTANT: When updating, you MUST also update the l10n files by running
 # download.sh after editing the version number
-Version:	90.0.2
-Release:	1
+Version:	92.0
+Release:	%{?beta:0.%{beta}.}1
 License:	MPLv1+
 Group:		Networking/WWW
 Url:		http://www.mozilla.com/firefox/
-%if 0%{?prel}
-Source0:	http://ftp.mozilla.org/pub/%{name}/releases/%{version}/source/%{name}-%{version}%{prel}.source.tar.xz
-%else
-Source0:	http://ftp.mozilla.org/pub/%{name}/releases/%{version}/source/%{name}-%{version}.source.tar.xz
-%endif
+Source0:	http://ftp.mozilla.org/pub/%{name}/releases/%{version}%{?beta:%{beta}}/source/%{name}-%{version}%{?beta:%{beta}}.source.tar.xz
 Source4:	%{name}.desktop
 Source5:	firefox-searchengines-jamendo.xml
 Source6:	firefox-searchengines-exalead.xml
@@ -263,6 +262,7 @@ Source100:      firefox.rpmlintrc
 
 Patch14:	build-aarch64-skia.patch
 Patch15:	build-arm-libopus.patch
+Patch17:	firefox-91-buildfixes.patch
 
 Patch44:	https://src.fedoraproject.org/rpms/firefox/raw/master/f/build-disable-elfhack.patch
 
@@ -284,8 +284,6 @@ BuildRequires:	pkgconfig(dbus-glib-1)
 BuildRequires:	pkgconfig(glib-2.0)
 BuildRequires:	pkgconfig(gl)
 BuildRequires:	pkgconfig(libdrm)
-BuildRequires:	pkgconfig(gstreamer-plugins-base-1.0)
-BuildRequires:	pkgconfig(gtk+-2.0)
 BuildRequires:	pkgconfig(gtk+-3.0)
 BuildRequires:	pkgconfig(icu-i18n)
 BuildRequires:	pkgconfig(hunspell)
@@ -297,8 +295,8 @@ BuildRequires:	pkgconfig(libpng) >= 1.6.34
 BuildRequires:	pkgconfig(libproxy-1.0)
 BuildRequires:	pkgconfig(libpulse)
 BuildRequires:	pkgconfig(libstartup-notification-1.0)
-BuildRequires:	pkgconfig(nspr) >= 4.26.0
-BuildRequires:	pkgconfig(nss) >= 3.64
+BuildRequires:	pkgconfig(nspr) >= 4.32.0
+BuildRequires:	pkgconfig(nss) >= 3.69
 BuildRequires:	pkgconfig(ogg)
 BuildRequires:	pkgconfig(opus)
 BuildRequires:	pkgconfig(libpulse)
@@ -314,6 +312,7 @@ BuildRequires:	cbindgen >= 0.19.0
 BuildRequires:	nss-static-devel
 BuildRequires:	clang-devel
 BuildRequires:	llvm-devel
+BuildRequires:	stdc++-static-devel
 %ifnarch %mips
 BuildRequires:	valgrind
 BuildRequires:	pkgconfig(valgrind)
@@ -334,11 +333,6 @@ Requires:	xdg-utils
 Suggests:	%{_lib}canberra0
 Suggests:	%{_lib}cups2
 
-%if 0%{?prel}
-Provides:	%{name} = %{epoch}:%{version}-0.%{prel}
-%else
-Provides:	%{name} = %{epoch}:%{version}
-%endif
 Provides:	mozilla-firefox = %{epoch}:%{version}-%{release}
 Provides:	webclient
 
@@ -384,6 +378,12 @@ Files and macros mainly for building Firefox extensions.
 %prep
 %autosetup -p1
 
+# We trust our toolchain. More than we trust hardcodes copied from
+# whatever someone found on a prehistoric brokenbuntu box.
+for i in security/sandbox/chromium/sandbox/linux/system_headers/*_linux_syscalls.h; do
+	echo '#include <asm/unistd.h>' >$i
+done
+
 echo -n "%google_api_key" > google-api-key
 echo -n "%google_default_client_id %google_default_client_secret" > google-oauth-api-key
 echo -n "%mozilla_api_key" > mozilla-api-key
@@ -435,11 +435,7 @@ ac_add_options --with-system-jpeg
 ac_add_options --with-system-png
 ac_add_options --enable-jemalloc
 ac_add_options --enable-replace-malloc
-#ac_add_options --with-system-ply
 ac_add_options --disable-crashreporter
-#ac_add_options --enable-gstreamer=1.0
-#ac_add_options --enable-media-plugins
-#ac_add_options --enable-dash
 ac_add_options --enable-pulseaudio
 ac_add_options --enable-webrtc
 ac_add_options --enable-system-ffi
@@ -451,9 +447,6 @@ ac_add_options --disable-webrtc
 %ifnarch %mips
 ac_add_options --with-valgrind
 %endif
-%ifarch %{x86_64} aarch64
-#ac_add_options --enable-rust-simd
-%endif
 %ifnarch aarch64
 ac_add_options --disable-elf-hack
 %endif
@@ -482,7 +475,7 @@ export CC=gcc
 # avoid oom with rust
 export RUSTFLAGS="-Cdebuginfo=0"
 %else
-%global optflags %{optflags} -Qunused-arguments
+%global optflags %{optflags} -Qunused-arguments -g0 -fno-lto
 %endif
 
 #(tpg) do not use serverbuild or serverbuild_hardened macros
@@ -502,9 +495,9 @@ export MOZ_LEGACY_PROFILES="1"
 export LDFLAGS="%{build_ldflags}"
 
 %if %{with pgo}
-GDK_BACKEND=x11 xvfb-run ./mach build  2>&1 | cat -
+GDK_BACKEND=x11 xvfb-run ./mach build -v  2>&1 | cat -
 %else
-./mach build
+./mach build -v
 %endif
 
 %install
@@ -596,7 +589,7 @@ cat <<FIN >%{buildroot}%{_sys_macros_dir}/%{name}.macros
 # Macros from %{name} package
 %%firefox_major              %{version}
 %%firefox_epoch              %{epoch}
-%%firefox_version            %{version}%{?prel:-0.%{prel}}
+%%firefox_version            %{version}%{?beta:-0.%{beta}}
 %%firefox_mozillapath        %{mozillalibdir}
 %%firefox_pluginsdir         %{pluginsdir}
 %%firefox_appid              \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}