diff options
| author | David 'Digit' Turner <digit@android.com> | 2010-05-10 16:48:20 -0700 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2010-05-10 16:49:50 -0700 |
| commit | 2c538c86c15d597cc875dc926e4e39285c5625df (patch) | |
| tree | fd02b6da79b5e1375ab2ec5264ab339044e4a7da /cpu-exec.c | |
| parent | 5e097bf40ed22b422dce1fb2c58098d6c97cf0c6 (diff) | |
| download | external_qemu-2c538c86c15d597cc875dc926e4e39285c5625df.zip external_qemu-2c538c86c15d597cc875dc926e4e39285c5625df.tar.gz external_qemu-2c538c86c15d597cc875dc926e4e39285c5625df.tar.bz2 | |
Upstream: Use CONFIG_BSD instead of _BSD and HOST_BSD
Also fix OS X build, which failed with a link error.
Change-Id: Idd63f25dc1f46ea66da5727c7577def34f048c3c
Diffstat (limited to 'cpu-exec.c')
| -rw-r--r-- | cpu-exec.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -39,7 +39,7 @@ #endif #endif -#if defined(__sparc__) && !defined(HOST_SOLARIS) +#if defined(__sparc__) && !defined(CONFIG_SOLARIS) // Work around ugly bugs in glibc that mangle global register contents #undef env #define env cpu_single_env @@ -259,7 +259,7 @@ int cpu_exec(CPUState *env1) /* prepare setjmp context for exception handling */ for(;;) { if (setjmp(env->jmp_env) == 0) { -#if defined(__sparc__) && !defined(HOST_SOLARIS) +#if defined(__sparc__) && !defined(CONFIG_SOLARIS) #undef env env = cpu_single_env; #define env cpu_single_env @@ -404,7 +404,7 @@ int cpu_exec(CPUState *env1) env->interrupt_request &= ~(CPU_INTERRUPT_HARD | CPU_INTERRUPT_VIRQ); intno = cpu_get_pic_interrupt(env); qemu_log_mask(CPU_LOG_TB_IN_ASM, "Servicing hardware INT=0x%02x\n", intno); -#if defined(__sparc__) && !defined(HOST_SOLARIS) +#if defined(__sparc__) && !defined(CONFIG_SOLARIS) #undef env env = cpu_single_env; #define env cpu_single_env @@ -634,7 +634,7 @@ int cpu_exec(CPUState *env1) while (env->current_tb) { tc_ptr = tb->tc_ptr; /* execute the generated code */ -#if defined(__sparc__) && !defined(HOST_SOLARIS) +#if defined(__sparc__) && !defined(CONFIG_SOLARIS) #undef env env = cpu_single_env; #define env cpu_single_env @@ -1425,7 +1425,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, siginfo_t *info = pinfo; int is_write; uint32_t insn; -#if !defined(__arch64__) || defined(HOST_SOLARIS) +#if !defined(__arch64__) || defined(CONFIG_SOLARIS) uint32_t *regs = (uint32_t *)(info + 1); void *sigmask = (regs + 20); /* XXX: is there a standard glibc define ? */ |