1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
|
#Fix executable stack QA warning, and patch CMakeLists.txt to still recognise the patched source file
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -567,13 +567,13 @@
src/core/libraries/usbd/emulated/skylander.h
)
-set(FIBER_LIB src/core/libraries/fiber/fiber_context.s
+set(FIBER_LIB src/core/libraries/fiber/fiber_context.S
src/core/libraries/fiber/fiber.cpp
src/core/libraries/fiber/fiber.h
src/core/libraries/fiber/fiber_error.h
)
-set_source_files_properties(src/core/libraries/fiber/fiber_context.s PROPERTIES COMPILE_OPTIONS -Wno-unused-command-line-argument)
+set_source_files_properties(src/core/libraries/fiber/fiber_context.S PROPERTIES COMPILE_OPTIONS -Wno-unused-command-line-argument)
set(VDEC_LIB src/core/libraries/videodec/videodec2_impl.cpp
src/core/libraries/videodec/videodec2_impl.h
--- a/src/core/libraries/fiber/fiber_context.s
+++ b/src/core/libraries/fiber/fiber_context.s
@@ -119,3 +119,7 @@
movl $1, %edi
call _sceFiberForceQuit
ret
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
--- a/externals/libressl/crypto/sha/sha1_amd64_generic.S
+++ b/externals/libressl/crypto/sha/sha1_amd64_generic.S
@@ -308,3 +308,7 @@
popq %rbx
ret
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
--- a/externals/libressl/crypto/sha/sha1_amd64_shani.S
+++ b/externals/libressl/crypto/sha/sha1_amd64_shani.S
@@ -164,3 +164,7 @@
shufmask:
.octa 0x000102030405060708090a0b0c0d0e0f
.size shufmask,.-shufmask
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
--- a/externals/libressl/crypto/sha/sha256_amd64_generic.S
+++ b/externals/libressl/crypto/sha/sha256_amd64_generic.S
@@ -297,3 +297,7 @@
.long 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208
.long 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
.size K256,.-K256
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
--- a/externals/libressl/crypto/sha/sha256_amd64_shani.S
+++ b/externals/libressl/crypto/sha/sha256_amd64_shani.S
@@ -203,3 +203,7 @@
.long 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208
.long 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
.size K256,.-K256
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
--- a/externals/libressl/crypto/sha/sha512_amd64_generic.S
+++ b/externals/libressl/crypto/sha/sha512_amd64_generic.S
@@ -302,3 +302,7 @@
.quad 0x28db77f523047d84, 0x32caab7b40c72493, 0x3c9ebe0a15c9bebc, 0x431d67c49c100d4c
.quad 0x4cc5d4becb3e42b6, 0x597f299cfc657e2a, 0x5fcb6fab3ad6faec, 0x6c44198c4a475817
.size K512,.-K512
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
--- a/src/core/libraries/kernel/threads/stack.S
+++ b/src/core/libraries/kernel/threads/stack.S
@@ -35,3 +35,7 @@
popq %r13
popq %r12
ret
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
|
