[PULL,01/27] libvixl: Correct build failures on NetBSD

Message ID	1496337035-30213-2-git-send-email-peter.maydell@linaro.org
State	Accepted
Commit	993063fbb531d11f7ede59e5264308eafa6ee4ff
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Thu, 1 Jun 2017 18:10:09 +0100 Message-Id: <1496337035-30213-2-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1496337035-30213-1-git-send-email-peter.maydell@linaro.org> References: <1496337035-30213-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL 01/27] libvixl: Correct build failures on NetBSD Precedence: list Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>
Series	target-arm queue \| expand [PULL,00/27] target-arm queue [PULL,01/27] libvixl: Correct build failures on NetBSD [PULL,02/27] load_uboot_image: don't assume a full header read [PULL,03/27] hw/intc/arm_gicv3_cpuif: Fix reset value for VMCR_EL2.VBPR1 [PULL,04/27] hw/intc/arm_gicv3_cpuif: Don't let BPR be set below its minimum [PULL,05/27] hw/intc/arm_gicv3_cpuif: Fix priority masking for NS BPR1 [PULL,06/27] target/arm: clear PMUVER field of AA64DFR0 when vPMU=off [PULL,07/27] arm: Use the mmu_idx we're passed in arm_cpu_do_unaligned_access() [PULL,08/27] arm: Add support for M profile CPUs having different MMU index semantics [PULL,09/27] arm: Use different ARMMMUIdx values for M profile [PULL,10/27] arm: Clean up handling of no-MPU PMSA CPUs [PULL,11/27] arm: Don't clear ARM_FEATURE_PMSA for no-mpu configs [PULL,12/27] arm: Don't let no-MPU PMSA cores write to SCTLR.M [PULL,13/27] arm: Remove unnecessary check on cpu->pmsav7_dregion [PULL,14/27] armv7m: Improve "-d mmu" tracing for PMSAv7 MPU [PULL,15/27] armv7m: Implement M profile default memory map [PULL,16/27] arm: All M profile cores are PMSA [PULL,17/27] armv7m: Classify faults as MemManage or BusFault [PULL,18/27] arm: add MPU support to M profile CPUs [PULL,19/27] arm: Implement HFNMIENA support for M profile MPU [PULL,20/27] aspeed/i2c: improve command handling [PULL,21/27] aspeed/i2c: handle LAST command under the RX command [PULL,22/27] aspeed/i2c: introduce a state machine [PULL,23/27] aspeed: add some I2C devices to the Aspeed machines [PULL,24/27] hw/misc: add a TMP42{1, 2, 3} device model [PULL,25/27] aspeed: add a temp sensor device on I2C bus 3 [PULL,26/27] hw/arm/virt-acpi-build: build SLIT when needed [PULL,27/27] hw/arm/virt: fdt: generate distance-map when needed

Message ID

1496337035-30213-2-git-send-email-peter.maydell@linaro.org

State

Accepted

Commit

993063fbb531d11f7ede59e5264308eafa6ee4ff

Headers

Received-SPF: pass (google.com: domain of
	qemu-devel-bounces+patch=linaro.org@nongnu.org designates
	2001:4830:134:3::11 as permitted sender)
	client-ip=2001:4830:134:3::11; 
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Date: Thu,  1 Jun 2017 18:10:09 +0100
Message-Id: <1496337035-30213-2-git-send-email-peter.maydell@linaro.org>
In-Reply-To: <1496337035-30213-1-git-send-email-peter.maydell@linaro.org>
References: <1496337035-30213-1-git-send-email-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PULL 01/27] libvixl: Correct build failures on NetBSD
Precedence: list
Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>

Series

target-arm queue | expand

Commit Message

Peter Maydell June 1, 2017, 5:10 p.m. UTC

From: Kamil Rytarowski <n54@gmx.com>


Ensure that C99 macros are defined regardless of the inclusion order of
headers in vixl. This is required at least on NetBSD.

The vixl/globals.h headers defines __STDC_CONSTANT_MACROS and must be
included before other system headers.

This file defines unconditionally the following macros, without altering
the original sources:
 - __STDC_CONSTANT_MACROS
 - __STDC_LIMIT_MACROS
 - __STDC_FORMAT_MACROS

Signed-off-by: Kamil Rytarowski <n54@gmx.com>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Message-id: 20170514051820.15985-1-n54@gmx.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

---
 disas/libvixl/Makefile.objs | 3 +++
 1 file changed, 3 insertions(+)

-- 
2.7.4

diff --git a/disas/libvixl/Makefile.objs b/disas/libvixl/Makefile.objs
index bbe7695..860fb7f 100644
--- a/disas/libvixl/Makefile.objs
+++ b/disas/libvixl/Makefile.objs
@@ -7,5 +7,8 @@  libvixl_OBJS = vixl/utils.o \
 # The -Wno-sign-compare is needed only for gcc 4.6, which complains about
 # some signed-unsigned equality comparisons which later gcc versions do not.
 $(addprefix $(obj)/,$(libvixl_OBJS)): QEMU_CFLAGS := -I$(SRC_PATH)/disas/libvixl $(QEMU_CFLAGS) -Wno-sign-compare
+# Ensure that C99 macros are defined regardless of the inclusion order of
+# headers in vixl. This is required at least on NetBSD.
+$(addprefix $(obj)/,$(libvixl_OBJS)): QEMU_CFLAGS += -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS
 
 common-obj-$(CONFIG_ARM_A64_DIS) += $(libvixl_OBJS)

[PULL,01/27] libvixl: Correct build failures on NetBSD

Commit Message

Patch