[PATCH] fix libfdt_env.h for RHEL7

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]



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@xxxxxxxxxx>
---
	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

--
To unsubscribe from this list: send the line "unsubscribe devicetree-compiler" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Device Tree]     [Device Tree Spec]     [Linux Driver Backports]     [Video for Linux]     [Linux USB Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]

  Powered by Linux