Commit bdd90227 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

include: poison symbols in osdep.h 



Ensure that all target-independent files ignore poisoned symbols,
and fix the fallout.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d613f8cc

hw/core/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ common-obj-y += fw-path-provider.o 
# irq.o needed for qdev GPIO handling:

common-obj-y += irq.o

common-obj-y += hotplug.o

common-obj-y += nmi.o

obj-y += nmi.o



common-obj-$(CONFIG_EMPTY_SLOT) += empty_slot.o

common-obj-$(CONFIG_XILINX_AXI) += stream.o

include/exec/cpu-common.h

+0 −4
Original line number Diff line number Diff line
@@ -7,10 +7,6 @@ 
#include "exec/hwaddr.h"

#endif



#ifndef NEED_CPU_H

#include "exec/poison.h"

#endif



#include "qemu/bswap.h"

#include "qemu/queue.h"

#include "qemu/fprintf-fn.h"

include/exec/helper-head.h

+13 −10
Original line number Diff line number Diff line
@@ -33,17 +33,9 @@ 
#define dh_alias_s64 i64

#define dh_alias_f32 i32

#define dh_alias_f64 i64

#ifdef TARGET_LONG_BITS

# if TARGET_LONG_BITS == 32

#  define dh_alias_tl i32

# else

#  define dh_alias_tl i64

# endif

#endif

#define dh_alias_ptr ptr

#define dh_alias_void void

#define dh_alias_noreturn noreturn

#define dh_alias_env ptr

#define dh_alias(t) glue(dh_alias_, t)



#define dh_ctype_i32 uint32_t
@@ -53,13 +45,24 @@ 
#define dh_ctype_s64 int64_t

#define dh_ctype_f32 float32

#define dh_ctype_f64 float64

#define dh_ctype_tl target_ulong

#define dh_ctype_ptr void *

#define dh_ctype_void void

#define dh_ctype_noreturn void QEMU_NORETURN

#define dh_ctype_env CPUArchState *

#define dh_ctype(t) dh_ctype_##t



#ifdef NEED_CPU_H

# ifdef TARGET_LONG_BITS

#  if TARGET_LONG_BITS == 32

#   define dh_alias_tl i32

#  else

#   define dh_alias_tl i64

#  endif

# endif

# define dh_alias_env ptr

# define dh_ctype_tl target_ulong

# define dh_ctype_env CPUArchState *

#endif



/* We can't use glue() here because it falls foul of C preprocessor

   recursive expansion rules.  */

#define dh_retvar_decl0_void void

include/qemu/osdep.h

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
#include "config-host.h"

#ifdef NEED_CPU_H

#include "config-target.h"

#else

#include "exec/poison.h"

#endif

#include "qemu/compiler.h"

scripts/create_config

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ case $line in 
    done

    echo "    NULL"

    ;;

 CONFIG_*=y) # configuration

 CONFIG_*='$(CONFIG_SOFTMMU)'|CONFIG_*=y) # configuration

    name=${line%=*}

    echo "#define $name 1"

    ;;