From e0de9ceb068978ee13d9c2193a4202e2e859f489 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Thu, 14 Aug 2025 11:34:56 +0200 Subject: [PATCH] x86: drop detection of ld supporting SORT_BY_INIT_PRIORITY() GNU ld 2.25 supports this, and we already assume all lld versions do. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Release-Acked-By: Oleksii Kurochko --- xen/arch/x86/arch.mk | 10 ---------- xen/arch/x86/xen.lds.S | 4 ---- 2 files changed, 14 deletions(-) diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index 2c17dba754..16368a498b 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -72,16 +72,6 @@ ifeq ($(CONFIG_UBSAN),y) $(call cc-option-add,CFLAGS_UBSAN,CC,-fno-sanitize=alignment) endif -ifeq ($(CONFIG_LD_IS_GNU),y) -# While not much better than going by raw GNU ld version, utilize that the -# feature we're after has appeared in the same release as the -# --print-output-format command line option. -AFLAGS-$(call ld-option,--print-output-format) += -DHAVE_LD_SORT_BY_INIT_PRIORITY -else -# Assume all versions of LLD support this. -AFLAGS += -DHAVE_LD_SORT_BY_INIT_PRIORITY -endif - ifneq ($(CONFIG_PV_SHIM_EXCLUSIVE),y) efi-check := arch/x86/efi/check diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 8e9cac75b0..966e514f20 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -35,10 +35,6 @@ ENTRY(start_pa) # define SECTION_ALIGN PAGE_SIZE #endif -#ifndef HAVE_LD_SORT_BY_INIT_PRIORITY -# define SORT_BY_INIT_PRIORITY SORT -#endif - OUTPUT_FORMAT(FORMAT, FORMAT, FORMAT) OUTPUT_ARCH(i386:x86-64)