david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tcg-arm: fix __clear_cache() warning

Browse Source 
Use __builtin___clear_cache() instead of __clear_cache() to avoid having
to define the function as extern. Fix the following warning:

| In file included from qemu/cpus.c:34:
| qemu/exec-all.h: In function 'tb_set_jmp_target1':
| qemu/exec-all.h:208: error: nested extern declaration of '__clear_cache'
| make[1]: *** [cpus.o] Error 1
| make: *** [subdir-i386-softmmu] Error 2

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Aurelien Jarno 2010-12-21 19:32:49 +01:00
parent fcd61af663
commit 4a1e19ae05
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
exec-all.h
View File

@ -204,9 +204,7 @@ static inline void tb_set_jmp_target1(unsigned long jmp_addr, unsigned long addr
#elif defined(__arm__) #elif defined(__arm__)
static inline void tb_set_jmp_target1(unsigned long jmp_addr, unsigned long addr) static inline void tb_set_jmp_target1(unsigned long jmp_addr, unsigned long addr)
{ {
#if QEMU_GNUC_PREREQ(4, 1) #if !QEMU_GNUC_PREREQ(4, 1)
void __clear_cache(char *beg, char *end);
#else
register unsigned long _beg __asm ("a1"); register unsigned long _beg __asm ("a1");
register unsigned long _end __asm ("a2"); register unsigned long _end __asm ("a2");
register unsigned long _flg __asm ("a3"); register unsigned long _flg __asm ("a3");
@ -218,7 +216,7 @@ static inline void tb_set_jmp_target1(unsigned long jmp_addr, unsigned long addr
| (((addr - (jmp_addr + 8)) >> 2) & 0xffffff); | (((addr - (jmp_addr + 8)) >> 2) & 0xffffff);
#if QEMU_GNUC_PREREQ(4, 1) #if QEMU_GNUC_PREREQ(4, 1)
__clear_cache((char *) jmp_addr, (char *) jmp_addr + 4); __builtin___clear_cache((char *) jmp_addr, (char *) jmp_addr + 4);
#else #else
/* flush icache */ /* flush icache */
_beg = jmp_addr; _beg = jmp_addr;