[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/18] tcg: Clean up tcg-target.h header guards
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 10/18] tcg: Clean up tcg-target.h header guards |
Date: |
Tue, 12 Jul 2016 16:31:26 +0200 |
These use guard symbols like TCG_TARGET_$target.
scripts/clean-header-guards.pl doesn't like them because they don't
match their file name (they should, to make guard collisions less
likely).
Clean them up: use guard symbol $target_TCG_TARGET_H for
tcg/$target/tcg-target.h.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
---
tcg/aarch64/tcg-target.h | 6 +++---
tcg/arm/tcg-target.h | 5 +++--
tcg/i386/tcg-target.h | 5 +++--
tcg/ia64/tcg-target.h | 5 +++--
tcg/mips/tcg-target.h | 5 +++--
tcg/ppc/tcg-target.h | 5 +++--
tcg/s390/tcg-target.h | 5 +++--
tcg/sparc/tcg-target.h | 5 +++--
8 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/tcg/aarch64/tcg-target.h b/tcg/aarch64/tcg-target.h
index 19a04a6..a1d101f 100644
--- a/tcg/aarch64/tcg-target.h
+++ b/tcg/aarch64/tcg-target.h
@@ -10,8 +10,8 @@
* See the COPYING file in the top-level directory for details.
*/
-#ifndef TCG_TARGET_AARCH64
-#define TCG_TARGET_AARCH64 1
+#ifndef AARCH64_TCG_TARGET_H
+#define AARCH64_TCG_TARGET_H
#define TCG_TARGET_INSN_UNIT_SIZE 4
#define TCG_TARGET_TLB_DISPLACEMENT_BITS 24
@@ -106,4 +106,4 @@ static inline void flush_icache_range(uintptr_t start,
uintptr_t stop)
__builtin___clear_cache((char *)start, (char *)stop);
}
-#endif /* TCG_TARGET_AARCH64 */
+#endif /* AARCH64_TCG_TARGET_H */
diff --git a/tcg/arm/tcg-target.h b/tcg/arm/tcg-target.h
index 6559f80..a0e1acf 100644
--- a/tcg/arm/tcg-target.h
+++ b/tcg/arm/tcg-target.h
@@ -22,8 +22,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#ifndef TCG_TARGET_ARM
-#define TCG_TARGET_ARM 1
+
+#ifndef ARM_TCG_TARGET_H
+#define ARM_TCG_TARGET_H
#undef TCG_TARGET_STACK_GROWSUP
#define TCG_TARGET_INSN_UNIT_SIZE 4
diff --git a/tcg/i386/tcg-target.h b/tcg/i386/tcg-target.h
index 92be341..524cfc6 100644
--- a/tcg/i386/tcg-target.h
+++ b/tcg/i386/tcg-target.h
@@ -21,8 +21,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#ifndef TCG_TARGET_I386
-#define TCG_TARGET_I386 1
+
+#ifndef I386_TCG_TARGET_H
+#define I386_TCG_TARGET_H
#define TCG_TARGET_INSN_UNIT_SIZE 1
#define TCG_TARGET_TLB_DISPLACEMENT_BITS 31
diff --git a/tcg/ia64/tcg-target.h b/tcg/ia64/tcg-target.h
index ae9b79f..6dddb7f 100644
--- a/tcg/ia64/tcg-target.h
+++ b/tcg/ia64/tcg-target.h
@@ -22,8 +22,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#ifndef TCG_TARGET_IA64
-#define TCG_TARGET_IA64 1
+
+#ifndef IA64_TCG_TARGET_H
+#define IA64_TCG_TARGET_H
#define TCG_TARGET_INSN_UNIT_SIZE 16
#define TCG_TARGET_TLB_DISPLACEMENT_BITS 21
diff --git a/tcg/mips/tcg-target.h b/tcg/mips/tcg-target.h
index b1cda37..3aeac87 100644
--- a/tcg/mips/tcg-target.h
+++ b/tcg/mips/tcg-target.h
@@ -23,8 +23,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#ifndef TCG_TARGET_MIPS
-#define TCG_TARGET_MIPS 1
+
+#ifndef MIPS_TCG_TARGET_H
+#define MIPS_TCG_TARGET_H
#define TCG_TARGET_INSN_UNIT_SIZE 4
#define TCG_TARGET_TLB_DISPLACEMENT_BITS 16
diff --git a/tcg/ppc/tcg-target.h b/tcg/ppc/tcg-target.h
index b4f0818..dd032f2 100644
--- a/tcg/ppc/tcg-target.h
+++ b/tcg/ppc/tcg-target.h
@@ -21,8 +21,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#ifndef TCG_TARGET_PPC64
-#define TCG_TARGET_PPC64 1
+
+#ifndef PPC_TCG_TARGET_H
+#define PPC_TCG_TARGET_H
#ifdef _ARCH_PPC64
# define TCG_TARGET_REG_BITS 64
diff --git a/tcg/s390/tcg-target.h b/tcg/s390/tcg-target.h
index d9dc038..0c1af24 100644
--- a/tcg/s390/tcg-target.h
+++ b/tcg/s390/tcg-target.h
@@ -21,8 +21,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#ifndef TCG_TARGET_S390
-#define TCG_TARGET_S390 1
+
+#ifndef S390_TCG_TARGET_H
+#define S390_TCG_TARGET_H
#define TCG_TARGET_INSN_UNIT_SIZE 2
#define TCG_TARGET_TLB_DISPLACEMENT_BITS 19
diff --git a/tcg/sparc/tcg-target.h b/tcg/sparc/tcg-target.h
index 2cd72d2..88f9c90 100644
--- a/tcg/sparc/tcg-target.h
+++ b/tcg/sparc/tcg-target.h
@@ -21,8 +21,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#ifndef TCG_TARGET_SPARC
-#define TCG_TARGET_SPARC 1
+
+#ifndef SPARC_TCG_TARGET_H
+#define SPARC_TCG_TARGET_H
#define TCG_TARGET_REG_BITS 64
--
2.5.5
- [Qemu-devel] [PULL 00/18] Clean up #include "..." vs <...> and header guards, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 07/18] linux-user: Clean up target_structs.h header guards, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 02/18] scripts: New clean-header-guards.pl, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 14/18] libdecnumber: Don't fool around with guards to avoid #include, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 08/18] linux-user: Clean up hostdep.h header guards, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 18/18] cris: Fix broken header guard in hw/cris/boot.h, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 04/18] linux-user: Clean up target_syscall.h header guards, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 11/18] spapr_pci: Include spapr.h instead of playing games with #error, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 10/18] tcg: Clean up tcg-target.h header guards,
Markus Armbruster <=
- [Qemu-devel] [PULL 12/18] Drop Emacs local variables lists redundant with .dir-locals.el, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 09/18] linux-user: Fix broken header guard in syscall_defs.h, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 03/18] target-*: Clean up cpu.h header guards, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 06/18] linux-user: Clean up target_signal.h header guards, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 15/18] libdecnumber: Don't error out on decNumberLocal.h re-inclusion, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 01/18] Use #include "..." for our own headers, <...> for others, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 05/18] linux-user: Clean up target_cpu.h header guards, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 13/18] Clean up header guards that don't match their file name, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 17/18] Clean up decorations and whitespace around header guards, Markus Armbruster, 2016/07/12
- [Qemu-devel] [PULL 16/18] Clean up ill-advised or unusual header guards, Markus Armbruster, 2016/07/12