devicetree-compiler.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
To: devicetree-compiler-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: dgibson-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
Subject: [PATCH] fix libfdt_env.h for RHEL7
Date: Fri,  3 Mar 2017 17:29:57 +0100	[thread overview]
Message-ID: <1488558597-21364-1-git-send-email-pbonzini@redhat.com> (raw)

RHEL7 defines __bitwise to "__bitwise__" in /usr/include/linux/types.h.
Because QEMU uses -Werror, the redefinition of the macro in libfdt_env.h
is is causing QEMU's build to fail when it includes libfdt.h.

This is the minimal fix, but a better one in the long term is probably
to define libfdt-specific macros LIBFDT_FORCE and LIBFDT_BITWISE.

Signed-off-by: Paolo Bonzini <pbonzini-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
	David, it would be nice to have this in QEMU 2.9 but I
	am not sure of the mechanics of that.

 libfdt/libfdt_env.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libfdt/libfdt_env.h b/libfdt/libfdt_env.h
index 9dea97d..2cf0826 100644
--- a/libfdt/libfdt_env.h
+++ b/libfdt/libfdt_env.h
@@ -60,6 +60,8 @@
 #define __force __attribute__((force))
 #define __bitwise __attribute__((bitwise))
 #else
+#undef __force
+#undef __bitwise
 #define __force
 #define __bitwise
 #endif
-- 
1.8.3.1

             reply	other threads:[~2017-03-03 16:29 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-03 16:29 Paolo Bonzini [this message]
     [not found] ` <1488558597-21364-1-git-send-email-pbonzini-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2017-03-06  1:25   ` [PATCH] fix libfdt_env.h for RHEL7 David Gibson
     [not found]     ` <20170306122557.71669b69-K0bRW+63XPQe6aEkudXLsA@public.gmane.org>
2017-03-06 12:52       ` Paolo Bonzini
     [not found]         ` <88992ad1-f92f-7006-3b78-6b2e631f4110-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2017-03-08  1:44           ` David Gibson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1488558597-21364-1-git-send-email-pbonzini@redhat.com \
    --to=pbonzini-h+wxahxf7alqt0dzr+alfa@public.gmane.org \
    --cc=devicetree-compiler-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=dgibson-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).