From 0eebc9a7658979f9ce6559c3956212f664e41735 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Mon, 13 Apr 2020 19:19:37 +0000
Subject: Newer GCC and clang decided that global asm shouldn't be volatile.

---
 lang/spidermonkey185/distinfo                      |   3 +-
 .../patches/patch-methodjit_MethodJIT.cpp          | 123 +++++++++++++++++++++
 2 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 lang/spidermonkey185/patches/patch-methodjit_MethodJIT.cpp

(limited to 'lang/spidermonkey185')

diff --git a/lang/spidermonkey185/distinfo b/lang/spidermonkey185/distinfo
index 8ff5949fe81..c4b8f925866 100644
--- a/lang/spidermonkey185/distinfo
+++ b/lang/spidermonkey185/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2018/05/02 12:42:50 jperkin Exp $
+$NetBSD: distinfo,v 1.6 2020/04/13 19:19:37 joerg Exp $
 
 SHA1 (js185-1.0.0.tar.gz) = 52a01449c48d7a117b35f213d3e4263578d846d6
 RMD160 (js185-1.0.0.tar.gz) = 23e6ddc81d5b63e015aecc1a104b2d3d3ced5005
@@ -19,6 +19,7 @@ SHA1 (patch-jsstr.h) = 0d23725326ab5432bebe63d4775911bc2c74039b
 SHA1 (patch-jsstrinlines.h) = 34b465a4fb504973f65395ccd2819a29ce16c5da
 SHA1 (patch-jstracer.cpp) = 5b0b4d7709b446d1471b593e2c338f48d9fa4eec
 SHA1 (patch-jstracer.h) = 4f0bd2f958d1bedb76b6ac54e218e1fde846ad6d
+SHA1 (patch-methodjit_MethodJIT.cpp) = 2645e1b5d7c4bb21ad8813f84799a79e074a8358
 SHA1 (patch-tracejit_Writer.cpp) = fdd2751e411e933fcb22736b65ea3c93c2cecda1
 SHA1 (patch-v8-dtoa_platform.cc) = 24670e996fcc7ca0d1e7b1b3765a67ac05e9a661
 SHA1 (patch-v8-dtoa_platform.h) = 1d618d8f51e3ee169606297950d3030fcf72abbc
