components/desktop/firefox/patches/firefox-38-sparc-align.patch
author Jingning Ji <jingning.ji@oracle.com>
Fri, 16 Sep 2016 16:06:45 -0700
changeset 6919 7972aae0fb03
parent 5527 611b2d6efdfe
permissions -rw-r--r--
24508672 Upgrade Firefox to version 45.1.1 ESR
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5255
cea0e462549a 22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     1
Adds asm("ta 6") which suppresses bus error caused by misalignment.
cea0e462549a 22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     2
5527
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
     3
diff --git a/js/xpconnect/src/XPCShellImpl.cpp b/js/xpconnect/src/XPCShellImpl.cpp
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
     4
--- a/js/xpconnect/src/XPCShellImpl.cpp
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
     5
+++ b/js/xpconnect/src/XPCShellImpl.cpp
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
     6
@@ -1320,16 +1320,22 @@ GetCurrentWorkingDirectory(nsAString& wo
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
     7
     return true;
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
     8
 }
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
     9
 
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    10
 static JSSecurityCallbacks shellSecurityCallbacks;
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    11
 
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    12
 int
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    13
 XRE_XPCShellMain(int argc, char** argv, char** envp)
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    14
 {
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    15
+
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    16
+#if defined (__GNUC__) && (defined(__sparc) || defined(__sparc__))
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    17
+    // make unaligned memory access no crash
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    18
+    asm ( "ta 6" );
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    19
+#endif
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    20
+
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    21
     JSRuntime* rt;
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    22
     JSContext* cx;
6919
7972aae0fb03 24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents: 5527
diff changeset
    23
     int result = 0;
5527
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    24
     nsresult rv;
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    25
 
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    26
     gErrFile = stderr;
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    27
     gOutFile = stdout;
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    28
     gInFile = stdin;
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    29
diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    30
--- a/memory/mozjemalloc/jemalloc.c
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    31
+++ b/memory/mozjemalloc/jemalloc.c
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    32
@@ -5551,16 +5551,22 @@ malloc_init(void)
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    33
 #endif
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    34
 
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    35
 #if !defined(MOZ_MEMORY_WINDOWS)
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    36
 static
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    37
 #endif
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    38
 bool
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    39
 malloc_init_hard(void)
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    40
 {
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    41
+
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    42
+#if defined (__GNUC__) && (defined(__sparc) || defined(__sparc__))
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    43
+    // make unaligned memory access no crash
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    44
+    asm ( "ta 6" );
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    45
+#endif
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    46
+
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    47
 	unsigned i;
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    48
 	char buf[PATH_MAX + 1];
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    49
 	const char *opts;
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    50
 	long result;
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    51
 #ifndef MOZ_MEMORY_WINDOWS
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    52
 	int linklen;
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    53
 #endif
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    54
 #ifdef MOZ_MEMORY_DARWIN
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    55
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    56
--- a/toolkit/xre/nsAppRunner.cpp
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    57
+++ b/toolkit/xre/nsAppRunner.cpp
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    58
@@ -4255,6 +4255,11 @@
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    59
 int
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    60
 XREMain::XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    61
 {
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    62
+#if defined (__GNUC__) && (defined(__sparc) || defined(__sparc__))
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    63
+    // make unaligned memory access no crash
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    64
+    asm ( "ta 6" );
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    65
+#endif
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    66
+
6919
7972aae0fb03 24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents: 5527
diff changeset
    67
   ScopedLogging log;
5527
611b2d6efdfe 21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents: 5255
diff changeset
    68
 
6919
7972aae0fb03 24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents: 5527
diff changeset
    69
 #if defined(MOZ_SANDBOX) && defined(XP_LINUX) && !defined(ANDROID)