[PATCH 2/5] stubdom: remove support for building in 32-bit mode

Juergen Gross posted 5 patches 1 month ago
There is a newer version of this series
[PATCH 2/5] stubdom: remove support for building in 32-bit mode
Posted by Juergen Gross 1 month ago
With the removal of grub-pv there is no 32-bit stubdom left.

Remove 32-bit support from the stubdom build system.

Signed-off-by: Juergen Gross <jgross@suse.com>
---
 Makefile         |  3 ---
 stubdom/Makefile | 11 -----------
 2 files changed, 14 deletions(-)

diff --git a/Makefile b/Makefile
index eb388726b0..ea432e21b0 100644
--- a/Makefile
+++ b/Makefile
@@ -146,9 +146,6 @@ install-tools: install-tools-public-headers
 .PHONY: install-stubdom
 install-stubdom: mini-os-dir install-tools-public-headers
 	$(MAKE) -C stubdom install
-ifeq (x86_64,$(XEN_TARGET_ARCH))
-	XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom install-grub-if-enabled
-endif
 
 .PHONY: tools/firmware/seabios-dir-force-update
 tools/firmware/seabios-dir-force-update:
diff --git a/stubdom/Makefile b/stubdom/Makefile
index 850e8544ca..2698bddc9d 100644
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -31,15 +31,7 @@ endef
 $(foreach lib,$(LIBS_LIBS),$(eval $(call LIB_deps,$(lib))))
 
 GNU_TARGET_ARCH:=$(XEN_TARGET_ARCH)
-ifeq ($(XEN_TARGET_ARCH),x86_32)
-GNU_TARGET_ARCH:=i686
-endif
 
-ifeq ($(GNU_TARGET_ARCH), i686)
-TARGET_CFLAGS=
-NEWLIB_CFLAGS+=-D_I386MACH_ALLOW_HW_INTERRUPTS
-STUBDOM_SUPPORTED=1
-endif
 ifeq ($(GNU_TARGET_ARCH), x86_64)
 TARGET_CFLAGS=-mno-red-zone
 NEWLIB_CFLAGS+=-D_I386MACH_ALLOW_HW_INTERRUPTS
@@ -179,9 +171,6 @@ gmp-$(GMP_VERSION).tar.bz2:
 	$(FETCHER) $@ $(GMP_URL)/$@
 
 .PHONY: cross-gmp
-ifeq ($(XEN_TARGET_ARCH), x86_32)
-   GMPEXT=ABI=32
-endif
 gmp-$(XEN_TARGET_ARCH): gmp-$(GMP_VERSION).tar.bz2 $(NEWLIB_STAMPFILE)
 	tar xjf $<
 	rm $@ -rf || :
-- 
2.54.0
Re: [PATCH 2/5] stubdom: remove support for building in 32-bit mode
Posted by Jan Beulich 1 month ago
On 07.07.2026 10:34, Juergen Gross wrote:
> --- a/Makefile
> +++ b/Makefile
> @@ -146,9 +146,6 @@ install-tools: install-tools-public-headers
>  .PHONY: install-stubdom
>  install-stubdom: mini-os-dir install-tools-public-headers
>  	$(MAKE) -C stubdom install
> -ifeq (x86_64,$(XEN_TARGET_ARCH))
> -	XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom install-grub-if-enabled
> -endif

Doesn't this belong in patch 1, together with the build-stubdom: rule
adjustment? Or does that other hunk belong here?

Jan
Re: [PATCH 2/5] stubdom: remove support for building in 32-bit mode
Posted by Juergen Gross 1 month ago
On 07.07.26 10:42, Jan Beulich wrote:
> On 07.07.2026 10:34, Juergen Gross wrote:
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -146,9 +146,6 @@ install-tools: install-tools-public-headers
>>   .PHONY: install-stubdom
>>   install-stubdom: mini-os-dir install-tools-public-headers
>>   	$(MAKE) -C stubdom install
>> -ifeq (x86_64,$(XEN_TARGET_ARCH))
>> -	XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom install-grub-if-enabled
>> -endif
> 
> Doesn't this belong in patch 1, together with the build-stubdom: rule
> adjustment? Or does that other hunk belong here?

Ah yes, probably better to move it to patch 1.


Juergen