linux-user: Clean up hostdep.h header guards

These headers all use QEMU_HOSTDEP_H as header guard symbol.  Reuse of
the same guard symbol in multiple headers is okay as long as they
cannot be included together.

Since we can avoid guard symbol reuse easily, do so: use guard symbol
$target_HOSTDEP_H for linux-user/host/$target/hostdep.h.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>

13 files changed, 26 insertions, 26 deletions

diff --git a/linux-user/host/aarch64/hostdep.h b/linux-user/host/aarch64/hostdep.h
index b79eaf1811..64f75cef49 100644
--- a/linux-user/host/aarch64/hostdep.h
+++ b/linux-user/host/aarch64/hostdep.h
@@ -9,8 +9,8 @@
  * See the COPYING file in the top-level directory.
  */
 
-#ifndef QEMU_HOSTDEP_H
-#define QEMU_HOSTDEP_H
+#ifndef AARCH64_HOSTDEP_H
+#define AARCH64_HOSTDEP_H
 
 /* We have a safe-syscall.inc.S */
 #define HAVE_SAFE_SYSCALL
diff --git a/linux-user/host/arm/hostdep.h b/linux-user/host/arm/hostdep.h
index 8e1ff2ffc5..5c1ae60120 100644
--- a/linux-user/host/arm/hostdep.h
+++ b/linux-user/host/arm/hostdep.h
@@ -9,8 +9,8 @@
  * See the COPYING file in the top-level directory.
  */
 
-#ifndef QEMU_HOSTDEP_H
-#define QEMU_HOSTDEP_H
+#ifndef ARM_HOSTDEP_H
+#define ARM_HOSTDEP_H
 
 /* We have a safe-syscall.inc.S */
 #define HAVE_SAFE_SYSCALL
diff --git a/linux-user/host/i386/hostdep.h b/linux-user/host/i386/hostdep.h
index 5a12f4adce..d834bd80ea 100644
--- a/linux-user/host/i386/hostdep.h
+++ b/linux-user/host/i386/hostdep.h
@@ -9,8 +9,8 @@
  * See the COPYING file in the top-level directory.
  */
 
-#ifndef QEMU_HOSTDEP_H
-#define QEMU_HOSTDEP_H
+#ifndef I386_HOSTDEP_H
+#define I386_HOSTDEP_H
 
 /* We have a safe-syscall.inc.S */
 #define HAVE_SAFE_SYSCALL
diff --git a/linux-user/host/ia64/hostdep.h b/linux-user/host/ia64/hostdep.h
index 7609bf5cd7..263bf7658e 100644
--- a/linux-user/host/ia64/hostdep.h
+++ b/linux-user/host/ia64/hostdep.h
@@ -9,7 +9,7 @@
  * See the COPYING file in the top-level directory.
  */
 
-#ifndef QEMU_HOSTDEP_H
-#define QEMU_HOSTDEP_H
+#ifndef IA64_HOSTDEP_H
+#define IA64_HOSTDEP_H
 
 #endif
diff --git a/linux-user/host/mips/hostdep.h b/linux-user/host/mips/hostdep.h
index 7609bf5cd7..ba111d75c3 100644
--- a/linux-user/host/mips/hostdep.h
+++ b/linux-user/host/mips/hostdep.h
@@ -9,7 +9,7 @@
  * See the COPYING file in the top-level directory.
  */
 
-#ifndef QEMU_HOSTDEP_H
-#define QEMU_HOSTDEP_H
+#ifndef MIPS_HOSTDEP_H
+#define MIPS_HOSTDEP_H
 
 #endif
diff --git a/linux-user/host/ppc/hostdep.h b/linux-user/host/ppc/hostdep.h
index 7609bf5cd7..23d8bd9d47 100644
--- a/linux-user/host/ppc/hostdep.h
+++ b/linux-user/host/ppc/hostdep.h
@@ -9,7 +9,7 @@
  * See the COPYING file in the top-level directory.
  */
 
-#ifndef QEMU_HOSTDEP_H
-#define QEMU_HOSTDEP_H
+#ifndef PPC_HOSTDEP_H
+#define PPC_HOSTDEP_H
 
 #endif
