Attachment #251797 for bug #342189




	m_demangle/demangle.c \
	m_demangle/dyn-string.c \
	m_demangle/safe-ctype.c \
	m_dispatch/dispatch-x86-linux.S \
	m_dispatch/dispatch-amd64-linux.S \
	m_dispatch/dispatch-ppc32-linux.S \
	m_dispatch/dispatch-ppc64-linux.S \
	m_dispatch/dispatch-arm-linux.S \
	m_dispatch/dispatch-ppc32-aix5.S \
	m_dispatch/dispatch-ppc64-aix5.S \
	m_dispatch/dispatch-x86-darwin.S \
	m_dispatch/dispatch-amd64-darwin.S \
	m_initimg/initimg-linux.c \
	m_initimg/initimg-aix5.c \
	m_initimg/initimg-darwin.c \
	m_initimg/initimg-pathscan.c \
	m_mach/mach_basics.c \
	m_mach/mach_msg.c \
	m_mach/mach_traps-x86-darwin.S \
	m_mach/mach_traps-amd64-darwin.S \
	m_replacemalloc/replacemalloc_core.c \
	m_scheduler/scheduler.c \
	m_scheduler/sema.c \

	m_sigframe/sigframe-ppc64-aix5.c \
	m_sigframe/sigframe-x86-darwin.c \
	m_sigframe/sigframe-amd64-darwin.c \
	m_syswrap/syscall-x86-linux.S \
	m_syswrap/syscall-amd64-linux.S \
	m_syswrap/syscall-ppc32-linux.S \
	m_syswrap/syscall-ppc64-linux.S \
	m_syswrap/syscall-arm-linux.S \
	m_syswrap/syscall-ppc32-aix5.S \
	m_syswrap/syscall-ppc64-aix5.S \
	m_syswrap/syscall-x86-darwin.S \
	m_syswrap/syscall-amd64-darwin.S \
	m_syswrap/syswrap-main.c \
	m_syswrap/syswrap-generic.c \
	m_syswrap/syswrap-linux.c \

	m_ume/main.c \
	m_ume/script.c

COREGRIND_SOURCES_COMMON += \
	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S \
	m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S

if VGCONF_HAVE_PLATFORM_SEC
COREGRIND_SOURCES_COMMON += \
	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S \
	m_syswrap/syscall-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S
endif

if VGCONF_OS_IS_DARWIN
COREGRIND_SOURCES_COMMON += \
	m_start-@VGCONF_ARCH_PRI@-darwin.S \
	m_start-@VGCONF_ARCH_SEC@-darwin.S \
	m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S \
	m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
endif

libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
    $(COREGRIND_SOURCES_COMMON)
nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \

Lines 338-348 Link Here

(-)valgrind-3.6.0.orig/coregrind/m_dispatch/dispatch-amd64-linux.S (-2 / +2 lines)
338	ret	338	ret
339	.size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)	339	.size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)
340		340
		341	#endif // defined(VGP_amd64_linux)
		342
341	/* Let the linker know we don't need an executable stack */	343	/* Let the linker know we don't need an executable stack */
342	.section .note.GNU-stack,"",@progbits	344	.section .note.GNU-stack,"",@progbits
343		345
344	#endif // defined(VGP_amd64_linux)
345
346	/--------------------------------------------------------------------/	346	/--------------------------------------------------------------------/
347	/--- end ---/	347	/--- end ---/
348	/--------------------------------------------------------------------/	348	/--------------------------------------------------------------------/

Lines 304-315 Link Here

(-)valgrind-3.6.0.orig/coregrind/m_dispatch/dispatch-x86-linux.S (-2 / +1 lines)
304	ret	304	ret
305	.size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)	305	.size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)
306		306
		307	#endif // defined(VGP_x86_linux)
307		308
308	/* Let the linker know we don't need an executable stack */	309	/* Let the linker know we don't need an executable stack */
309	.section .note.GNU-stack,"",@progbits	310	.section .note.GNU-stack,"",@progbits
310		311
311	#endif // defined(VGP_x86_linux)
312
313	/--------------------------------------------------------------------/	312	/--------------------------------------------------------------------/
314	/--- end ---/	313	/--- end ---/
315	/--------------------------------------------------------------------/	314	/--------------------------------------------------------------------/

Lines 205-215 Link Here

(-)valgrind-3.6.0.orig/coregrind/m_syswrap/syscall-amd64-linux.S (-2 / +2 lines)
205	ML_(blksys_finished): .quad 5b	205	ML_(blksys_finished): .quad 5b
206	.previous	206	.previous
207		207
		208	#endif // defined(VGP_amd64_linux)
		209
208	/* Let the linker know we don't need an executable stack */	210	/* Let the linker know we don't need an executable stack */
209	.section .note.GNU-stack,"",@progbits	211	.section .note.GNU-stack,"",@progbits
210		212
211	#endif // defined(VGP_amd64_linux)
212
213	/--------------------------------------------------------------------/	213	/--------------------------------------------------------------------/
214	/--- end ---/	214	/--- end ---/
215	/--------------------------------------------------------------------/	215	/--------------------------------------------------------------------/

