[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 05/11] tests/plugins: don't unconditionally add -Wpsabi
From: |
Thomas Huth |
Subject: |
Re: [PATCH v2 05/11] tests/plugins: don't unconditionally add -Wpsabi |
Date: |
Tue, 14 Jul 2020 07:31:29 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 |
On 13/07/2020 22.04, Alex Bennée wrote:
> Not all compilers support the -Wpsabi (clang-9 in my case). To handle
> this gracefully we pare back the shared build machinery so the
> Makefile is relatively "standalone". We still take advantage of
> config-host.mak as configure has done a bunch of probing for us but
> that is it.
>
> Fixes: bac8d222a
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>
> ---
> v2
> - separate from main build system and check probe
> ---
> configure | 3 +++
> tests/plugin/Makefile | 22 ++++++++++++++++++----
> 2 files changed, 21 insertions(+), 4 deletions(-)
>
> diff --git a/configure b/configure
> index e1de2f5b24..08eaa99d19 100755
> --- a/configure
> +++ b/configure
> @@ -7112,6 +7112,9 @@ echo "GIT_UPDATE=$git_update" >> $config_host_mak
>
> echo "ARCH=$ARCH" >> $config_host_mak
>
> +echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak
> +echo "GLIB_LDFLAGS=$glib_ldflags" >> $config_host_mak
> +
> if test "$default_devices" = "yes" ; then
> echo "CONFIG_MINIKCONF_MODE=--defconfig" >> $config_host_mak
> else
> diff --git a/tests/plugin/Makefile b/tests/plugin/Makefile
> index 3a50451428..e9348fde4a 100644
> --- a/tests/plugin/Makefile
> +++ b/tests/plugin/Makefile
> @@ -1,9 +1,16 @@
> +# -*- Mode: makefile -*-
> +#
> +# This Makefile example is fairly independent from the main makefile
> +# so users can take and adapt it for their build. We only really
> +# include config-host.mak so we don't have to repeat probing for
> +# cflags that the main configure has already done for us.
> +#
> +
> BUILD_DIR := $(CURDIR)/../..
>
> include $(BUILD_DIR)/config-host.mak
> -include $(SRC_PATH)/rules.mak
>
> -$(call set-vpath, $(SRC_PATH)/tests/plugin)
> +VPATH += $(SRC_PATH)/tests/plugin
>
> NAMES :=
> NAMES += bb
> @@ -17,11 +24,18 @@ NAMES += lockstep
>
> SONAMES := $(addsuffix .so,$(addprefix lib,$(NAMES)))
>
> -QEMU_CFLAGS += -fPIC -Wpsabi
> -QEMU_CFLAGS += -I$(SRC_PATH)/include/qemu
> +# The main QEMU uses Glib extensively so it's perfectly fine to use it
> +# in plugins (which many example do).
> +CFLAGS = $(GLIB_CFLAGS)
> +CFLAGS += -fPIC
> +CFLAGS += $(if $(findstring no-psabi,$(QEMU_CFLAGS)),-Wpsabi)
> +CFLAGS += -I$(SRC_PATH)/include/qemu
>
> all: $(SONAMES)
>
> +%.o: %.c
> + $(CC) $(CFLAGS) -c -o $@ $<
> +
> lib%.so: %.o
> $(CC) -shared -Wl,-soname,$@ -o $@ $^ $(LDLIBS)
>
>
Reviewed-by: Thomas Huth <thuth@redhat.com>
- [PATCH v2 00/11] misc fixes for rc0 (docker, plugins, softfloat), Alex Bennée, 2020/07/13
- [PATCH v2 04/11] fpu/softfloat: fix up float16 nan recognition, Alex Bennée, 2020/07/13
- [PATCH v2 02/11] tests/docker: Remove the libssh workaround from the ubuntu 20.04 image, Alex Bennée, 2020/07/13
- [PATCH v2 01/11] configure: remove all dependencies on a (re)configure, Alex Bennée, 2020/07/13
- [PATCH v2 03/11] docker.py: fix fetching of FROM layers, Alex Bennée, 2020/07/13
- [PATCH v2 06/11] cputlb: ensure we save the IOTLB data in case of reset, Alex Bennée, 2020/07/13
- [PATCH v2 05/11] tests/plugins: don't unconditionally add -Wpsabi, Alex Bennée, 2020/07/13
- Re: [PATCH v2 05/11] tests/plugins: don't unconditionally add -Wpsabi,
Thomas Huth <=
- [PATCH v2 08/11] docs/devel: fix grammar in multi-thread-tcg, Alex Bennée, 2020/07/13
- [PATCH v2 10/11] plugins: add API to return a name for a IO device, Alex Bennée, 2020/07/13
- [PATCH v2 09/11] hw/virtio/pci: include vdev name in registered PCI sections, Alex Bennée, 2020/07/13
- [PATCH v2 07/11] plugins: expand the bb plugin to be thread safe and track per-cpu, Alex Bennée, 2020/07/13