mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 03:17:13 +00:00
055759d27a
emu-compatibility.com is now defunct and thus should not be in About menu. Other minor changes: * linkage-rwx-linux-elf.diff -> linkage-rwx-linux-elf.patch * Mark some inputs as optional * Do not build with Doxygen by default: it does not produce any outputs * Do not build with OpenAL by default: SDL2 handles sound when present * Do not build with FreeGLUT by default: deprecated at upstream
21 lines
700 B
Diff
21 lines
700 B
Diff
--- a/src/sh2_dynarec/linkage_x64.s 2013-03-11 20:29:53.112870900 +0100
|
|
+++ b/src/sh2_dynarec/linkage_x64.s 2013-03-11 20:31:48.856778600 +0100
|
|
@@ -747,3 +747,7 @@ breakpoint:
|
|
ret
|
|
/* Set breakpoint here for debugging */
|
|
.size breakpoint, .-breakpoint
|
|
+
|
|
+#if defined(__linux__) && defined(__ELF__)
|
|
+.section .note.GNU-stack,"",%progbits
|
|
+#endif
|
|
--- a/src/sh2_dynarec/linkage_x86.s 2013-03-11 20:30:08.157693100 +0100
|
|
+++ b/src/sh2_dynarec/linkage_x86.s 2013-03-11 20:32:30.993310600 +0100
|
|
@@ -743,3 +743,7 @@ breakpoint:
|
|
ret
|
|
/* Set breakpoint here for debugging */
|
|
.size breakpoint, .-breakpoint
|
|
+
|
|
+#if defined(__linux__) && defined(__ELF__)
|
|
+.section .note.GNU-stack,"",%progbits
|
|
+#endif
|