/[gentoo-x86]/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack-v2.patch
Gentoo

Contents of /dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack-v2.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Thu May 10 09:21:33 2012 UTC (2 years, 7 months ago) by grobian
Branch: MAIN
CVS Tags: HEAD
Fix OSX support change by actually applying non-exec-darwin.patch, unbreak for Prefix, bug #359993

(Portage version: 2.2.01.20430-prefix/cvs/SunOS i386)

1 diff -Naur valgrind-3.7.0.orig//coregrind/Makefile.am valgrind-3.7.0/coregrind/Makefile.am
2 --- valgrind-3.7.0.orig//coregrind/Makefile.am 2011-11-10 20:02:47.000000000 -0500
3 +++ valgrind-3.7.0/coregrind/Makefile.am 2011-11-10 20:03:00.000000000 -0500
4 @@ -292,14 +292,6 @@
5 m_demangle/demangle.c \
6 m_demangle/dyn-string.c \
7 m_demangle/safe-ctype.c \
8 - m_dispatch/dispatch-x86-linux.S \
9 - m_dispatch/dispatch-amd64-linux.S \
10 - m_dispatch/dispatch-ppc32-linux.S \
11 - m_dispatch/dispatch-ppc64-linux.S \
12 - m_dispatch/dispatch-arm-linux.S \
13 - m_dispatch/dispatch-s390x-linux.S \
14 - m_dispatch/dispatch-x86-darwin.S \
15 - m_dispatch/dispatch-amd64-darwin.S \
16 m_gdbserver/m_gdbserver.c \
17 m_gdbserver/inferiors.c \
18 m_gdbserver/m_gdbserver.c \
19 @@ -322,8 +314,6 @@
20 m_initimg/initimg-pathscan.c \
21 m_mach/mach_basics.c \
22 m_mach/mach_msg.c \
23 - m_mach/mach_traps-x86-darwin.S \
24 - m_mach/mach_traps-amd64-darwin.S \
25 m_replacemalloc/replacemalloc_core.c \
26 m_scheduler/scheduler.c \
27 m_scheduler/sema.c \
28 @@ -335,14 +325,6 @@
29 m_sigframe/sigframe-s390x-linux.c \
30 m_sigframe/sigframe-x86-darwin.c \
31 m_sigframe/sigframe-amd64-darwin.c \
32 - m_syswrap/syscall-x86-linux.S \
33 - m_syswrap/syscall-amd64-linux.S \
34 - m_syswrap/syscall-ppc32-linux.S \
35 - m_syswrap/syscall-ppc64-linux.S \
36 - m_syswrap/syscall-arm-linux.S \
37 - m_syswrap/syscall-s390x-linux.S \
38 - m_syswrap/syscall-x86-darwin.S \
39 - m_syswrap/syscall-amd64-darwin.S \
40 m_syswrap/syswrap-main.c \
41 m_syswrap/syswrap-generic.c \
42 m_syswrap/syswrap-linux.c \
43 @@ -361,6 +343,29 @@
44 m_ume/main.c \
45 m_ume/script.c
46
47 +COREGRIND_SOURCES_COMMON += \
48 + m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S \
49 + m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S
50 +
51 +if VGCONF_HAVE_PLATFORM_SEC
52 +COREGRIND_SOURCES_COMMON += \
53 + m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S \
54 + m_syswrap/syscall-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S
55 +endif
56 +
57 +if VGCONF_OS_IS_DARWIN
58 +COREGRIND_SOURCES_COMMON += \
59 + m_dispatch/dispatch-@VGCONF_ARCH_PRI@-darwin.S \
60 + m_syswrap/syscall-@VGCONF_ARCH_PRI@-darwin.S \
61 + m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S
62 +if VGCONF_HAVE_PLATFORM_SEC
63 +COREGRIND_SOURCES_COMMON += \
64 + m_dispatch/dispatch-@VGCONF_ARCH_SEC@-darwin.S \
65 + m_syswrap/syscall-@VGCONF_ARCH_SEC@-darwin.S \
66 + m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
67 +endif
68 +endif
69 +
70 libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
71 $(COREGRIND_SOURCES_COMMON)
72 nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
73 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
74 --- valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-amd64-linux.S 2011-10-26 17:24:42.000000000 -0400
75 +++ valgrind-3.7.0/coregrind/m_dispatch/dispatch-amd64-linux.S 2011-11-10 20:07:40.000000000 -0500
76 @@ -349,11 +349,11 @@
77 ret
78 .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)
79
80 +#endif // defined(VGP_amd64_linux)
81 +
82 /* Let the linker know we don't need an executable stack */
83 .section .note.GNU-stack,"",@progbits
84
85 -#endif // defined(VGP_amd64_linux)
86 -
87 /*--------------------------------------------------------------------*/
88 /*--- end ---*/
89 /*--------------------------------------------------------------------*/
90 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
91 --- valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-x86-linux.S 2011-10-26 17:24:42.000000000 -0400
92 +++ valgrind-3.7.0/coregrind/m_dispatch/dispatch-x86-linux.S 2011-11-10 20:04:07.000000000 -0500
93 @@ -320,12 +320,11 @@
94 ret
95 .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)
96
97 -
98 +#endif // defined(VGP_x86_linux)
99 +
100 /* Let the linker know we don't need an executable stack */
101 .section .note.GNU-stack,"",@progbits
102
103 -#endif // defined(VGP_x86_linux)
104 -
105 /*--------------------------------------------------------------------*/
106 /*--- end ---*/
107 /*--------------------------------------------------------------------*/
108 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
109 --- valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-amd64-linux.S 2011-11-10 20:02:47.000000000 -0500
110 +++ valgrind-3.7.0/coregrind/m_syswrap/syscall-amd64-linux.S 2011-11-10 20:03:00.000000000 -0500
111 @@ -205,11 +205,11 @@
112 ML_(blksys_finished): .quad 5b
113 .previous
114
115 +#endif // defined(VGP_amd64_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_amd64_linux)
121 -
122 /*--------------------------------------------------------------------*/
123 /*--- end ---*/
124 /*--------------------------------------------------------------------*/
125 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
126 --- valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-x86-linux.S 2011-11-10 20:02:47.000000000 -0500
127 +++ valgrind-3.7.0/coregrind/m_syswrap/syscall-x86-linux.S 2011-11-10 20:03:00.000000000 -0500
128 @@ -164,12 +164,12 @@
129 ML_(blksys_committed): .long 4b
130 ML_(blksys_finished): .long 5b
131 .previous
132 -
133 -/* Let the linker know we don't need an executable stack */
134 -.section .note.GNU-stack,"",@progbits
135
136 #endif // defined(VGP_x86_linux)
137
138 +/* Let the linker know we don't need an executable stack */
139 +.section .note.GNU-stack,"",@progbits
140 +
141 /*--------------------------------------------------------------------*/
142 /*--- end ---*/
143 /*--------------------------------------------------------------------*/

  ViewVC Help
Powered by ViewVC 1.1.20