diff options
| author |   Maurice van der Pot <griffon26@gentoo.org> | 2005-02-22 20:24:09 +0000 |
|---|---|---|
| committer | Maurice van der Pot <griffon26@gentoo.org> | 2005-02-22 20:24:09 +0000 |
| commit | 6d6223f9b55a419ba9cb4f907f5b8841b03ab07d (patch) | |
| tree | 9546b8b2ce30adc1cf4ff714b20e0b9225674781 /dev-util/valgrind/files | |
| parent | Change mono dep to better reflect reality. (diff) | |
| download | gentoo-2-6d6223f9b55a419ba9cb4f907f5b8841b03ab07d.tar.gz gentoo-2-6d6223f9b55a419ba9cb4f907f5b8841b03ab07d.tar.bz2 gentoo-2-6d6223f9b55a419ba9cb4f907f5b8841b03ab07d.zip | |
Fixed valgrind to compile against 2.6.10 kernel headers
(Portage version: 2.0.51.16)
Diffstat (limited to 'dev-util/valgrind/files')
| -rw-r--r-- | dev-util/valgrind/files/valgrind-2.2.0-current-macro-clash.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/dev-util/valgrind/files/valgrind-2.2.0-current-macro-clash.patch b/dev-util/valgrind/files/valgrind-2.2.0-current-macro-clash.patch new file mode 100644 index 000000000000..c0b817615756 --- /dev/null +++ b/dev-util/valgrind/files/valgrind-2.2.0-current-macro-clash.patch @@ -0,0 +1,52 @@ +diff -ruN valgrind-2.2.0/coregrind/vg_syscalls.c valgrind-2.2.0-fixed/coregrind/vg_syscalls.c +--- valgrind-2.2.0/coregrind/vg_syscalls.c 2004-08-31 02:08:37.000000000 +0200 ++++ valgrind-2.2.0-fixed/coregrind/vg_syscalls.c 2005-02-22 20:20:38.904577288 +0100 +@@ -900,7 +900,7 @@ + Addr ret = VG_(brk_limit); + static const Bool debug = False; + Segment *seg; +- Addr current, newaddr; ++ Addr currentaddr, newaddr; + + + if (debug) +@@ -924,20 +924,20 @@ + if (seg != NULL && newbrk > seg->addr) + return VG_(brk_limit); + +- current = PGROUNDUP(VG_(brk_limit)); ++ currentaddr = PGROUNDUP(VG_(brk_limit)); + newaddr = PGROUNDUP(newbrk); +- if (newaddr != current) { ++ if (newaddr != currentaddr) { + + /* new brk in a new page - fix the mappings */ + if (newbrk > VG_(brk_limit)) { + + if (debug) + VG_(printf)(" extending brk: current=%p newaddr=%p delta=%d\n", +- current, newaddr, newaddr-current); ++ currentaddr, newaddr, newaddr-currentaddr); + +- if (newaddr == current) { ++ if (newaddr == currentaddr) { + ret = newbrk; +- } else if ((void*)-1 != VG_(mmap)((void*)current, newaddr-current, ++ } else if ((void*)-1 != VG_(mmap)((void*)currentaddr, newaddr-currentaddr, + VKI_PROT_READ|VKI_PROT_WRITE|VKI_PROT_EXEC, + VKI_MAP_PRIVATE|VKI_MAP_ANONYMOUS|VKI_MAP_FIXED|VKI_MAP_CLIENT, + SF_FIXED|SF_BRK, -1, 0)) +@@ -949,10 +949,10 @@ + + if (debug) + VG_(printf)(" shrinking brk: current=%p newaddr=%p delta=%d\n", +- current, newaddr, current-newaddr); ++ currentaddr, newaddr, currentaddr-newaddr); + +- if (newaddr != current) { +- int res = VG_(munmap)((void *)newaddr, current - newaddr); ++ if (newaddr != currentaddr) { ++ int res = VG_(munmap)((void *)newaddr, currentaddr - newaddr); + vg_assert(0 == res); + } + ret = newbrk; |