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

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

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Mon Nov 16 20:49:18 2009 UTC (4 years, 10 months ago) by griffon26
Branch: MAIN
Changes since 1.1: +11 -7 lines
Fix compilation of valgrind-3.5.0 on systems without a secondary arch (bug #293169).
(Portage version: 2.1.6.13/cvs/Linux x86_64)

1 diff -ruN valgrind-3.5.0/coregrind/Makefile.am valgrind-3.5.0-fixed/coregrind/Makefile.am
2 --- valgrind-3.5.0/coregrind/Makefile.am 2009-08-19 15:37:47.000000000 +0200
3 +++ valgrind-3.5.0-fixed/coregrind/Makefile.am 2009-11-16 21:38:32.000000000 +0100
4 @@ -277,22 +277,12 @@
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-ppc32-aix5.S \
13 - m_dispatch/dispatch-ppc64-aix5.S \
14 - m_dispatch/dispatch-x86-darwin.S \
15 - m_dispatch/dispatch-amd64-darwin.S \
16 m_initimg/initimg-linux.c \
17 m_initimg/initimg-aix5.c \
18 m_initimg/initimg-darwin.c \
19 m_initimg/initimg-pathscan.c \
20 m_mach/mach_basics.c \
21 m_mach/mach_msg.c \
22 - m_mach/mach_traps-x86-darwin.S \
23 - m_mach/mach_traps-amd64-darwin.S \
24 m_replacemalloc/replacemalloc_core.c \
25 m_scheduler/scheduler.c \
26 m_scheduler/sema.c \
27 @@ -304,16 +294,6 @@
28 m_sigframe/sigframe-ppc64-aix5.c \
29 m_sigframe/sigframe-x86-darwin.c \
30 m_sigframe/sigframe-amd64-darwin.c \
31 - m_start-x86-darwin.S \
32 - m_start-amd64-darwin.S \
33 - m_syswrap/syscall-x86-linux.S \
34 - m_syswrap/syscall-amd64-linux.S \
35 - m_syswrap/syscall-ppc32-linux.S \
36 - m_syswrap/syscall-ppc64-linux.S \
37 - m_syswrap/syscall-ppc32-aix5.S \
38 - m_syswrap/syscall-ppc64-aix5.S \
39 - m_syswrap/syscall-x86-darwin.S \
40 - m_syswrap/syscall-amd64-darwin.S \
41 m_syswrap/syswrap-main.c \
42 m_syswrap/syswrap-generic.c \
43 m_syswrap/syswrap-linux.c \
44 @@ -333,6 +313,24 @@
45 m_ume/main.c \
46 m_ume/script.c
47
48 +COREGRIND_SOURCES_COMMON += \
49 + m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S \
50 + m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S
51 +
52 +if VGCONF_HAVE_PLATFORM_SEC
53 +COREGRIND_SOURCES_COMMON += \
54 + m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S \
55 + m_syswrap/syscall-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S
56 +endif
57 +
58 +if VGCONF_OS_IS_DARWIN
59 +COREGRIND_SOURCES_COMMON += \
60 + m_start-@VGCONF_ARCH_PRI@-darwin.S \
61 + m_start-@VGCONF_ARCH_SEC@-darwin.S \
62 + m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S \
63 + m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
64 +endif
65 +
66 libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
67 $(COREGRIND_SOURCES_COMMON)
68 nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
69 diff -ruN valgrind-3.5.0/coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.5.0-fixed/coregrind/m_dispatch/dispatch-amd64-linux.S
70 --- valgrind-3.5.0/coregrind/m_dispatch/dispatch-amd64-linux.S 2009-08-19 15:37:41.000000000 +0200
71 +++ valgrind-3.5.0-fixed/coregrind/m_dispatch/dispatch-amd64-linux.S 2009-11-16 21:38:08.000000000 +0100
72 @@ -338,11 +338,11 @@
73 ret
74 .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)
75
76 +#endif // defined(VGP_amd64_linux)
77 +
78 /* Let the linker know we don't need an executable stack */
79 .section .note.GNU-stack,"",@progbits
80
81 -#endif // defined(VGP_amd64_linux)
82 -
83 /*--------------------------------------------------------------------*/
84 /*--- end ---*/
85 /*--------------------------------------------------------------------*/
86 diff -ruN valgrind-3.5.0/coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.5.0-fixed/coregrind/m_dispatch/dispatch-x86-linux.S
87 --- valgrind-3.5.0/coregrind/m_dispatch/dispatch-x86-linux.S 2009-08-19 15:37:41.000000000 +0200
88 +++ valgrind-3.5.0-fixed/coregrind/m_dispatch/dispatch-x86-linux.S 2009-11-16 21:38:08.000000000 +0100
89 @@ -305,11 +305,11 @@
90 .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)
91
92
93 +#endif // defined(VGP_x86_linux)
94 +
95 /* Let the linker know we don't need an executable stack */
96 .section .note.GNU-stack,"",@progbits
97
98 -#endif // defined(VGP_x86_linux)
99 -
100 /*--------------------------------------------------------------------*/
101 /*--- end ---*/
102 /*--------------------------------------------------------------------*/
103 diff -ruN valgrind-3.5.0/coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.5.0-fixed/coregrind/m_syswrap/syscall-amd64-linux.S
104 --- valgrind-3.5.0/coregrind/m_syswrap/syscall-amd64-linux.S 2009-08-19 15:37:42.000000000 +0200
105 +++ valgrind-3.5.0-fixed/coregrind/m_syswrap/syscall-amd64-linux.S 2009-11-16 21:38:08.000000000 +0100
106 @@ -205,11 +205,11 @@
107 ML_(blksys_finished): .quad 5b
108 .previous
109
110 +#endif // defined(VGP_amd64_linux)
111 +
112 /* Let the linker know we don't need an executable stack */
113 .section .note.GNU-stack,"",@progbits
114
115 -#endif // defined(VGP_amd64_linux)
116 -
117 /*--------------------------------------------------------------------*/
118 /*--- end ---*/
119 /*--------------------------------------------------------------------*/
120 diff -ruN valgrind-3.5.0/coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.5.0-fixed/coregrind/m_syswrap/syscall-x86-linux.S
121 --- valgrind-3.5.0/coregrind/m_syswrap/syscall-x86-linux.S 2009-08-19 15:37:42.000000000 +0200
122 +++ valgrind-3.5.0-fixed/coregrind/m_syswrap/syscall-x86-linux.S 2009-11-16 21:38:08.000000000 +0100
123 @@ -165,11 +165,11 @@
124 ML_(blksys_finished): .long 5b
125 .previous
126
127 +#endif // defined(VGP_x86_linux)
128 +
129 /* Let the linker know we don't need an executable stack */
130 .section .note.GNU-stack,"",@progbits
131
132 -#endif // defined(VGP_x86_linux)
133 -
134 /*--------------------------------------------------------------------*/
135 /*--- end ---*/
136 /*--------------------------------------------------------------------*/

  ViewVC Help
Powered by ViewVC 1.1.20