diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-12-23 00:39:34 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-12-23 00:40:49 +0100 |
| commit | 501a7ce7270955be151c442c27620fa7af2f3ce5 (patch) | |
| tree | 0374e4d581a0246074d55712b81baf01f3c439b6 /tcg/ia64 | |
| parent | 62e0c095450f6a7eb37914991f3f7966aa4da7a1 (diff) | |
| parent | 36f25d2537c40c6c47f4abee5d31a24863d1adf7 (diff) | |
| download | qemu-501a7ce7270955be151c442c27620fa7af2f3ce5.tar.gz | |
Merge branch 'master' of git://git.qemu.org/qemu into qom-cpu
Adapt header include paths.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'tcg/ia64')
| -rw-r--r-- | tcg/ia64/tcg-target.c | 2 | ||||
| -rw-r--r-- | tcg/ia64/tcg-target.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tcg/ia64/tcg-target.c b/tcg/ia64/tcg-target.c index 06570bea38..2373d9ef79 100644 --- a/tcg/ia64/tcg-target.c +++ b/tcg/ia64/tcg-target.c @@ -1491,7 +1491,7 @@ static inline void tcg_out_movcond(TCGContext *s, TCGCond cond, TCGArg ret, #if defined(CONFIG_SOFTMMU) -#include "../../softmmu_defs.h" +#include "exec/softmmu_defs.h" /* Load and compare a TLB entry, and return the result in (p6, p7). R2 is loaded with the address of the addend TLB entry. diff --git a/tcg/ia64/tcg-target.h b/tcg/ia64/tcg-target.h index 91fe7a3b06..7f3401ecdd 100644 --- a/tcg/ia64/tcg-target.h +++ b/tcg/ia64/tcg-target.h @@ -22,6 +22,7 @@ * 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 /* We only map the first 64 registers */ @@ -158,3 +159,5 @@ static inline void flush_icache_range(tcg_target_ulong start, } asm volatile (";;sync.i;;srlz.i;;"); } + +#endif |