Commit 2a8469aa authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging 



# gpg: Signature made Wed 07 Jun 2017 19:06:51 BST
# gpg:                using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  configure: split c and cxx extra flags
  coroutine-lock: do not touch coroutine after another one has been entered
  .gdbinit: load QEMU sub-commands when gdb starts
  coccinelle: fix typo in comment
  oslib: strip trailing '\n' from error_setg() string argument

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 475df9d8 11cde1c8

.gdbinit

0 → 100644
+8 −0
Original line number Diff line number Diff line 
# GDB may have ./.gdbinit loading disabled by default.  In that case you can

# follow the instructions it prints.  They boil down to adding the following to

# your home directory's ~/.gdbinit file:

#

#   add-auto-load-safe-path /path/to/qemu/.gdbinit



# Load QEMU-specific sub-commands and settings

source scripts/qemu-gdb.py

configure

+43 −32
Original line number Diff line number Diff line
@@ -91,7 +91,8 @@ update_cxxflags() { 
    # Set QEMU_CXXFLAGS from QEMU_CFLAGS by filtering out those

    # options which some versions of GCC's C++ compiler complain about

    # because they only make sense for C programs.

    QEMU_CXXFLAGS=

    QEMU_CXXFLAGS="$QEMU_CXXFLAGS -D__STDC_LIMIT_MACROS"



    for arg in $QEMU_CFLAGS; do

        case $arg in

            -Wstrict-prototypes|-Wmissing-prototypes|-Wnested-externs|\
@@ -345,6 +346,9 @@ for opt do 
  --extra-cflags=*) QEMU_CFLAGS="$QEMU_CFLAGS $optarg"

                    EXTRA_CFLAGS="$optarg"

  ;;

  --extra-cxxflags=*) QEMU_CXXFLAGS="$QEMU_CXXFLAGS $optarg"

                      EXTRA_CXXFLAGS="$optarg"

  ;;

  --extra-ldflags=*) LDFLAGS="$LDFLAGS $optarg"

                     EXTRA_LDFLAGS="$optarg"

  ;;
@@ -788,6 +792,8 @@ for opt do 
  ;;

  --extra-cflags=*)

  ;;

  --extra-cxxflags=*)

  ;;

  --extra-ldflags=*)

  ;;

  --enable-debug-info)
@@ -1305,6 +1311,7 @@ Advanced options (experts only): 
  --cxx=CXX                use C++ compiler CXX [$cxx]

  --objcc=OBJCC            use Objective-C compiler OBJCC [$objcc]

  --extra-cflags=CFLAGS    append extra C compiler flags QEMU_CFLAGS

  --extra-cxxflags=CXXFLAGS append extra C++ compiler flags QEMU_CXXFLAGS

  --extra-ldflags=LDFLAGS  append extra linker flags LDFLAGS

  --make=MAKE              use specified make [$make]

  --install=INSTALL        use specified install [$install]
@@ -1490,37 +1497,6 @@ if test "$bogus_os" = "yes"; then 
    error_exit "Unrecognized host OS $targetos"

fi



# Check that the C++ compiler exists and works with the C compiler

if has $cxx; then

    cat > $TMPC <<EOF

int c_function(void);

int main(void) { return c_function(); }

EOF



    compile_object



    cat > $TMPCXX <<EOF

extern "C" {

   int c_function(void);

}

int c_function(void) { return 42; }

EOF



    update_cxxflags



    if do_cxx $QEMU_CXXFLAGS -o $TMPE $TMPCXX $TMPO $LDFLAGS; then

        # C++ compiler $cxx works ok with C compiler $cc

        :

    else

        echo "C++ compiler $cxx does not work with C compiler $cc"

        echo "Disabling C++ specific optional code"

        cxx=

    fi

else

    echo "No C++ compiler available; disabling C++ specific optional code"

    cxx=

fi



gcc_flags="-Wold-style-declaration -Wold-style-definition -Wtype-limits"

gcc_flags="-Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers $gcc_flags"

gcc_flags="-Wno-missing-include-dirs -Wempty-body -Wnested-externs $gcc_flags"
@@ -5064,6 +5040,38 @@ EOF 
  fi

fi



# Check that the C++ compiler exists and works with the C compiler.

# All the QEMU_CXXFLAGS are based on QEMU_CFLAGS. Keep this at the end to don't miss any other that could be added.

