Include pub_core_aspacemgr.h only where needed.

Also fixes BZ #344235.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14966

diff --git a/NEWS b/NEWS
index 2d38e3d2bed0b6c1f2efdba35e689f0a47ffe436..e3606c2052abfb47d06cb376f30f0dc9cc0a22c1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -101,6 +101,7 @@ where XXXXXX is the bug number as listed below.
 343967  Don't warn about setuid/setgid/setcap executable for directories
 343978  Recognize DWARF5/GCC5 DW_LANG_Fortran 2003 and 2008 constants
 344007  accept4 syscall unhandled on arm64 (242) and ppc64 (344)
+344235  Remove duplicate include of pub_core_aspacemgr.h
 344279  syscall sendmmsg on arm64 (269) and ppc32/64 (349) unhandled
 344295  syscall recvmmsg on arm64 (243) and ppc32/64 (343) unhandled
 344307  2 unhandled syscalls on aarch64/arm64: umount2(39), mount (40)

diff --git a/coregrind/m_addrinfo.c b/coregrind/m_addrinfo.c
index 0be05667dab17e326f374a49a4138feacda6b7d0..9aa0047f168ccbb6fcea1cf45b589407b7231d49 100644 (file)
--- a/coregrind/m_addrinfo.c
+++ b/coregrind/m_addrinfo.c
@@ -37,7 +37,6 @@
 #include "pub_core_xarray.h"
 #include "pub_core_debuginfo.h"
 #include "pub_core_execontext.h"
-#include "pub_core_aspacemgr.h"
 #include "pub_core_addrinfo.h"
 #include "pub_core_mallocfree.h"
 #include "pub_core_machine.h"

diff --git a/coregrind/m_gdbserver/remote-utils.c b/coregrind/m_gdbserver/remote-utils.c
index a633c2bd6120248ab92b6b5327b2461eeba06b9f..f79c923f216f1c5fd15228bbfe22f732a23d275d 100644 (file)
--- a/coregrind/m_gdbserver/remote-utils.c
+++ b/coregrind/m_gdbserver/remote-utils.c
@@ -26,6 +26,7 @@
 #include "pub_core_vkiscnums.h"
 #include "pub_core_libcsignal.h"
 #include "pub_core_options.h"
+#include "pub_core_aspacemgr.h"
 
 #include "server.h"
 

diff --git a/coregrind/m_gdbserver/server.c b/coregrind/m_gdbserver/server.c
index 85242f12ab5524eaa4e90b0087dda71511830e53..9aae3a30a1193992bb173c9b21a51842500220c6 100644 (file)
--- a/coregrind/m_gdbserver/server.c
+++ b/coregrind/m_gdbserver/server.c
@@ -33,6 +33,7 @@
 #include "pub_core_transtab.h"
 #include "pub_core_debuginfo.h"
 #include "pub_core_addrinfo.h"
+#include "pub_core_aspacemgr.h"
 
 unsigned long cont_thread;
 unsigned long general_thread;

diff --git a/coregrind/m_gdbserver/server.h b/coregrind/m_gdbserver/server.h
index 39e42a246add8f8067195fbf6875e0616686ae27..1e010cab75c50acf71c60d5c616cea2414534c26 100644 (file)
--- a/coregrind/m_gdbserver/server.h
+++ b/coregrind/m_gdbserver/server.h
@@ -43,7 +43,6 @@
 #include "pub_core_libcsetjmp.h"
 #include "pub_core_threadstate.h"
 #include "pub_core_gdbserver.h"
-#include "pub_core_aspacemgr.h"
 #include "pub_core_vki.h"
 #include "pub_core_clreq.h"
 

diff --git a/coregrind/m_gdbserver/valgrind-low-amd64.c b/coregrind/m_gdbserver/valgrind-low-amd64.c
index 630a3b03a0cd7ef1642d767ae02ecb35b6cd41de..c0d85bf3d3d9e8ec68abe475302c825b11045292 100644 (file)
--- a/coregrind/m_gdbserver/valgrind-low-amd64.c
+++ b/coregrind/m_gdbserver/valgrind-low-amd64.c
@@ -26,7 +26,6 @@
 #include "regdef.h"
 #include "regcache.h"
 
-#include "pub_core_aspacemgr.h"
 #include "pub_core_machine.h"
 #include "pub_core_threadstate.h"
 #include "pub_core_transtab.h"

diff --git a/coregrind/m_gdbserver/valgrind-low-arm.c b/coregrind/m_gdbserver/valgrind-low-arm.c
index be2be8a453dbc1c16b3daa2fe446829bfff5d414..c6f33aac9bd78f7cc229543e3be6570d0712a820 100644 (file)
--- a/coregrind/m_gdbserver/valgrind-low-arm.c
+++ b/coregrind/m_gdbserver/valgrind-low-arm.c
@@ -26,7 +26,6 @@
 #include "regdef.h"
 #include "regcache.h"
 
-#include "pub_core_aspacemgr.h"
 #include "pub_core_machine.h"
 #include "pub_core_threadstate.h"
 #include "pub_core_transtab.h"

diff --git a/coregrind/m_gdbserver/valgrind-low-arm64.c b/coregrind/m_gdbserver/valgrind-low-arm64.c
index 14d3362a75eb04b57526881af2584467714d01e4..17aa2068bf061ff1c34790f6011af2359eb4b5a0 100644 (file)
--- a/coregrind/m_gdbserver/valgrind-low-arm64.c
+++ b/coregrind/m_gdbserver/valgrind-low-arm64.c
@@ -26,7 +26,6 @@
 #include "regdef.h"
 #include "regcache.h"
 