diff --git a/lang/spidermonkey185/patches/patch-methodjit_MethodJIT.cpp b/lang/spidermonkey185/patches/patch-methodjit_MethodJIT.cpp
new file mode 100644
index 00000000000..0dbbdaf1fed
--- /dev/null
+++ b/lang/spidermonkey185/patches/patch-methodjit_MethodJIT.cpp
@@ -0,0 +1,123 @@
+$NetBSD: patch-methodjit_MethodJIT.cpp,v 1.1 2020/04/13 19:19:37 joerg Exp $
+
+Global "asm volatile" is considered a mistake now.
+
+--- methodjit/MethodJIT.cpp.orig	2020-04-12 22:33:42.079089372 +0000
++++ methodjit/MethodJIT.cpp
+@@ -189,7 +189,7 @@ JS_STATIC_ASSERT(offsetof(VMFrame, regs.
+ JS_STATIC_ASSERT(JSVAL_TAG_MASK == 0xFFFF800000000000LL);
+ JS_STATIC_ASSERT(JSVAL_PAYLOAD_MASK == 0x00007FFFFFFFFFFFLL);
+ 
+-asm volatile (
++asm (
+ ".text\n"
+ ".globl " SYMBOL_STRING(JaegerTrampoline) "\n"
+ SYMBOL_STRING(JaegerTrampoline) ":"       "\n"
+@@ -236,7 +236,7 @@ SYMBOL_STRING(JaegerTrampoline) ":"     
+     "jmp *0(%rsp)"                      "\n"
+ );
+ 
+-asm volatile (
++asm (
+ ".text\n"
+ ".globl " SYMBOL_STRING(JaegerTrampolineReturn) "\n"
+ SYMBOL_STRING(JaegerTrampolineReturn) ":"       "\n"
+@@ -256,7 +256,7 @@ SYMBOL_STRING(JaegerTrampolineReturn) ":
+     "ret"                                "\n"
+ );
+ 
+-asm volatile (
++asm (
+ ".text\n"
+ ".globl " SYMBOL_STRING(JaegerThrowpoline)  "\n"
+ SYMBOL_STRING(JaegerThrowpoline) ":"        "\n"
+@@ -281,7 +281,7 @@ SYMBOL_STRING(JaegerThrowpoline) ":"    
+ 
+ JS_STATIC_ASSERT(offsetof(VMFrame, regs.fp) == 0x38);
+ 
+-asm volatile (
++asm (
+ ".text\n"
+ ".globl " SYMBOL_STRING(InjectJaegerReturn)   "\n"
+ SYMBOL_STRING(InjectJaegerReturn) ":"         "\n"
+@@ -309,7 +309,7 @@ SYMBOL_STRING(InjectJaegerReturn) ":"   
+ JS_STATIC_ASSERT(offsetof(VMFrame, savedEBX) == 0x2c);
+ JS_STATIC_ASSERT(offsetof(VMFrame, regs.fp) == 0x1C);
+ 
+-asm volatile (
++asm (
+ ".text\n"
+ ".globl " SYMBOL_STRING(JaegerTrampoline) "\n"
+ SYMBOL_STRING(JaegerTrampoline) ":"       "\n"
+@@ -339,7 +339,7 @@ SYMBOL_STRING(JaegerTrampoline) ":"     
+     "jmp *16(%ebp)"                      "\n"
+ );
+ 
+-asm volatile (
++asm (
+ ".text\n"
+ ".globl " SYMBOL_STRING(JaegerTrampolineReturn) "\n"
+ SYMBOL_STRING(JaegerTrampolineReturn) ":" "\n"
+@@ -357,7 +357,7 @@ SYMBOL_STRING(JaegerTrampolineReturn) ":
+     "ret"                                "\n"
+ );
+ 
+-asm volatile (
++asm (
+ ".text\n"
+ ".globl " SYMBOL_STRING(JaegerThrowpoline)  "\n"
+ SYMBOL_STRING(JaegerThrowpoline) ":"        "\n"
+@@ -388,7 +388,7 @@ SYMBOL_STRING(JaegerThrowpoline) ":"    
+ 
+ JS_STATIC_ASSERT(offsetof(VMFrame, regs.fp) == 0x1C);
+ 
+-asm volatile (
++asm (
+ ".text\n"
+ ".globl " SYMBOL_STRING(InjectJaegerReturn)   "\n"
+ SYMBOL_STRING(InjectJaegerReturn) ":"         "\n"
+@@ -423,7 +423,7 @@ JS_STATIC_ASSERT(JSReturnReg_Type == JSC
+ #define FUNCTION_HEADER_EXTRA
+ #endif
+ 
+-asm volatile (
++asm (
+ ".text\n"
+ FUNCTION_HEADER_EXTRA
+ ".globl " SYMBOL_STRING(InjectJaegerReturn) "\n"
+@@ -436,7 +436,7 @@ SYMBOL_STRING(InjectJaegerReturn) ":"   
+     "bx  lr"                                "\n"
+ );
+ 
+-asm volatile (
++asm (
+ ".text\n"
+ FUNCTION_HEADER_EXTRA
+ ".globl " SYMBOL_STRING(JaegerTrampoline)   "\n"
+@@ -495,7 +495,7 @@ SYMBOL_STRING(JaegerTrampoline) ":"     
+ "   bx     r4"                                  "\n"
+ );
+ 
+-asm volatile (
++asm (
+ ".text\n"
+ FUNCTION_HEADER_EXTRA
+ ".globl " SYMBOL_STRING(JaegerTrampolineReturn)   "\n"
+@@ -515,7 +515,7 @@ SYMBOL_STRING(JaegerTrampolineReturn) ":
+ "   pop     {r4-r11,pc}"                    "\n"
+ );
+ 
+-asm volatile (
++asm (
+ ".text\n"
+ FUNCTION_HEADER_EXTRA
+ ".globl " SYMBOL_STRING(JaegerThrowpoline)  "\n"
+@@ -540,7 +540,7 @@ SYMBOL_STRING(JaegerThrowpoline) ":"    
+ "   pop     {r4-r11,pc}"                    "\n"
+ );
+ 
+-asm volatile (
++asm (
+ ".text\n"
+ FUNCTION_HEADER_EXTRA
+ ".globl " SYMBOL_STRING(JaegerStubVeneer)   "\n"
-- 
cgit v1.2.3