head	1.2;
access;
symbols
	pkgsrc-2026Q1:1.1.0.6
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.4
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.2
	pkgsrc-2025Q3-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2026.06.10.18.07.45;	author bouyer;	state Exp;
branches;
next	1.1;
commitid	FMU85ymajSK6nhJG;

1.1
date	2025.08.22.09.00.11;	author bouyer;	state Exp;
branches;
next	;
commitid	Ltq5S1fi9LiRKH7G;


desc
@@


1.2
log
@Update xenkernel420, xentools420 and xenstoretools to 20260610.
Changes since 20260515: bug fixes, including fixes for XSA-491,
XSA-492, XSA-493 and XSA-494
@
text
@$NetBSD: patch-xen_arch_x86_Makefile,v 1.1 2025/08/22 09:00:11 bouyer Exp $

revert commit a9754615cb1e615d92efc40d2f725553236bcf5e, it causes the build
to fail with:
ld: prelink.o: relocation R_X86_64_32 against `.init.rodata' can not be used when making a PIE object; recompile with -fPIE

--- xen/arch/x86/Makefile.orig	2026-06-09 14:08:15.000000000 +0200
+++ xen/arch/x86/Makefile	2026-06-10 16:29:38.106843955 +0200
@@@@ -136,19 +136,19 @@@@
 CFLAGS-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI
 
 $(TARGET)-syms: $(objtree)/prelink.o $(obj)/xen.lds
-	$(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds $< $(build_id_linker) \
+	$(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) \
 	    $(objtree)/common/symbols-dummy.o -o $(dot-target).0
 	$(NM) -pa --format=sysv $(dot-target).0 \
 		| $(objtree)/tools/symbols $(all_symbols) --sysv --sort \
 		> $(dot-target).0.S
 	$(MAKE) $(build)=$(@@D) $(dot-target).0.o
-	$(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds $< $(build_id_linker) \
+	$(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) \
 	    $(dot-target).0.o -o $(dot-target).1
 	$(NM) -pa --format=sysv $(dot-target).1 \
 		| $(objtree)/tools/symbols $(all_symbols) --sysv --sort $(syms-warn-dup-y) \
 		> $(dot-target).1.S
 	$(MAKE) $(build)=$(@@D) $(dot-target).1.o
-	$(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds $< $(build_id_linker) \
+	$(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) \
 	    $(orphan-handling-y) $(dot-target).1.o -o $@@
 	$(NM) -pa --format=sysv $@@ \
 		| $(objtree)/tools/symbols --all-symbols --xensyms --sysv --sort \
@@@@ -209,7 +209,7 @@@@
 	$(if $(filter --strip-debug,$(EFI_LDFLAGS)),echo,:) "Will strip debug info from $(@@F)"
 endif
 	$(foreach base, $(VIRT_BASE) $(ALT_BASE), \
-	          $(LD) $(call EFI_LDFLAGS,$(base)) -T $(obj)/efi.lds $< $(relocs-dummy) \
+	          $(LD) $(call EFI_LDFLAGS,$(base)) -T $(obj)/efi.lds -N $< $(relocs-dummy) \
 	                $(objtree)/common/symbols-dummy.o $(note_file_option) \
 	                -o $(dot-target).$(base).0 &&) :
 	$(MKRELOC) $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(dot-target).$(base).0) \
@@@@ -220,7 +220,7 @@@@
 		> $(dot-target).0s.S
 	$(MAKE) $(build)=$(@@D) .$(@@F).0r.o .$(@@F).0s.o
 	$(foreach base, $(VIRT_BASE) $(ALT_BASE), \
-	          $(LD) $(call EFI_LDFLAGS,$(base)) -T $(obj)/efi.lds $< \
+	          $(LD) $(call EFI_LDFLAGS,$(base)) -T $(obj)/efi.lds -N $< \
 	                $(dot-target).0r.o $(dot-target).0s.o $(note_file_option) \
 	                -o $(dot-target).$(base).1 &&) :
 	$(MKRELOC) $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(dot-target).$(base).1) \
@@@@ -230,7 +230,7 @@@@
                   --source-name=$(@@F).S \
 		> $(dot-target).1s.S
 	$(MAKE) $(build)=$(@@D) .$(@@F).1r.o .$(@@F).1s.o
-	$(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T $(obj)/efi.lds $< \
+	$(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T $(obj)/efi.lds -N $< \
 	      $(dot-target).1r.o $(dot-target).1s.o $(orphan-handling-y) \
 	      $(note_file_option) -o $@@
 	$(NM) -pa --format=sysv $@@ \
@


1.1
log
@Add xenkernel420 and xentools420 packages version 20250821, providing Xen
kernels and tools from the stable-4.20 branch (as of 20250821).
@
text
@d1 1
a1 1
$NetBSD: patch-xen_arch_x86_Makefile,v 1.1 2025/05/22 14:14:37 bouyer Exp $
d7 3
a9 3
--- xen/arch/x86/Makefile.old	2025-05-21 20:16:58.798923201 +0200
+++ xen/arch/x86/Makefile	2025-05-21 20:16:21.806018309 +0200
@@@@ -138,19 +138,19 @@@@
d32 1
a32 1
@@@@ -211,7 +211,7 @@@@
d41 1
a41 1
@@@@ -221,7 +221,7 @@@@
d51 1
a51 1
 		| $(objtree)/tools/symbols $(all_symbols) --sysv --sort \
@