From f98cee7981dd10b8a9a3e1bb0091e0394148c304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Date: Wed, 4 Mar 2026 14:52:08 +0100 Subject: [PATCH] xen/x86: fix usage of [[:blank:]] with BSD grep MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BSD grep only recognizes [[:blank:]] as a valid expression when using extended (modern) regular expressions. Pass -E to the grep call used in efi-nr-fixups. Additionally, the return from `wc -l` is space padded on BSD, and hence the content of efi-nr-fixups is " 2", not plain "2". Strip the spaces in the Makefile using $(strip ...). Fixes: 1be65ec4c8bc ('x86/EFI: avoid use of GNU ld's --disable-reloc-section when possible') Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich master commit: c13335b5c1292e90436746ec04ed0553b688160b master date: 2026-02-13 16:42:34 +0100 --- xen/arch/x86/arch.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index efdbdb6045..b7cb03a9c1 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -112,7 +112,7 @@ endif ifeq ($(XEN_BUILD_PE),y) # Check if the linker produces fixups in PE by default -efi-nr-fixups := $(shell LC_ALL=C $(OBJDUMP) -p $(efi-check).efi | grep '^[[:blank:]]*reloc[[:blank:]]*[0-9][[:blank:]].*DIR64$$' | wc -l) +efi-nr-fixups := $(strip $(shell LC_ALL=C $(OBJDUMP) -p $(efi-check).efi | grep -E '^[[:blank:]]*reloc[[:blank:]]*[0-9][[:blank:]].*DIR64$$' | wc -l)) ifeq ($(efi-nr-fixups),2) MKRELOC := :