Commit 0f98c994 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2018-12-12' into staging 



- Explicitly check for minimum compiler versions
- Remove obsolete code for old compilers that is now not required anymore
- Fix a duplicated typedef for Clang 3.4

# gpg: Signature made Wed 12 Dec 2018 09:05:50 GMT
# gpg:                using RSA key 2ED9D774FE702DB5
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>"
# gpg:                 aka "Thomas Huth <thuth@redhat.com>"
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>"
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>"
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* remotes/huth-gitlab/tags/pull-request-2018-12-12:
  i2c: Move typedef of bitbang_i2c_interface to i2c.h
  Remove QEMU_ARTIFICIAL macro
  includes: Replace QEMU_GNUC_PREREQ with "__has_builtin || !defined(__clang__)"
  audio/alsaaudio: Remove compiler check around pragma
  tcg/tcg.h: Remove GCC check for tcg_debug_assert() macro
  configure: Remove old -fno-gcse workaround for GCC 4.6.x and 4.7.[012]
  configure: Remove obsolete check for Clang < 3.2
  configure: Add a test for the minimum compiler version

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents d8d5fefd 2b4c1125

Makefile.target

+0 −3
Original line number Diff line number Diff line
@@ -158,9 +158,6 @@ GENERATED_FILES += hmp-commands.h hmp-commands-info.h 


endif # CONFIG_SOFTMMU



# Workaround for http://gcc.gnu.org/PR55489, see configure.

%/translate.o: QEMU_CFLAGS += $(TRANSLATE_OPT_CFLAGS)



dummy := $(call unnest-vars,,obj-y)

all-obj-y := $(obj-y)

audio/alsaaudio.c

+0 −2
Original line number Diff line number Diff line
@@ -28,9 +28,7 @@ 
#include "audio.h"

#include "trace.h"



#if QEMU_GNUC_PREREQ(4, 3)

#pragma GCC diagnostic ignored "-Waddress"

#endif



#define AUDIO_CAP "alsa"

#include "audio_int.h"

configure

+26 −21
Original line number Diff line number Diff line
@@ -1840,6 +1840,31 @@ if test "$bogus_os" = "yes"; then 
    error_exit "Unrecognized host OS (uname -s reports '$(uname -s)')"

fi



# Check whether the compiler matches our minimum requirements:

cat > $TMPC << EOF

#if defined(__clang_major__) && defined(__clang_minor__)

# ifdef __apple_build_version__

#  if __clang_major__ < 5 || (__clang_major__ == 5 && __clang_minor__ < 1)

#   error You need at least XCode Clang v5.1 to compile QEMU

#  endif

# else

#  if __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 4)

#   error You need at least Clang v3.4 to compile QEMU

#  endif

# endif

#elif defined(__GNUC__) && defined(__GNUC_MINOR__)

# if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8)

#  error You need at least GCC v4.8 to compile QEMU

# endif

#else

# error You either need GCC or Clang to compiler QEMU

#endif

int main (void) { return 0; }

EOF

if ! compile_prog "" "" ; then

    error_exit "You need at least GCC v4.8 or Clang v3.4 (or XCode Clang v5.1)"

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"
@@ -1911,21 +1936,7 @@ else 
  QEMU_CFLAGS="$QEMU_CFLAGS -Wno-missing-braces"

fi



# Workaround for http://gcc.gnu.org/PR55489.  Happens with -fPIE/-fPIC and

# large functions that use global variables.  The bug is in all releases of

# GCC, but it became particularly acute in 4.6.x and 4.7.x.  It is fixed in

# 4.7.3 and 4.8.0.  We should be able to delete this at the end of 2013.

cat > $TMPC << EOF

#if __GNUC__ == 4 && (__GNUC_MINOR__ == 6 || (__GNUC_MINOR__ == 7 && __GNUC_PATCHLEVEL__ <= 2))

int main(void) { return 0; }

#else

#error No bug in this compiler.

#endif

EOF

if compile_prog "-Werror -fno-gcse" "" ; then

  TRANSLATE_OPT_CFLAGS=-fno-gcse

fi



# Static linking is not possible with modules or PIE

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

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

    error_exit "static and modules are mutually incompatible"
@@ -5123,11 +5134,6 @@ fi 


int128=no

cat > $TMPC << EOF

#if defined(__clang_major__) && defined(__clang_minor__)

# if ((__clang_major__ < 3) || (__clang_major__ == 3) && (__clang_minor__ < 2))

#  error __int128_t does not work in CLANG before 3.2

# endif

#endif

__int128_t a;

__uint128_t b;

int main (void) {
@@ -6963,7 +6969,6 @@ echo "LIBS_QGA+=$libs_qga" >> $config_host_mak 
echo "TASN1_LIBS=$tasn1_libs" >> $config_host_mak

echo "TASN1_CFLAGS=$tasn1_cflags" >> $config_host_mak

echo "POD2MAN=$POD2MAN" >> $config_host_mak

echo "TRANSLATE_OPT_CFLAGS=$TRANSLATE_OPT_CFLAGS" >> $config_host_mak

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

  echo "CONFIG_GCOV=y" >> $config_host_mak

  echo "GCOV=$gcov_tool" >> $config_host_mak

hw/i2c/bitbang_i2c.h

+0 −2
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 


#include "hw/i2c/i2c.h"



typedef struct bitbang_i2c_interface bitbang_i2c_interface;



#define BITBANG_I2C_SDA 0

#define BITBANG_I2C_SCL 1

include/hw/i2c/i2c.h

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ int i2c_recv(I2CBus *bus); 


DeviceState *i2c_create_slave(I2CBus *bus, const char *name, uint8_t addr);



typedef struct bitbang_i2c_interface bitbang_i2c_interface;



/* lm832x.c */

void lm832x_key_event(DeviceState *dev, int key, int state);