if has $cxx; then

    cat > $TMPC <<EOF

int c_function(void);

int main(void) { return c_function(); }

EOF



    compile_object



    cat > $TMPCXX <<EOF

extern "C" {

   int c_function(void);

}

int c_function(void) { return 42; }

EOF



    update_cxxflags



    if do_cxx $QEMU_CXXFLAGS -o $TMPE $TMPCXX $TMPO $LDFLAGS; then

        # C++ compiler $cxx works ok with C compiler $cc

        :

    else

        echo "C++ compiler $cxx does not work with C compiler $cc"

        echo "Disabling C++ specific optional code"

        cxx=

    fi

else

    echo "No C++ compiler available; disabling C++ specific optional code"

    cxx=

fi



echo_version() {

    if test "$1" = "yes" ; then

        echo "($2)"
@@ -5269,6 +5277,7 @@ if test "$mingw32" = "no" ; then 
fi

echo "qemu_helperdir=$libexecdir" >> $config_host_mak

echo "extra_cflags=$EXTRA_CFLAGS" >> $config_host_mak

echo "extra_cxxflags=$EXTRA_CXXFLAGS" >> $config_host_mak

echo "extra_ldflags=$EXTRA_LDFLAGS" >> $config_host_mak

echo "qemu_localedir=$qemu_localedir" >> $config_host_mak

echo "libs_softmmu=$libs_softmmu" >> $config_host_mak
@@ -5911,6 +5920,7 @@ echo "WINDRES=$windres" >> $config_host_mak 
echo "CFLAGS=$CFLAGS" >> $config_host_mak

echo "CFLAGS_NOPIE=$CFLAGS_NOPIE" >> $config_host_mak

echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak

echo "QEMU_CXXFLAGS=$QEMU_CXXFLAGS" >> $config_host_mak

echo "QEMU_INCLUDES=$QEMU_INCLUDES" >> $config_host_mak

if test "$sparse" = "yes" ; then

  echo "CC           := REAL_CC=\"\$(CC)\" cgcc"       >> $config_host_mak
@@ -6376,6 +6386,7 @@ FILES="$FILES pc-bios/spapr-rtas/Makefile" 
FILES="$FILES pc-bios/s390-ccw/Makefile"

FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile"

FILES="$FILES pc-bios/qemu-icon.bmp"

FILES="$FILES .gdbinit scripts" # scripts needed by relative path in .gdbinit

for bios_file in \

    $source_path/pc-bios/*.bin \

    $source_path/pc-bios/*.lid \

disas/libvixl/Makefile.objs

+2 −2
Original line number Diff line number Diff line
@@ -6,9 +6,9 @@ libvixl_OBJS = vixl/utils.o \ 


# The -Wno-sign-compare is needed only for gcc 4.6, which complains about

# some signed-unsigned equality comparisons which later gcc versions do not.

$(addprefix $(obj)/,$(libvixl_OBJS)): QEMU_CFLAGS := -I$(SRC_PATH)/disas/libvixl $(QEMU_CFLAGS) -Wno-sign-compare

$(addprefix $(obj)/,$(libvixl_OBJS)): QEMU_CXXFLAGS := -I$(SRC_PATH)/disas/libvixl $(QEMU_CXXFLAGS) -Wno-sign-compare

# Ensure that C99 macros are defined regardless of the inclusion order of

# headers in vixl. This is required at least on NetBSD.

$(addprefix $(obj)/,$(libvixl_OBJS)): QEMU_CFLAGS += -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS

$(addprefix $(obj)/,$(libvixl_OBJS)): QEMU_CXXFLAGS += -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS



common-obj-$(CONFIG_ARM_A64_DIS) += $(libvixl_OBJS)

rules.mak

+0 −3
Original line number Diff line number Diff line
@@ -20,9 +20,6 @@ MAKEFLAGS += -rR 
%.mak:

clean-target:



# Flags for C++ compilation

QEMU_CXXFLAGS = -D__STDC_LIMIT_MACROS $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wold-style-declaration -Wold-style-definition -Wredundant-decls, $(QEMU_CFLAGS))



# Flags for dependency generation

QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(@D)/$(*F).d

scripts/coccinelle/return_directly.cocci

+1 −1
Original line number Diff line number Diff line 
// replace 'R = X; return R;' with 'return R;'

// replace 'R = X; return R;' with 'return X;'

@@

identifier VAR;

expression E;