| 1 |
blueness |
1.1 |
diff -ruN valgrind-3.6.0.orig/coregrind/Makefile.am valgrind-3.6.0/coregrind/Makefile.am |
| 2 |
|
|
--- valgrind-3.6.0.orig/coregrind/Makefile.am 2010-10-21 04:19:45.000000000 +0800 |
| 3 |
|
|
+++ valgrind-3.6.0/coregrind/Makefile.am 2010-10-24 20:39:42.655001876 +0800 |
| 4 |
|
|
@@ -285,23 +285,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-arm-linux.S \ |
| 13 |
|
|
- m_dispatch/dispatch-ppc32-aix5.S \ |
| 14 |
|
|
- m_dispatch/dispatch-ppc64-aix5.S \ |
| 15 |
|
|
- m_dispatch/dispatch-x86-darwin.S \ |
| 16 |
|
|
- m_dispatch/dispatch-amd64-darwin.S \ |
| 17 |
|
|
m_initimg/initimg-linux.c \ |
| 18 |
|
|
m_initimg/initimg-aix5.c \ |
| 19 |
|
|
m_initimg/initimg-darwin.c \ |
| 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 |
|
|
@@ -314,15 +303,6 @@ |
| 29 |
|
|
m_sigframe/sigframe-ppc64-aix5.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-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 |
|
|
@@ -343,6 +323,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.6.0.orig/coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.6.0/coregrind/m_dispatch/dispatch-amd64-linux.S |
| 70 |
|
|
--- valgrind-3.6.0.orig/coregrind/m_dispatch/dispatch-amd64-linux.S 2010-10-21 04:19:39.000000000 +0800 |
| 71 |
|
|
+++ valgrind-3.6.0/coregrind/m_dispatch/dispatch-amd64-linux.S 2010-10-24 20:39:41.462001899 +0800 |
| 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.6.0.orig/coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.6.0/coregrind/m_dispatch/dispatch-x86-linux.S |
| 87 |
|
|
--- valgrind-3.6.0.orig/coregrind/m_dispatch/dispatch-x86-linux.S 2010-10-21 04:19:39.000000000 +0800 |
| 88 |
|
|
+++ valgrind-3.6.0/coregrind/m_dispatch/dispatch-x86-linux.S 2010-10-24 20:39:41.022001883 +0800 |
| 89 |
|
|
@@ -304,12 +304,11 @@ |
| 90 |
|
|
ret |
| 91 |
|
|
.size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation) |
| 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.6.0.orig/coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.6.0/coregrind/m_syswrap/syscall-amd64-linux.S |
| 104 |
|
|
--- valgrind-3.6.0.orig/coregrind/m_syswrap/syscall-amd64-linux.S 2010-10-21 04:19:41.000000000 +0800 |
| 105 |
|
|
+++ valgrind-3.6.0/coregrind/m_syswrap/syscall-amd64-linux.S 2010-10-24 20:39:40.576001879 +0800 |
| 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.6.0.orig/coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.6.0/coregrind/m_syswrap/syscall-x86-linux.S |
| 121 |
|
|
--- valgrind-3.6.0.orig/coregrind/m_syswrap/syscall-x86-linux.S 2010-10-21 04:19:41.000000000 +0800 |
| 122 |
|
|
+++ valgrind-3.6.0/coregrind/m_syswrap/syscall-x86-linux.S 2010-10-24 20:39:40.152001876 +0800 |
| 123 |
|
|
@@ -164,12 +164,12 @@ |
| 124 |
|
|
ML_(blksys_committed): .long 4b |
| 125 |
|
|
ML_(blksys_finished): .long 5b |
| 126 |
|
|
.previous |
| 127 |
|
|
+ |
| 128 |
|
|
+#endif // defined(VGP_x86_linux) |
| 129 |
|
|
|
| 130 |
|
|
/* Let the linker know we don't need an executable stack */ |
| 131 |
|
|
.section .note.GNU-stack,"",@progbits |
| 132 |
|
|
|
| 133 |
|
|
-#endif // defined(VGP_x86_linux) |
| 134 |
|
|
- |
| 135 |
|
|
/*--------------------------------------------------------------------*/ |
| 136 |
|
|
/*--- end ---*/ |
| 137 |
|
|
/*--------------------------------------------------------------------*/ |