summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-05-27 17:54:50 +0200
committerGitHub <noreply@github.com>2018-05-27 17:54:50 +0200
commit7840c750dbfd3f1b2ab3b4f0db561cafdc7dcfe2 (patch)
tree3c40aedae6cb2551066b406cec3559dc1a488baf /application
parenta65c26ccf590103a07174d9722ef86bcaac877a6 (diff)
parent3c3c85983f96ed48fb6a2c16df712dd229c1f358 (diff)
downloadUXP-7840c750dbfd3f1b2ab3b4f0db561cafdc7dcfe2.tar
UXP-7840c750dbfd3f1b2ab3b4f0db561cafdc7dcfe2.tar.gz
UXP-7840c750dbfd3f1b2ab3b4f0db561cafdc7dcfe2.tar.lz
UXP-7840c750dbfd3f1b2ab3b4f0db561cafdc7dcfe2.tar.xz
UXP-7840c750dbfd3f1b2ab3b4f0db561cafdc7dcfe2.zip
Merge pull request #395 from trav90/buildsystem-work
Always build with SSE2 support & display an error if not available
Diffstat (limited to 'application')
-rw-r--r--application/palemoon/app/Makefile.in8
-rw-r--r--application/palemoon/app/moz.build3
-rw-r--r--application/palemoon/app/nsBrowserApp.cpp45
-rw-r--r--application/palemoon/confvars.sh5
4 files changed, 61 insertions, 0 deletions
diff --git a/application/palemoon/app/Makefile.in b/application/palemoon/app/Makefile.in
index c0f01212c..94f4dc1f3 100644
--- a/application/palemoon/app/Makefile.in
+++ b/application/palemoon/app/Makefile.in
@@ -33,6 +33,14 @@ NSDISTMODE = copy
include $(topsrcdir)/config/config.mk
+# If we are trying to show an error dialog about the lack of SSE2 support,
+# make sure that code itself doesn't use SSE2.
+ifdef MOZ_LINUX_SSE2_STARTUP_ERROR
+CXXFLAGS := $(filter-out -march=% -msse2 -mfpmath=sse,$(CXXFLAGS))
+CXX := $(filter-out -march=% -msse2 -mfpmath=sse,$(CXX))
+CXXFLAGS += -msse -mno-sse2 -mfpmath=387
+endif
+
ifeq ($(OS_ARCH),WINNT)
# Rebuild firefox.exe if the manifest changes - it's included by splash.rc.
# (this dependency should really be just for firefox.exe, not other targets)
diff --git a/application/palemoon/app/moz.build b/application/palemoon/app/moz.build
index 8b358b622..044c3e2d1 100644
--- a/application/palemoon/app/moz.build
+++ b/application/palemoon/app/moz.build
@@ -68,3 +68,6 @@ if CONFIG['MOZ_LINKER']:
if CONFIG['HAVE_CLOCK_MONOTONIC']:
OS_LIBS += CONFIG['REALTIME_LIBS']
+
+if CONFIG['MOZ_LINUX_SSE2_STARTUP_ERROR']:
+ DEFINES['MOZ_LINUX_SSE2_STARTUP_ERROR'] = True
diff --git a/application/palemoon/app/nsBrowserApp.cpp b/application/palemoon/app/nsBrowserApp.cpp
index 8b0613528..c73b05d23 100644
--- a/application/palemoon/app/nsBrowserApp.cpp
+++ b/application/palemoon/app/nsBrowserApp.cpp
@@ -35,6 +35,51 @@
#include "mozilla/Telemetry.h"
#include "mozilla/WindowsDllBlocklist.h"
+#ifdef MOZ_LINUX_SSE2_STARTUP_ERROR
+#include <cpuid.h>
+#include "mozilla/Unused.h"
+
+static bool
+IsSSE2Available()
+{
+ // The rest of the app has been compiled to assume that SSE2 is present
+ // unconditionally, so we can't use the normal copy of SSE.cpp here.
+ // Since SSE.cpp caches the results and we need them only transiently,
+ // instead of #including SSE.cpp here, let's just inline the specific check
+ // that's needed.
+ unsigned int level = 1u;
+ unsigned int eax, ebx, ecx, edx;
+ unsigned int bits = (1u<<26);
+ unsigned int max = __get_cpuid_max(0, nullptr);
+ if (level > max) {
+ return false;
+ }
+ __cpuid_count(level, 0, eax, ebx, ecx, edx);
+ return (edx & bits) == bits;
+}
+
+static const char sSSE2Message[] =
+ "This browser version requires a processor with the SSE2 instruction "
+ "set extension.\n";
+
+__attribute__((constructor))
+static void
+SSE2Check()
+{
+ if (IsSSE2Available()) {
+ return;
+ }
+ // Using write() in order to avoid jemalloc-based buffering. Ignoring return
+ // values, since there isn't much we could do on failure and there is no
+ // point in trying to recover from errors.
+ MOZ_UNUSED(write(STDERR_FILENO,
+ sSSE2Message,
+ MOZ_ARRAY_LENGTH(sSSE2Message) - 1));
+ // _exit() instead of exit() to avoid running the usual "at exit" code.
+ _exit(255);
+}
+#endif
+
#if !defined(MOZ_WIDGET_COCOA) && !defined(MOZ_WIDGET_ANDROID)
#define MOZ_BROWSER_CAN_BE_CONTENTPROC
#include "../../ipc/contentproc/plugin-container.cpp"
diff --git a/application/palemoon/confvars.sh b/application/palemoon/confvars.sh
index 5109c0829..d1d2ce065 100644
--- a/application/palemoon/confvars.sh
+++ b/application/palemoon/confvars.sh
@@ -98,6 +98,11 @@ if test "$OS_ARCH" = "WINNT" -o \
MOZ_BUNDLED_FONTS=1
fi
+# Display an error on non-SSE2 Linux systems
+if test "$OS_ARCH" = "Linux"; then
+ MOZ_LINUX_SSE2_STARTUP_ERROR=1
+fi
+
# Short-circuit a few services to be removed
MOZ_MAINTENANCE_SERVICE=
MOZ_SERVICES_HEALTHREPORT=