Lines 164-175 Link Here

(-)valgrind-3.6.0.orig/coregrind/m_syswrap/syscall-x86-linux.S (-2 / +2 lines)
164	ML_(blksys_committed): .long 4b	164	ML_(blksys_committed): .long 4b
165	ML_(blksys_finished): .long 5b	165	ML_(blksys_finished): .long 5b
166	.previous	166	.previous
		167
		168	#endif // defined(VGP_x86_linux)
167		169
168	/* Let the linker know we don't need an executable stack */	170	/* Let the linker know we don't need an executable stack */
169	.section .note.GNU-stack,"",@progbits	171	.section .note.GNU-stack,"",@progbits
170		172
171	#endif // defined(VGP_x86_linux)
172
173	/--------------------------------------------------------------------/	173	/--------------------------------------------------------------------/
174	/--- end ---/	174	/--- end ---/
175	/--------------------------------------------------------------------/	175	/--------------------------------------------------------------------/

Return to bug 342189

Lines 285-307 Link Here

(-)valgrind-3.6.0.orig/coregrind/Makefile.am (-20 / +18 lines)
285	m_demangle/demangle.c \	285	m_demangle/demangle.c \
286	m_demangle/dyn-string.c \	286	m_demangle/dyn-string.c \
287	m_demangle/safe-ctype.c \	287	m_demangle/safe-ctype.c \
288	m_dispatch/dispatch-x86-linux.S \
289	m_dispatch/dispatch-amd64-linux.S \
290	m_dispatch/dispatch-ppc32-linux.S \
291	m_dispatch/dispatch-ppc64-linux.S \
292	m_dispatch/dispatch-arm-linux.S \
293	m_dispatch/dispatch-ppc32-aix5.S \
294	m_dispatch/dispatch-ppc64-aix5.S \
295	m_dispatch/dispatch-x86-darwin.S \
296	m_dispatch/dispatch-amd64-darwin.S \
297	m_initimg/initimg-linux.c \	288	m_initimg/initimg-linux.c \
298	m_initimg/initimg-aix5.c \	289	m_initimg/initimg-aix5.c \
299	m_initimg/initimg-darwin.c \	290	m_initimg/initimg-darwin.c \
300	m_initimg/initimg-pathscan.c \	291	m_initimg/initimg-pathscan.c \
301	m_mach/mach_basics.c \	292	m_mach/mach_basics.c \
302	m_mach/mach_msg.c \	293	m_mach/mach_msg.c \
303	m_mach/mach_traps-x86-darwin.S \
304	m_mach/mach_traps-amd64-darwin.S \
305	m_replacemalloc/replacemalloc_core.c \	294	m_replacemalloc/replacemalloc_core.c \
306	m_scheduler/scheduler.c \	295	m_scheduler/scheduler.c \
307	m_scheduler/sema.c \	296	m_scheduler/sema.c \
Lines 314-328 Link Here
314	m_sigframe/sigframe-ppc64-aix5.c \	303	m_sigframe/sigframe-ppc64-aix5.c \
315	m_sigframe/sigframe-x86-darwin.c \	304	m_sigframe/sigframe-x86-darwin.c \
316	m_sigframe/sigframe-amd64-darwin.c \	305	m_sigframe/sigframe-amd64-darwin.c \
317	m_syswrap/syscall-x86-linux.S \
318	m_syswrap/syscall-amd64-linux.S \
319	m_syswrap/syscall-ppc32-linux.S \
320	m_syswrap/syscall-ppc64-linux.S \
321	m_syswrap/syscall-arm-linux.S \
322	m_syswrap/syscall-ppc32-aix5.S \
323	m_syswrap/syscall-ppc64-aix5.S \
324	m_syswrap/syscall-x86-darwin.S \
325	m_syswrap/syscall-amd64-darwin.S \
326	m_syswrap/syswrap-main.c \	306	m_syswrap/syswrap-main.c \
327	m_syswrap/syswrap-generic.c \	307	m_syswrap/syswrap-generic.c \
328	m_syswrap/syswrap-linux.c \	308	m_syswrap/syswrap-linux.c \
Lines 343-348 Link Here
343	m_ume/main.c \	323	m_ume/main.c \
344	m_ume/script.c	324	m_ume/script.c
345		325
		326	COREGRIND_SOURCES_COMMON += \
		327	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S \
		328	m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S
		329
		330	if VGCONF_HAVE_PLATFORM_SEC
		331	COREGRIND_SOURCES_COMMON += \
		332	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S \
		333	m_syswrap/syscall-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S
		334	endif
		335
		336	if VGCONF_OS_IS_DARWIN
		337	COREGRIND_SOURCES_COMMON += \
		338	m_start-@VGCONF_ARCH_PRI@-darwin.S \
		339	m_start-@VGCONF_ARCH_SEC@-darwin.S \
		340	m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S \
		341	m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
		342	endif
		343
346	libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \	344	libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
347	$(COREGRIND_SOURCES_COMMON)	345	$(COREGRIND_SOURCES_COMMON)
348	nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \	346	nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \