| 1 |
grobian 12/05/10 09:21:33 |
| 2 |
|
| 3 |
Added: valgrind-3.7.0-non-exec-stack-v2.patch |
| 4 |
Removed: valgrind-3.7.0-non-exec-darwin.patch |
| 5 |
Log: |
| 6 |
Fix OSX support change by actually applying non-exec-darwin.patch, unbreak for Prefix, bug #359993 |
| 7 |
|
| 8 |
(Portage version: 2.2.01.20430-prefix/cvs/SunOS i386) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack-v2.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack-v2.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack-v2.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: valgrind-3.7.0-non-exec-stack-v2.patch |
| 17 |
=================================================================== |
| 18 |
diff -Naur valgrind-3.7.0.orig//coregrind/Makefile.am valgrind-3.7.0/coregrind/Makefile.am |
| 19 |
--- valgrind-3.7.0.orig//coregrind/Makefile.am 2011-11-10 20:02:47.000000000 -0500 |
| 20 |
+++ valgrind-3.7.0/coregrind/Makefile.am 2011-11-10 20:03:00.000000000 -0500 |
| 21 |
@@ -292,14 +292,6 @@ |
| 22 |
m_demangle/demangle.c \ |
| 23 |
m_demangle/dyn-string.c \ |
| 24 |
m_demangle/safe-ctype.c \ |
| 25 |
- m_dispatch/dispatch-x86-linux.S \ |
| 26 |
- m_dispatch/dispatch-amd64-linux.S \ |
| 27 |
- m_dispatch/dispatch-ppc32-linux.S \ |
| 28 |
- m_dispatch/dispatch-ppc64-linux.S \ |
| 29 |
- m_dispatch/dispatch-arm-linux.S \ |
| 30 |
- m_dispatch/dispatch-s390x-linux.S \ |
| 31 |
- m_dispatch/dispatch-x86-darwin.S \ |
| 32 |
- m_dispatch/dispatch-amd64-darwin.S \ |
| 33 |
m_gdbserver/m_gdbserver.c \ |
| 34 |
m_gdbserver/inferiors.c \ |
| 35 |
m_gdbserver/m_gdbserver.c \ |
| 36 |
@@ -322,8 +314,6 @@ |
| 37 |
m_initimg/initimg-pathscan.c \ |
| 38 |
m_mach/mach_basics.c \ |
| 39 |
m_mach/mach_msg.c \ |
| 40 |
- m_mach/mach_traps-x86-darwin.S \ |
| 41 |
- m_mach/mach_traps-amd64-darwin.S \ |
| 42 |
m_replacemalloc/replacemalloc_core.c \ |
| 43 |
m_scheduler/scheduler.c \ |
| 44 |
m_scheduler/sema.c \ |
| 45 |
@@ -335,14 +325,6 @@ |
| 46 |
m_sigframe/sigframe-s390x-linux.c \ |
| 47 |
m_sigframe/sigframe-x86-darwin.c \ |
| 48 |
m_sigframe/sigframe-amd64-darwin.c \ |
| 49 |
- m_syswrap/syscall-x86-linux.S \ |
| 50 |
- m_syswrap/syscall-amd64-linux.S \ |
| 51 |
- m_syswrap/syscall-ppc32-linux.S \ |
| 52 |
- m_syswrap/syscall-ppc64-linux.S \ |
| 53 |
- m_syswrap/syscall-arm-linux.S \ |
| 54 |
- m_syswrap/syscall-s390x-linux.S \ |
| 55 |
- m_syswrap/syscall-x86-darwin.S \ |
| 56 |
- m_syswrap/syscall-amd64-darwin.S \ |
| 57 |
m_syswrap/syswrap-main.c \ |
| 58 |
m_syswrap/syswrap-generic.c \ |
| 59 |
m_syswrap/syswrap-linux.c \ |
| 60 |
@@ -361,6 +343,29 @@ |
| 61 |
m_ume/main.c \ |
| 62 |
m_ume/script.c |
| 63 |
|
| 64 |
+COREGRIND_SOURCES_COMMON += \ |
| 65 |
+ m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S \ |
| 66 |
+ m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S |
| 67 |
+ |
| 68 |
+if VGCONF_HAVE_PLATFORM_SEC |
| 69 |
+COREGRIND_SOURCES_COMMON += \ |
| 70 |
+ m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S \ |
| 71 |
+ m_syswrap/syscall-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S |
| 72 |
+endif |
| 73 |
+ |
| 74 |
+if VGCONF_OS_IS_DARWIN |
| 75 |
+COREGRIND_SOURCES_COMMON += \ |
| 76 |
+ m_dispatch/dispatch-@VGCONF_ARCH_PRI@-darwin.S \ |
| 77 |
+ m_syswrap/syscall-@VGCONF_ARCH_PRI@-darwin.S \ |
| 78 |
+ m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S |
| 79 |
+if VGCONF_HAVE_PLATFORM_SEC |
| 80 |
+COREGRIND_SOURCES_COMMON += \ |
| 81 |
+ m_dispatch/dispatch-@VGCONF_ARCH_SEC@-darwin.S \ |
| 82 |
+ m_syswrap/syscall-@VGCONF_ARCH_SEC@-darwin.S \ |
| 83 |
+ m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S |
| 84 |
+endif |
| 85 |
+endif |
| 86 |
+ |
| 87 |
libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \ |
| 88 |
$(COREGRIND_SOURCES_COMMON) |
| 89 |
nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \ |
| 90 |
diff -Naur valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.7.0/coregrind/m_dispatch/dispatch-amd64-linux.S |
| 91 |
--- valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-amd64-linux.S 2011-10-26 17:24:42.000000000 -0400 |
| 92 |
+++ valgrind-3.7.0/coregrind/m_dispatch/dispatch-amd64-linux.S 2011-11-10 20:07:40.000000000 -0500 |
| 93 |
@@ -349,11 +349,11 @@ |
| 94 |
ret |
| 95 |
.size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation) |
| 96 |
|
| 97 |
+#endif // defined(VGP_amd64_linux) |
| 98 |
+ |
| 99 |
/* Let the linker know we don't need an executable stack */ |
| 100 |
.section .note.GNU-stack,"",@progbits |
| 101 |
|
| 102 |
-#endif // defined(VGP_amd64_linux) |
| 103 |
- |
| 104 |
/*--------------------------------------------------------------------*/ |
| 105 |
/*--- end ---*/ |
| 106 |
/*--------------------------------------------------------------------*/ |
| 107 |
diff -Naur valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.7.0/coregrind/m_dispatch/dispatch-x86-linux.S |
| 108 |
--- valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-x86-linux.S 2011-10-26 17:24:42.000000000 -0400 |
| 109 |
+++ valgrind-3.7.0/coregrind/m_dispatch/dispatch-x86-linux.S 2011-11-10 20:04:07.000000000 -0500 |
| 110 |
@@ -320,12 +320,11 @@ |
| 111 |
ret |
| 112 |
.size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation) |
| 113 |
|
| 114 |
- |
| 115 |
+#endif // defined(VGP_x86_linux) |
| 116 |
+ |
| 117 |
/* Let the linker know we don't need an executable stack */ |
| 118 |
.section .note.GNU-stack,"",@progbits |
| 119 |
|
| 120 |
-#endif // defined(VGP_x86_linux) |
| 121 |
- |
| 122 |
/*--------------------------------------------------------------------*/ |
| 123 |
/*--- end ---*/ |
| 124 |
/*--------------------------------------------------------------------*/ |
| 125 |
diff -Naur valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.7.0/coregrind/m_syswrap/syscall-amd64-linux.S |
| 126 |
--- valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-amd64-linux.S 2011-11-10 20:02:47.000000000 -0500 |
| 127 |
+++ valgrind-3.7.0/coregrind/m_syswrap/syscall-amd64-linux.S 2011-11-10 20:03:00.000000000 -0500 |
| 128 |
@@ -205,11 +205,11 @@ |
| 129 |
ML_(blksys_finished): .quad 5b |
| 130 |
.previous |
| 131 |
|
| 132 |
+#endif // defined(VGP_amd64_linux) |
| 133 |
+ |
| 134 |
/* Let the linker know we don't need an executable stack */ |
| 135 |
.section .note.GNU-stack,"",@progbits |
| 136 |
|
| 137 |
-#endif // defined(VGP_amd64_linux) |
| 138 |
- |
| 139 |
/*--------------------------------------------------------------------*/ |
| 140 |
/*--- end ---*/ |
| 141 |
/*--------------------------------------------------------------------*/ |
| 142 |
diff -Naur valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.7.0/coregrind/m_syswrap/syscall-x86-linux.S |
| 143 |
--- valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-x86-linux.S 2011-11-10 20:02:47.000000000 -0500 |
| 144 |
+++ valgrind-3.7.0/coregrind/m_syswrap/syscall-x86-linux.S 2011-11-10 20:03:00.000000000 -0500 |
| 145 |
@@ -164,12 +164,12 @@ |
| 146 |
ML_(blksys_committed): .long 4b |
| 147 |
ML_(blksys_finished): .long 5b |
| 148 |
.previous |
| 149 |
- |
| 150 |
-/* Let the linker know we don't need an executable stack */ |
| 151 |
-.section .note.GNU-stack,"",@progbits |
| 152 |
|
| 153 |
#endif // defined(VGP_x86_linux) |
| 154 |
|
| 155 |
+/* Let the linker know we don't need an executable stack */ |
| 156 |
+.section .note.GNU-stack,"",@progbits |
| 157 |
+ |
| 158 |
/*--------------------------------------------------------------------*/ |
| 159 |
/*--- end ---*/ |
| 160 |
/*--------------------------------------------------------------------*/ |
Archives