mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-07-27 12:23:53 -06:00
change HOST_SOLARIS to CONFIG_SOLARIS{_VERSION}
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
a8cd70fc4e
commit
dfe5fff3ea
10 changed files with 28 additions and 23 deletions
10
cpu-exec.c
10
cpu-exec.c
|
@ -38,7 +38,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
|
||||
|
@ -258,7 +258,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
|
||||
|
@ -414,7 +414,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
|
||||
|
@ -644,7 +644,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
|
||||
|
@ -1435,7 +1435,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 ? */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue