[patch] Proposed update for valgrind-3.5.0-non-exec-stack.patch

valgrind-3.6.0-non-exec-stack.patch (text/plain), 5.48 KB, created by Arseny Solokha on 2010-10-24 12:42:03 UTC

diff -ruN valgrind-3.6.0.orig/coregrind/Makefile.am valgrind-3.6.0/coregrind/Makefile.am
--- valgrind-3.6.0.orig/coregrind/Makefile.am	2010-10-21 04:19:45.000000000 +0800
+++ valgrind-3.6.0/coregrind/Makefile.am	2010-10-24 20:39:42.655001876 +0800
@@ -285,23 +285,12 @@
 	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 \
@@ -314,15 +303,6 @@
 	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 \
@@ -343,6 +323,24 @@
 	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 = \
diff -ruN valgrind-3.6.0.orig/coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.6.0/coregrind/m_dispatch/dispatch-amd64-linux.S
--- valgrind-3.6.0.orig/coregrind/m_dispatch/dispatch-amd64-linux.S	2010-10-21 04:19:39.000000000 +0800
+++ valgrind-3.6.0/coregrind/m_dispatch/dispatch-amd64-linux.S	2010-10-24 20:39:41.462001899 +0800
@@ -338,11 +338,11 @@
 	ret
 .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)
 
+#endif // defined(VGP_amd64_linux)
+
 /* Let the linker know we don't need an executable stack */
 .section .note.GNU-stack,"",@progbits
 
-#endif // defined(VGP_amd64_linux)
-
 /*--------------------------------------------------------------------*/
 /*--- end                                                          ---*/
 /*--------------------------------------------------------------------*/
diff -ruN valgrind-3.6.0.orig/coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.6.0/coregrind/m_dispatch/dispatch-x86-linux.S
--- valgrind-3.6.0.orig/coregrind/m_dispatch/dispatch-x86-linux.S	2010-10-21 04:19:39.000000000 +0800
+++ valgrind-3.6.0/coregrind/m_dispatch/dispatch-x86-linux.S	2010-10-24 20:39:41.022001883 +0800
@@ -304,12 +304,11 @@
 	ret
 .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)
 
+#endif // defined(VGP_x86_linux)
 			
 /* Let the linker know we don't need an executable stack */
 .section .note.GNU-stack,"",@progbits
 
-#endif // defined(VGP_x86_linux)
-
 /*--------------------------------------------------------------------*/
 /*--- end                                                          ---*/
 /*--------------------------------------------------------------------*/
diff -ruN valgrind-3.6.0.orig/coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.6.0/coregrind/m_syswrap/syscall-amd64-linux.S
--- valgrind-3.6.0.orig/coregrind/m_syswrap/syscall-amd64-linux.S	2010-10-21 04:19:41.000000000 +0800
+++ valgrind-3.6.0/coregrind/m_syswrap/syscall-amd64-linux.S	2010-10-24 20:39:40.576001879 +0800
@@ -205,11 +205,11 @@
 ML_(blksys_finished):	.quad 5b
 .previous
 
+#endif // defined(VGP_amd64_linux)
+
 /* Let the linker know we don't need an executable stack */
 .section .note.GNU-stack,"",@progbits
 
-#endif // defined(VGP_amd64_linux)
-
 /*--------------------------------------------------------------------*/
 /*--- end                                                          ---*/
 /*--------------------------------------------------------------------*/
diff -ruN valgrind-3.6.0.orig/coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.6.0/coregrind/m_syswrap/syscall-x86-linux.S
--- valgrind-3.6.0.orig/coregrind/m_syswrap/syscall-x86-linux.S	2010-10-21 04:19:41.000000000 +0800
+++ valgrind-3.6.0/coregrind/m_syswrap/syscall-x86-linux.S	2010-10-24 20:39:40.152001876 +0800
@@ -164,12 +164,12 @@
 ML_(blksys_committed):	.long 4b
 ML_(blksys_finished):	.long 5b
 .previous
+
+#endif // defined(VGP_x86_linux)
 	
 /* Let the linker know we don't need an executable stack */
 .section .note.GNU-stack,"",@progbits
 
-#endif // defined(VGP_x86_linux)
-
 /*--------------------------------------------------------------------*/
 /*--- end                                                          ---*/
 /*--------------------------------------------------------------------*/