From 2aad357c18245a2220a2f00cd7273aa733a7efb6 Mon Sep 17 00:00:00 2001
From: Bananymous <bananymousosq@gmail.com>
Date: Sun, 2 Apr 2023 04:48:56 +0300
Subject: [PATCH] BuildSystem: building for 32-bit works now

---
 CMakeLists.txt          |  17 +++++++++++++++--
 kernel/CMakeLists.txt   |  24 +++++++++++++++---------
 kernel/font/prefs.psf.o | Bin 5912 -> 0 bytes
 3 files changed, 30 insertions(+), 11 deletions(-)
 delete mode 100644 kernel/font/prefs.psf.o

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c04eaa65..46598c6e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,22 @@
 cmake_minimum_required(VERSION 3.26)
 
-project(banan-os CXX ASM)
-
 set(BANAN_ARCH x86_64)
 
+if(DEFINED ENV{BANAN_ARCH})
+	set(BANAN_ARCH $ENV{BANAN_ARCH})
+endif()
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED True)
+set(CMAKE_CXX_COMPILER ${BANAN_ARCH}-elf-g++)
+set(CMAKE_CXX_COMPILER_WORKS True)
+
+if("${BANAN_ARCH}" STREQUAL "i386")
+	set(CMAKE_CXX_COMPILER i686-elf-g++)
+endif()
+
+project(banan-os CXX)
+
 set(BANAN_SYSROOT ${CMAKE_BINARY_DIR}/sysroot)
 set(BANAN_INCLUDE ${BANAN_SYSROOT}/usr/include)
 set(BANAN_BOOT ${BANAN_SYSROOT}/boot)
diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index b0761ec4..c09448a5 100644
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -2,11 +2,12 @@ cmake_minimum_required(VERSION 3.26)
 
 project(kernel CXX ASM)
 
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED True)
-set(CMAKE_CXX_COMPILER ${BANAN_ARCH}-elf-g++)
-set(CMAKE_CXX_COMPILER_WORKS True)
-	
+if("${BANAN_ARCH}" STREQUAL "x86_64")
+	set(ELF_FORMAT elf64-x86-64)
+elseif("${BANAN_ARCH}" STREQUAL "i386")
+	set(ELF_FORMAT elf32-i386)
+endif()
+
 set(KERNEL_SOURCES
 	font/prefs.psf.o
 	kernel/ACPI.cpp
@@ -62,7 +63,7 @@ if("${BANAN_ARCH}" STREQUAL "x86_64")
 		arch/x86_64/SpinLock.S
 		arch/x86_64/Thread.S
 	)
-elseif("${BANAN_ARCH}" EQUAL "i386")
+elseif("${BANAN_ARCH}" STREQUAL "i386")
 	set(KERNEL_SOURCES
 		${KERNEL_SOURCES}
 		arch/i386/boot.S
@@ -73,7 +74,7 @@ elseif("${BANAN_ARCH}" EQUAL "i386")
 		arch/i386/Thread.S
 	)
 else()
-	message(FATAL_ERROR "unsupported architecure")
+	message(FATAL_ERROR "unsupported architecure ${BANAN_ARCH}")
 endif()
 
 set(BAN_SOURCES
@@ -99,7 +100,7 @@ add_executable(kernel ${KERNEL_SOURCES})
 target_include_directories(kernel PUBLIC include ../BAN/include ../libc/include)
 
 target_compile_definitions(kernel PUBLIC __is_kernel)
-target_compile_definitions(kernel PUBLIC __arch=x86_64)
+target_compile_definitions(kernel PUBLIC __arch=${BANAN_ARCH})
 
 target_compile_options(kernel PUBLIC -O2 -g)
 target_compile_options(kernel PUBLIC -Wno-literal-suffix)
@@ -138,4 +139,9 @@ add_custom_command(
 	COMMAND cp ${CRTEND} .
 )
 
-set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_COMPILER} <CMAKE_CXX_LINK_FLAGS> <FLAGS> <LINK_FLAGS> -o <TARGET> ${CMAKE_CURRENT_BINARY_DIR}/crti.o ${CMAKE_CURRENT_BINARY_DIR}/crtbegin.o <OBJECTS> ${CMAKE_CURRENT_BINARY_DIR}/crtend.o ${CMAKE_CURRENT_BINARY_DIR}/crtn.o")
+add_custom_command(
+	OUTPUT font/prefs.psf.o
+	COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && objcopy -O ${ELF_FORMAT} -B i386 -I binary font/prefs.psf ${CMAKE_CURRENT_BINARY_DIR}/font/prefs.psf.o
+)
+
+set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_COMPILER} <CMAKE_CXX_LINK_FLAGS> <FLAGS> <LINK_FLAGS> -o <TARGET> ${CMAKE_CURRENT_BINARY_DIR}/crti.o ${CMAKE_CURRENT_BINARY_DIR}/crtbegin.o <OBJECTS> ${CMAKE_CURRENT_BINARY_DIR}/crtend.o ${CMAKE_CURRENT_BINARY_DIR}/crtn.o -lgcc ")
diff --git a/kernel/font/prefs.psf.o b/kernel/font/prefs.psf.o
deleted file mode 100644
index d7df195a25c506568a5efd0418692eba4a03821a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5912
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
K4ehhO{r>=#6{lMO