From 03f992a9ae80d5b94f5f996f3c6123204562b27a Mon Sep 17 00:00:00 2001 From: Wildan M Date: Sun, 16 Nov 2025 11:16:17 +0700 Subject: [PATCH 1/3] Rename i686 to i586 --- build.sh | 15 ++++++++++----- mk/config.mk | 8 ++++---- mk/qemu.mk | 4 ++-- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/build.sh b/build.sh index ebbcdfe1a..8cba67850 100755 --- a/build.sh +++ b/build.sh @@ -12,10 +12,12 @@ usage() { echo "build.sh: Invoke make for a particular architecture and configuration." echo "Usage:" - echo "./build.sh [-X | -A | -6 | -a ARCH] [-c CONFIG] [-f FILESYSTEM_CONFIG] TARGET..." + echo "./build.sh [-X | -A | -5 | -R | -a ARCH] [-c CONFIG] [-f FILESYSTEM_CONFIG] TARGET..." echo " -X Equivalent to -a x86_64." echo " -A Equivalent to -a aarch64." - echo " -6 Equivalent to -a i686." + echo " -5 Equivalent to -a i586." + echo " -6 Equivalent to -a i586 (deprecated, use -5 instead)." + echo " -R Equivalent to -a riscv64gc." echo " -a ARCH: Processor Architecture. Normally one of x86_64, aarch64 or" echo " i686. ARCH is not checked, so you can add a new architecture." echo " Defaults to the directory containing the FILESYSTEM_CONFIG file," @@ -61,7 +63,9 @@ do f) FILESYSTEM_CONFIG="$OPTARG";; X) ARCH="x86_64";; A) ARCH="aarch64";; - 6) ARCH="i686";; + R) ARCH="riscv64gc";; + 5) ARCH="i586";; + 6) ARCH="i586";; h) usage;; \?) echo "Unknown option -$OPTARG, try -h for help"; exit;; :) echo "-$OPTARG requires a value"; exit;; @@ -75,8 +79,9 @@ if [ -z "$ARCH" ] && [ -n "$FILESYSTEM_CONFIG" ]; then case "$ARCH" in x86_64) : ;; aarch64) : ;; - i686) : ;; - \?) ARCH=""; echo "Unknown Architecture, please specify x86_64, aarch64 or i686";; + riscv64gc) : ;; + i586) : ;; + \?) ARCH=""; echo "Unknown Architecture, please specify x86_64, aarch64, risc64gc or i586";; esac fi diff --git a/mk/config.mk b/mk/config.mk index cfba16aae..9ac7c0eb4 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -5,7 +5,7 @@ HOST_ARCH?=$(shell uname -m) # Configuration -## Architecture to build Redox for (aarch64, i686, or x86_64). Defaults to a host one +## Architecture to build Redox for (aarch64, i586, or x86_64). Defaults to a host one ARCH?=$(HOST_ARCH) ## Sub-device type for aarch64 if needed BOARD?= @@ -125,9 +125,9 @@ ifeq ($(ARCH),riscv64gc) export TARGET=riscv64gc-unknown-redox export GNU_TARGET=riscv64-unknown-redox else ifeq ($(ARCH),i686) -# FIXME change TARGET to i586 before the next prefix rebuild - export TARGET=i686-unknown-redox - export GNU_TARGET=i686-unknown-redox + ARCH=i586 + export TARGET=i586-unknown-redox + export GNU_TARGET=i586-unknown-redox else export TARGET=$(ARCH)-unknown-redox export GNU_TARGET=$(ARCH)-unknown-redox diff --git a/mk/qemu.mk b/mk/qemu.mk index 688526a9e..6d1ff6226 100644 --- a/mk/qemu.mk +++ b/mk/qemu.mk @@ -5,7 +5,7 @@ QEMUFLAGS=-d guest_errors -name "Redox OS $(ARCH)" netboot?=no VGA_SUPPORTED=no -ifeq ($(ARCH),i686) +ifeq ($(ARCH),i586) audio?=ac97 gpu?=vga uefi=no @@ -16,7 +16,7 @@ ifeq ($(ARCH),i686) QEMU_SMP?=1 QEMU_MEM?=1024 - # Default to using kvm when arch is i686 and host is x86_64 + # Default to using kvm when arch is i586 and host is x86_64 ifeq ($(HOST_ARCH),x86_64) kvm?=yes endif From 3f4359c68b547027f7dc68ca337a9e56261df537 Mon Sep 17 00:00:00 2001 From: Wildan Mubarok Date: Sun, 16 Nov 2025 14:29:20 +0000 Subject: [PATCH 2/3] Move config files --- config/{i686 => i586}/acid.toml | 0 config/{i686 => i586}/ci.toml | 0 config/{i686 => i586}/demo.toml | 0 config/{i686 => i586}/desktop-minimal.toml | 0 config/{i686 => i586}/desktop.toml | 0 config/{i686 => i586}/dev.toml | 0 config/{i686 => i586}/jeremy.toml | 0 config/{i686 => i586}/minimal-net.toml | 0 config/{i686 => i586}/minimal.toml | 0 config/{i686 => i586}/resist.toml | 0 config/{i686 => i586}/server.toml | 0 config/{i686 => i586}/tests.toml | 0 12 files changed, 0 insertions(+), 0 deletions(-) rename config/{i686 => i586}/acid.toml (100%) rename config/{i686 => i586}/ci.toml (100%) rename config/{i686 => i586}/demo.toml (100%) rename config/{i686 => i586}/desktop-minimal.toml (100%) rename config/{i686 => i586}/desktop.toml (100%) rename config/{i686 => i586}/dev.toml (100%) rename config/{i686 => i586}/jeremy.toml (100%) rename config/{i686 => i586}/minimal-net.toml (100%) rename config/{i686 => i586}/minimal.toml (100%) rename config/{i686 => i586}/resist.toml (100%) rename config/{i686 => i586}/server.toml (100%) rename config/{i686 => i586}/tests.toml (100%) diff --git a/config/i686/acid.toml b/config/i586/acid.toml similarity index 100% rename from config/i686/acid.toml rename to config/i586/acid.toml diff --git a/config/i686/ci.toml b/config/i586/ci.toml similarity index 100% rename from config/i686/ci.toml rename to config/i586/ci.toml diff --git a/config/i686/demo.toml b/config/i586/demo.toml similarity index 100% rename from config/i686/demo.toml rename to config/i586/demo.toml diff --git a/config/i686/desktop-minimal.toml b/config/i586/desktop-minimal.toml similarity index 100% rename from config/i686/desktop-minimal.toml rename to config/i586/desktop-minimal.toml diff --git a/config/i686/desktop.toml b/config/i586/desktop.toml similarity index 100% rename from config/i686/desktop.toml rename to config/i586/desktop.toml diff --git a/config/i686/dev.toml b/config/i586/dev.toml similarity index 100% rename from config/i686/dev.toml rename to config/i586/dev.toml diff --git a/config/i686/jeremy.toml b/config/i586/jeremy.toml similarity index 100% rename from config/i686/jeremy.toml rename to config/i586/jeremy.toml diff --git a/config/i686/minimal-net.toml b/config/i586/minimal-net.toml similarity index 100% rename from config/i686/minimal-net.toml rename to config/i586/minimal-net.toml diff --git a/config/i686/minimal.toml b/config/i586/minimal.toml similarity index 100% rename from config/i686/minimal.toml rename to config/i586/minimal.toml diff --git a/config/i686/resist.toml b/config/i586/resist.toml similarity index 100% rename from config/i686/resist.toml rename to config/i586/resist.toml diff --git a/config/i686/server.toml b/config/i586/server.toml similarity index 100% rename from config/i686/server.toml rename to config/i586/server.toml diff --git a/config/i686/tests.toml b/config/i586/tests.toml similarity index 100% rename from config/i686/tests.toml rename to config/i586/tests.toml From aa92cb7d786805f881bfca8d3a751fcb561437d1 Mon Sep 17 00:00:00 2001 From: Wildan Mubarok Date: Sun, 16 Nov 2025 14:34:57 +0000 Subject: [PATCH 3/3] Move ARCH correction up --- build.sh | 2 +- mk/config.mk | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index 8cba67850..23f047a8c 100755 --- a/build.sh +++ b/build.sh @@ -81,7 +81,7 @@ if [ -z "$ARCH" ] && [ -n "$FILESYSTEM_CONFIG" ]; then aarch64) : ;; riscv64gc) : ;; i586) : ;; - \?) ARCH=""; echo "Unknown Architecture, please specify x86_64, aarch64, risc64gc or i586";; + \?) ARCH=""; echo "Unknown Architecture, please specify x86_64, aarch64, riscv64gc or i586";; esac fi diff --git a/mk/config.mk b/mk/config.mk index 9ac7c0eb4..9b56cb78a 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -23,6 +23,10 @@ REPO_NONSTOP?=0 REPO_OFFLINE?=0 ## Do not strip debug info for local build REPO_DEBUG?=0 +## Old config value that need to be corrected +ifeq ($(ARCH),i686) + ARCH=i586 +endif ## Select filesystem config ifeq ($(BOARD),) FILESYSTEM_CONFIG?=config/$(ARCH)/$(CONFIG_NAME).toml @@ -124,10 +128,6 @@ export RUST_COMPILER_RT_ROOT=$(ROOT)/rust/src/llvm-project/compiler-rt ifeq ($(ARCH),riscv64gc) export TARGET=riscv64gc-unknown-redox export GNU_TARGET=riscv64-unknown-redox -else ifeq ($(ARCH),i686) - ARCH=i586 - export TARGET=i586-unknown-redox - export GNU_TARGET=i586-unknown-redox else export TARGET=$(ARCH)-unknown-redox export GNU_TARGET=$(ARCH)-unknown-redox