mirror of https://github.com/proxmox/mirror_qemu
d9bb73d8e3
Fixes the Windows build under msys2 using GCC 12 which fails with the following
error:
[184/579] Compiling C++ object qga/vss-win32/qga-vss.dll.p/install.cpp.obj
FAILED: qga/vss-win32/qga-vss.dll.p/install.cpp.obj
"c++" "-m64" "-mcx16" "-Iqga/vss-win32/qga-vss.dll.p" "-Iqga/vss-win32" "-I../src/qga/vss-win32" "-I." "-Iqapi" "-Itrace" "-Iui" "-Iui/shader" "-IC:/msys64/mingw64/include/glib-2.0" "-IC:/msys64/mingw64/lib/glib-2.0/include" "-fdiagnostics-color=auto" "-Wall" "-Winvalid-pch" "-Wnon-virtual-dtor" "-Werror" "-std=gnu++11" "-g" "-iquote" "." "-iquote" "C:/msys64/home/shentey/Projects/qemu/src" "-iquote" "C:/msys64/home/shentey/Projects/qemu/src/include" "-iquote" "C:/msys64/home/shentey/Projects/qemu/src/tcg/i386" "-D__STDC_LIMIT_MACROS" "-D__STDC_CONSTANT_MACROS" "-D__STDC_FORMAT_MACROS" "-fno-pie" "-no-pie" "-D_GNU_SOURCE" "-D_FILE_OFFSET_BITS=64" "-D_LARGEFILE_SOURCE" "-fno-strict-aliasing" "-fno-common" "-fwrapv" "-Wundef" "-Wwrite-strings" "-Wtype-limits" "-Wformat-security" "-Wformat-y2k" "-Winit-self" "-Wignored-qualifiers" "-Wempty-body" "-Wendif-labels" "-Wexpansion-to-defined" "-Wimplicit-fallthrough=2" "-Wmissing-format-attribute" "-Wno-missing-include-dirs" "-Wno-shift-negative-value" "-Wno-psabi" "-fstack-protector-strong" "-Wno-unknown-pragmas" "-Wno-delete-non-virtual-dtor" "-Wno-non-virtual-dtor" -MD -MQ qga/vss-win32/qga-vss.dll.p/install.cpp.obj -MF "qga/vss-win32/qga-vss.dll.p/install.cpp.obj.d" -o qga/vss-win32/qga-vss.dll.p/install.cpp.obj "-c" ../src/qga/vss-win32/install.cpp
In file included from C:/msys64/mingw64/lib/glib-2.0/include/glibconfig.h:9,
from C:/msys64/mingw64/include/glib-2.0/glib/gtypes.h:34,
from C:/msys64/mingw64/include/glib-2.0/glib/galloca.h:34,
from C:/msys64/mingw64/include/glib-2.0/glib.h:32,
from C:/msys64/home/shentey/Projects/qemu/src/include/glib-compat.h:32,
from C:/msys64/home/shentey/Projects/qemu/src/include/qemu/osdep.h:144,
from ../src/qga/vss-win32/install.cpp:13:
C:/msys64/mingw64/include/glib-2.0/glib/gmacros.h:1075:21: error: standard attributes in middle of decl-specifiers
1075 | # define G_NORETURN [[noreturn]]
| ^
C:/msys64/home/shentey/Projects/qemu/src/include/qemu/osdep.h:240:8: note: in expansion of macro 'G_NORETURN'
240 | extern G_NORETURN
| ^~~~~~~~~~
C:/msys64/mingw64/include/glib-2.0/glib/gmacros.h:1075:21: note: standard attributes must precede the decl-specifiers to apply to the declaration, or follow them to apply to the type
1075 | # define G_NORETURN [[noreturn]]
| ^
C:/msys64/home/shentey/Projects/qemu/src/include/qemu/osdep.h:240:8: note: in expansion of macro 'G_NORETURN'
240 | extern G_NORETURN
| ^~~~~~~~~~
C:/msys64/mingw64/include/glib-2.0/glib/gmacros.h:1075:21: error: attribute ignored [-Werror=attributes]
1075 | # define G_NORETURN [[noreturn]]
| ^
C:/msys64/home/shentey/Projects/qemu/src/include/qemu/osdep.h:240:8: note: in expansion of macro 'G_NORETURN'
240 | extern G_NORETURN
| ^~~~~~~~~~
C:/msys64/mingw64/include/glib-2.0/glib/gmacros.h:1075:21: note: an attribute that appertains to a type-specifier is ignored
1075 | # define G_NORETURN [[noreturn]]
| ^
C:/msys64/home/shentey/Projects/qemu/src/include/qemu/osdep.h:240:8: note: in expansion of macro 'G_NORETURN'
240 | extern G_NORETURN
| ^~~~~~~~~~
cc1plus.exe: all warnings being treated as errors
Apparently it also fixes the compilation with Clang 15 (see
https://gitlab.com/qemu-project/qemu/-/issues/1541 ).
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1541
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Message-Id: <20230318185931.181659-1-shentey@gmail.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
(cherry picked from commit
|
||
|---|---|---|
| .. | ||
| accel.h | ||
| async-teardown.h | ||
| atomic.h | ||
| atomic128.h | ||
| base64.h | ||
| bcd.h | ||
| bitmap.h | ||
| bitops.h | ||
| bswap.h | ||
| buffer.h | ||
| cacheflush.h | ||
| cacheinfo.h | ||
| co-shared-resource.h | ||
| compiler.h | ||
| config-file.h | ||
| coroutine-tls.h | ||
| coroutine.h | ||
| coroutine_int.h | ||
| cpu-float.h | ||
| cpuid.h | ||
| crc-ccitt.h | ||
| crc32c.h | ||
| ctype.h | ||
| cutils.h | ||
| datadir.h | ||
| dbus.h | ||
| drm.h | ||
| envlist.h | ||
| error-report.h | ||
| event_notifier.h | ||
| fifo8.h | ||
| fifo32.h | ||
| filemonitor.h | ||
| futex.h | ||
| guest-random.h | ||
| hbitmap.h | ||
| help-texts.h | ||
| help_option.h | ||
| host-utils.h | ||
| hw-version.h | ||
| id.h | ||
| int128.h | ||
| iov.h | ||
| iova-tree.h | ||
| jhash.h | ||
| job.h | ||
| keyval.h | ||
| lockable.h | ||
| log-for-trace.h | ||
| log.h | ||
| madvise.h | ||
| main-loop.h | ||
| memalign.h | ||
| memfd.h | ||
| mmap-alloc.h | ||
| module.h | ||
| mprotect.h | ||
| notify.h | ||
| nvdimm-utils.h | ||
| option.h | ||
| option_int.h | ||
| osdep.h | ||
| path.h | ||
| plugin-memory.h | ||
| plugin.h | ||
| pmem.h | ||
| processor.h | ||
| progress_meter.h | ||
| qdist.h | ||
| qemu-options.h | ||
| qemu-plugin.h | ||
| qemu-print.h | ||
| qemu-progress.h | ||
| qht.h | ||
| qsp.h | ||
| queue.h | ||
| range.h | ||
| ratelimit.h | ||
| rcu.h | ||
| rcu_queue.h | ||
| readline.h | ||
| selfmap.h | ||
| seqlock.h | ||
| sockets.h | ||
| stats64.h | ||
| sys_membarrier.h | ||
| systemd.h | ||
| thread-context.h | ||
| thread-posix.h | ||
| thread-win32.h | ||
| thread.h | ||
| throttle-options.h | ||
| throttle.h | ||
| timed-average.h | ||
| timer.h | ||
| transactions.h | ||
| tsan.h | ||
| typedefs.h | ||
| unicode.h | ||
| units.h | ||
| uri.h | ||
| userfaultfd.h | ||
| uuid.h | ||
| vfio-helpers.h | ||
| vhost-user-server.h | ||
| win_dump_defs.h | ||
| xattr.h | ||
| xxhash.h | ||
| yank.h | ||