diff --git a/linux-user/host/ppc64/hostdep.h b/linux-user/host/ppc64/hostdep.h
index 310e7d1b73..0b0f5f7821 100644
--- a/linux-user/host/ppc64/hostdep.h
+++ b/linux-user/host/ppc64/hostdep.h
@@ -9,8 +9,8 @@
  * See the COPYING file in the top-level directory.
  */
 
-#ifndef QEMU_HOSTDEP_H
-#define QEMU_HOSTDEP_H
+#ifndef PPC64_HOSTDEP_H
+#define PPC64_HOSTDEP_H
 
 /* We have a safe-syscall.inc.S */
 #define HAVE_SAFE_SYSCALL
diff --git a/linux-user/host/s390/hostdep.h b/linux-user/host/s390/hostdep.h
index 7609bf5cd7..afcba5a16a 100644
--- a/linux-user/host/s390/hostdep.h
+++ b/linux-user/host/s390/hostdep.h
@@ -9,7 +9,7 @@
  * See the COPYING file in the top-level directory.
  */
 
-#ifndef QEMU_HOSTDEP_H
-#define QEMU_HOSTDEP_H
+#ifndef S390_HOSTDEP_H
+#define S390_HOSTDEP_H
 
 #endif
diff --git a/linux-user/host/s390x/hostdep.h b/linux-user/host/s390x/hostdep.h
index e95871c46a..6f9da9c608 100644
--- a/linux-user/host/s390x/hostdep.h
+++ b/linux-user/host/s390x/hostdep.h
@@ -9,8 +9,8 @@
  * See the COPYING file in the top-level directory.
  */
 
-#ifndef QEMU_HOSTDEP_H
-#define QEMU_HOSTDEP_H
+#ifndef S390X_HOSTDEP_H
+#define S390X_HOSTDEP_H
 
 /* We have a safe-syscall.inc.S */
 #define HAVE_SAFE_SYSCALL
diff --git a/linux-user/host/sparc/hostdep.h b/linux-user/host/sparc/hostdep.h
index 7609bf5cd7..391ad923cf 100644
--- a/linux-user/host/sparc/hostdep.h
+++ b/linux-user/host/sparc/hostdep.h
@@ -9,7 +9,7 @@
  * See the COPYING file in the top-level directory.
  */
 
-#ifndef QEMU_HOSTDEP_H
-#define QEMU_HOSTDEP_H
+#ifndef SPARC_HOSTDEP_H
+#define SPARC_HOSTDEP_H
 
 #endif
diff --git a/linux-user/host/sparc64/hostdep.h b/linux-user/host/sparc64/hostdep.h
index 7609bf5cd7..ce3968fca0 100644
--- a/linux-user/host/sparc64/hostdep.h
+++ b/linux-user/host/sparc64/hostdep.h
@@ -9,7 +9,7 @@
  * See the COPYING file in the top-level directory.
  */
 
-#ifndef QEMU_HOSTDEP_H
-#define QEMU_HOSTDEP_H
+#ifndef SPARC64_HOSTDEP_H
+#define SPARC64_HOSTDEP_H
 
 #endif
diff --git a/linux-user/host/x32/hostdep.h b/linux-user/host/x32/hostdep.h
index 7609bf5cd7..2c2d6d37da 100644
--- a/linux-user/host/x32/hostdep.h
+++ b/linux-user/host/x32/hostdep.h
@@ -9,7 +9,7 @@
  * See the COPYING file in the top-level directory.
  */
 
-#ifndef QEMU_HOSTDEP_H
-#define QEMU_HOSTDEP_H
+#ifndef X32_HOSTDEP_H
+#define X32_HOSTDEP_H
 
 #endif
diff --git a/linux-user/host/x86_64/hostdep.h b/linux-user/host/x86_64/hostdep.h
index 9dfbf3ae6a..3b4259633e 100644
--- a/linux-user/host/x86_64/hostdep.h
+++ b/linux-user/host/x86_64/hostdep.h
@@ -9,8 +9,8 @@
  * See the COPYING file in the top-level directory.
  */
 
-#ifndef QEMU_HOSTDEP_H
-#define QEMU_HOSTDEP_H
+#ifndef X86_64_HOSTDEP_H
+#define X86_64_HOSTDEP_H
 
 /* We have a safe-syscall.inc.S */
 #define HAVE_SAFE_SYSCALL