From 7784a254703770bd5cc230dce105d58412045e50 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Tue, 20 Feb 2018 20:38:57 -0500 Subject: [PATCH] tcg: Rename tcg-target.c to tcg-target.inc.c Rename the per-architecture tcg-target.c files to tcg-target.inc.c. This makes it clearer that they are not intended to be standalone C files, but are instead #included into another source file. Backports commit ce151109813e2770fd3cee2f37bfa2cdd01a12b9 from qemu --- qemu/tcg/aarch64/{tcg-target.c => tcg-target.inc.c} | 0 qemu/tcg/arm/{tcg-target.c => tcg-target.inc.c} | 0 qemu/tcg/i386/{tcg-target.c => tcg-target.inc.c} | 0 qemu/tcg/mips/{tcg-target.c => tcg-target.inc.c} | 0 qemu/tcg/ppc/{tcg-target.c => tcg-target.inc.c} | 0 qemu/tcg/s390/{tcg-target.c => tcg-target.inc.c} | 0 qemu/tcg/sparc/{tcg-target.c => tcg-target.inc.c} | 0 qemu/tcg/tcg.c | 7 ++++--- qemu/tcg/tcg.h | 2 +- 9 files changed, 5 insertions(+), 4 deletions(-) rename qemu/tcg/aarch64/{tcg-target.c => tcg-target.inc.c} (100%) rename qemu/tcg/arm/{tcg-target.c => tcg-target.inc.c} (100%) rename qemu/tcg/i386/{tcg-target.c => tcg-target.inc.c} (100%) rename qemu/tcg/mips/{tcg-target.c => tcg-target.inc.c} (100%) rename qemu/tcg/ppc/{tcg-target.c => tcg-target.inc.c} (100%) rename qemu/tcg/s390/{tcg-target.c => tcg-target.inc.c} (100%) rename qemu/tcg/sparc/{tcg-target.c => tcg-target.inc.c} (100%) diff --git a/qemu/tcg/aarch64/tcg-target.c b/qemu/tcg/aarch64/tcg-target.inc.c similarity index 100% rename from qemu/tcg/aarch64/tcg-target.c rename to qemu/tcg/aarch64/tcg-target.inc.c diff --git a/qemu/tcg/arm/tcg-target.c b/qemu/tcg/arm/tcg-target.inc.c similarity index 100% rename from qemu/tcg/arm/tcg-target.c rename to qemu/tcg/arm/tcg-target.inc.c diff --git a/qemu/tcg/i386/tcg-target.c b/qemu/tcg/i386/tcg-target.inc.c similarity index 100% rename from qemu/tcg/i386/tcg-target.c rename to qemu/tcg/i386/tcg-target.inc.c diff --git a/qemu/tcg/mips/tcg-target.c b/qemu/tcg/mips/tcg-target.inc.c similarity index 100% rename from qemu/tcg/mips/tcg-target.c rename to qemu/tcg/mips/tcg-target.inc.c diff --git a/qemu/tcg/ppc/tcg-target.c b/qemu/tcg/ppc/tcg-target.inc.c similarity index 100% rename from qemu/tcg/ppc/tcg-target.c rename to qemu/tcg/ppc/tcg-target.inc.c diff --git a/qemu/tcg/s390/tcg-target.c b/qemu/tcg/s390/tcg-target.inc.c similarity index 100% rename from qemu/tcg/s390/tcg-target.c rename to qemu/tcg/s390/tcg-target.inc.c diff --git a/qemu/tcg/sparc/tcg-target.c b/qemu/tcg/sparc/tcg-target.inc.c similarity index 100% rename from qemu/tcg/sparc/tcg-target.c rename to qemu/tcg/sparc/tcg-target.inc.c diff --git a/qemu/tcg/tcg.c b/qemu/tcg/tcg.c index c9c8259f..83621344 100644 --- a/qemu/tcg/tcg.c +++ b/qemu/tcg/tcg.c @@ -61,7 +61,8 @@ #include "elf.h" -/* Forward declarations for functions declared in tcg-target.c and used here. */ +/* Forward declarations for functions declared in tcg-target.inc.c and + used here. */ static void tcg_target_init(TCGContext *s); static void tcg_target_qemu_prologue(TCGContext *s); static void patch_reloc(tcg_insn_unit *code_ptr, int type, @@ -92,7 +93,7 @@ QEMU_PACK( typedef struct { DebugFrameFDEHeader fde; }) DebugFrameHeader; -/* Forward declarations for functions declared and used in tcg-target.c. */ +/* Forward declarations for functions declared and used in tcg-target.inc.c. */ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str); static void tcg_out_ld(TCGContext *s, TCGType type, TCGReg ret, TCGReg arg1, intptr_t arg2); @@ -238,7 +239,7 @@ TCGLabel *gen_new_label(TCGContext *s) return l; } -#include "tcg-target.c" +#include "tcg-target.inc.c" /* pool based memory allocation */ void *tcg_malloc_internal(TCGContext *s, int size) diff --git a/qemu/tcg/tcg.h b/qemu/tcg/tcg.h index 8a23f0a3..31821924 100644 --- a/qemu/tcg/tcg.h +++ b/qemu/tcg/tcg.h @@ -696,7 +696,7 @@ struct TCGContext { TBContext tb_ctx; - /* The TCGBackendData structure is private to tcg-target.c. */ + /* The TCGBackendData structure is private to tcg-target.inc.c. */ struct TCGBackendData *be; TCGTempSet free_temps[TCG_TYPE_COUNT * 2];