[Buildroot] [PATCH/next 1/1] package/kvm-unit-tests: drop x86_64 workaround

Baruch Siach baruch at tkos.co.il
Tue Feb 25 16:47:57 UTC 2020


Hi Fabrice,

On Tue, Feb 25, 2020 at 05:42:14PM +0100, Fabrice Fontaine wrote:
> This workaround is not needed since commit
> 0788e921f961e36a50a94f8bb98f7eb75b312245 which disables stack-protector
> for all architectures as intended by upstream
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
> ---
>  package/kvm-unit-tests/kvm-unit-tests.mk | 8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk
> index 2637066701..519063406e 100644
> --- a/package/kvm-unit-tests/kvm-unit-tests.mk
> +++ b/package/kvm-unit-tests/kvm-unit-tests.mk
> @@ -35,13 +35,7 @@ KVM_UNIT_TESTS_CONF_OPTS =\
>  # compiler. However, for x86-64, we use the host compiler, as
>  # kvm-unit-tests builds 32 bit code, which Buildroot toolchains for
>  # x86-64 cannot do.
> -ifeq ($(BR2_x86_64),y)
> -# Arch Linux adds -fstack-protector even when building with -ffreestanding, but
> -# it doesn't link with the stack-protector library when -nostdlib is passed,
> -# which leads to a link error. Therefore, disable it explicitly to work around
> -# this bug in Arch Linux. https://bugs.archlinux.org/task/64270
> -KVM_UNIT_TESTS_MAKE_OPTS += EXTRA_CFLAGS=-fno-stack-protector
> -else
> +ifneq ($(BR2_x86_64),y)

Positive logic is usually preferred:

  ifeq ($(BR2_x86_64),)

baruch

>  KVM_UNIT_TESTS_CONF_OPTS += --cross-prefix="$(TARGET_CROSS)"
>  endif

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -


More information about the buildroot mailing list