aboutsummaryrefslogtreecommitdiffstats
path: root/target-arm
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@android.com>2011-05-12 10:26:09 +0200
committerDavid 'Digit' Turner <digit@android.com>2011-06-01 17:08:19 +0200
commit406a59bd0a2e7a38cd840a5c08602e3a36bd2df8 (patch)
treee9dbb51e71a14aa9118f8e9c980d4722abb04fd8 /target-arm
parent288208c386810fef725aa448a9f46bd2772bec8c (diff)
downloadexternal_qemu-406a59bd0a2e7a38cd840a5c08602e3a36bd2df8.zip
external_qemu-406a59bd0a2e7a38cd840a5c08602e3a36bd2df8.tar.gz
external_qemu-406a59bd0a2e7a38cd840a5c08602e3a36bd2df8.tar.bz2
trace.h: rename to trace-android.h
This is done to allow for future integration of the upstream auto-generated "trace.h" header file. Change-Id: I9d1bba3320d9e8acfd7359540d3ed6695773061e
Diffstat (limited to 'target-arm')
-rw-r--r--target-arm/helper-android.c2
-rw-r--r--target-arm/helper.c2
-rw-r--r--target-arm/translate-android.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/target-arm/helper-android.c b/target-arm/helper-android.c
index af9d14b..8c203d4 100644
--- a/target-arm/helper-android.c
+++ b/target-arm/helper-android.c
@@ -10,7 +10,7 @@
#include "qemu-common.h"
#ifdef CONFIG_TRACE
-#include "trace.h"
+#include "android-trace.h"
void HELPER(traceTicks)(uint32_t ticks)
{
diff --git a/target-arm/helper.c b/target-arm/helper.c
index c69751f..154aa46 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -8,7 +8,7 @@
#include "helpers.h"
#include "qemu-common.h"
#ifdef CONFIG_TRACE
-#include "trace.h"
+#include "android-trace.h"
#endif
static uint32_t cortexa8_cp15_c0_c1[8] =
diff --git a/target-arm/translate-android.h b/target-arm/translate-android.h
index a09931f..274c876 100644
--- a/target-arm/translate-android.h
+++ b/target-arm/translate-android.h
@@ -277,7 +277,7 @@ set_on_ret(target_ulong ret)
#ifdef CONFIG_TRACE
-#include "trace.h"
+#include "android-trace.h"
#define gen_traceInsn() gen_helper_traceInsn()
static void