diff options
| author | Peter Maydell | 2020-07-13 14:01:30 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-07-13 14:01:30 +0200 |
| commit | 00ce6c36b35e0eb8cc5d68a28f288a6335848813 (patch) | |
| tree | ca25062dd798548f1c0bfe53e8dc278de5beaf32 /scripts/decodetree.py | |
| parent | Merge remote-tracking branch 'remotes/elmarco/tags/chardev-pull-request' into... (diff) | |
| parent | docs/system/s390x: Improve the 3270 documentation (diff) | |
| download | qemu-00ce6c36b35e0eb8cc5d68a28f288a6335848813.tar.gz qemu-00ce6c36b35e0eb8cc5d68a28f288a6335848813.tar.xz qemu-00ce6c36b35e0eb8cc5d68a28f288a6335848813.zip | |
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2020-07-13' into staging
* Some fuzzer related fixes
* Fixes / improvements for the "configure" script
* Doc updates
* Gitlab pipeline-status script
# gpg: Signature made Mon 13 Jul 2020 11:48:32 BST
# gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg: issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg: aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5
* remotes/huth-gitlab/tags/pull-request-2020-07-13:
docs/system/s390x: Improve the 3270 documentation
GitLab Gating CI: introduce pipeline-status contrib script
disas/sh4: Add missing fallthrough annotations
Remove the CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE switch
docs/devel/fuzzing: Fix bugs in documentation
tests/qtest/fuzz: Add missing spaces in description
fuzz: add missing header for rcu_enable_atfork
configure: do not clobber CFLAGS with --enable-fuzzing
configure: fix malloc check
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/decodetree.py')
| -rwxr-xr-x | scripts/decodetree.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/scripts/decodetree.py b/scripts/decodetree.py index 530d41ca62..694757b6c2 100755 --- a/scripts/decodetree.py +++ b/scripts/decodetree.py @@ -1327,12 +1327,10 @@ def main(): # but we can't tell which ones. Prevent issues from the compiler by # suppressing redundant declaration warnings. if anyextern: - output("#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE\n", - "# pragma GCC diagnostic push\n", - "# pragma GCC diagnostic ignored \"-Wredundant-decls\"\n", - "# ifdef __clang__\n" + output("#pragma GCC diagnostic push\n", + "#pragma GCC diagnostic ignored \"-Wredundant-decls\"\n", + "#ifdef __clang__\n" "# pragma GCC diagnostic ignored \"-Wtypedef-redefinition\"\n", - "# endif\n", "#endif\n\n") out_pats = {} @@ -1347,9 +1345,7 @@ def main(): output('\n') if anyextern: - output("#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE\n", - "# pragma GCC diagnostic pop\n", - "#endif\n\n") + output("#pragma GCC diagnostic pop\n\n") for n in sorted(formats.keys()): f = formats[n] |