-#include "pub_core_aspacemgr.h"
 #include "pub_core_machine.h"
 #include "pub_core_threadstate.h"
 #include "pub_core_transtab.h"

diff --git a/coregrind/m_gdbserver/valgrind-low-mips32.c b/coregrind/m_gdbserver/valgrind-low-mips32.c
index 91b40866a8f618fd84a448c41e0f25bd29fb1325..e44b635aca822c8ceae1e0650054b9249aad91a2 100644 (file)
--- a/coregrind/m_gdbserver/valgrind-low-mips32.c
+++ b/coregrind/m_gdbserver/valgrind-low-mips32.c
@@ -26,7 +26,6 @@
 #include "regdef.h"
 #include "regcache.h"
 
-#include "pub_core_aspacemgr.h"
 #include "pub_core_machine.h"
 #include "pub_core_debuginfo.h"
 #include "pub_core_threadstate.h"

diff --git a/coregrind/m_gdbserver/valgrind-low-mips64.c b/coregrind/m_gdbserver/valgrind-low-mips64.c
index 75be5dd52c244ce95753a3c11836f52fd41e9b49..f02bef70fccbd6baa8c62cbb8ec3aa87691ef2ea 100644 (file)
--- a/coregrind/m_gdbserver/valgrind-low-mips64.c
+++ b/coregrind/m_gdbserver/valgrind-low-mips64.c
@@ -26,7 +26,6 @@
 #include "regdef.h"
 #include "regcache.h"
 
-#include "pub_core_aspacemgr.h"
 #include "pub_core_machine.h"
 #include "pub_core_debuginfo.h"
 #include "pub_core_threadstate.h"

diff --git a/coregrind/m_gdbserver/valgrind-low-ppc32.c b/coregrind/m_gdbserver/valgrind-low-ppc32.c
index 87e60728f122812f17a04e0992a8202db595026c..db5d8ced162aa4691f8bb0706247d4a7bdd6f8e6 100644 (file)
--- a/coregrind/m_gdbserver/valgrind-low-ppc32.c
+++ b/coregrind/m_gdbserver/valgrind-low-ppc32.c
@@ -26,7 +26,6 @@
 #include "regdef.h"
 #include "regcache.h"
 
-#include "pub_core_aspacemgr.h"
 #include "pub_core_machine.h"
 #include "pub_core_threadstate.h"
 #include "pub_core_transtab.h"

diff --git a/coregrind/m_gdbserver/valgrind-low-ppc64.c b/coregrind/m_gdbserver/valgrind-low-ppc64.c
index 349c9bb25b78a31e9716c3039110d0e1e53c8f0d..3bf90b13ada32c4b766be4773f4952ea3b97d4a5 100644 (file)
--- a/coregrind/m_gdbserver/valgrind-low-ppc64.c
+++ b/coregrind/m_gdbserver/valgrind-low-ppc64.c
@@ -26,7 +26,6 @@
 #include "regdef.h"
 #include "regcache.h"
 
-#include "pub_core_aspacemgr.h"
 #include "pub_core_machine.h"
 #include "pub_core_threadstate.h"
 #include "pub_core_transtab.h"

diff --git a/coregrind/m_gdbserver/valgrind-low-s390x.c b/coregrind/m_gdbserver/valgrind-low-s390x.c
index 3a963be20de1ac50c56df67ac8680b8d052f27f8..3985b0905530eb0912664900db6c8bb1da7c549f 100644 (file)
--- a/coregrind/m_gdbserver/valgrind-low-s390x.c
+++ b/coregrind/m_gdbserver/valgrind-low-s390x.c
@@ -26,7 +26,6 @@
 #include "regdef.h"
 #include "regcache.h"
 
-#include "pub_core_aspacemgr.h"
 #include "pub_core_machine.h"
 #include "pub_core_threadstate.h"
 #include "pub_core_transtab.h"

diff --git a/coregrind/m_gdbserver/valgrind-low-x86.c b/coregrind/m_gdbserver/valgrind-low-x86.c
index ffe124be383e235f13a42b15f4c9b75f696d02b7..410c4257fd3db17bd8c744c6242203158a8c7ec4 100644 (file)
--- a/coregrind/m_gdbserver/valgrind-low-x86.c
+++ b/coregrind/m_gdbserver/valgrind-low-x86.c
@@ -26,7 +26,6 @@
 #include "regdef.h"
 #include "regcache.h"
 
-#include "pub_core_aspacemgr.h"
 #include "pub_core_machine.h"
 #include "pub_core_threadstate.h"
 #include "pub_core_transtab.h"

diff --git a/include/pub_tool_addrinfo.h b/include/pub_tool_addrinfo.h
index 3b1c45ff7588ce26877f64e9993691535c051c8e..d62bc3438ccb683c6d8f522e268f4b788b25b10e 100644 (file)
--- a/include/pub_tool_addrinfo.h
+++ b/include/pub_tool_addrinfo.h
@@ -32,6 +32,7 @@
 #define __PUB_TOOL_ADDRINFO_H
 
 #include "pub_tool_basics.h"   // VG_ macro
+#include "pub_tool_aspacemgr.h"  // SegKind
 
 /*====================================================================*/
 /*=== Obtaining information about an address                       ===*/