From a631029d48d923e40be070c28f2df55694bd553e Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 29 Mar 2023 03:03:05 +0300 Subject: [PATCH] Support i386 --- .vscode/c_cpp_properties.json | 4 ++-- Audio/AudioCodec97/Makefile | 22 +++++++++++----------- Generic/ExampleDriver/Makefile | 20 ++++++++++---------- Input/PS2Mouse/Makefile | 22 +++++++++++----------- Input/VMwareMouse/Makefile | 22 +++++++++++----------- Input/VirtualBoxMouse/Makefile | 22 +++++++++++----------- Network/AMDPCNET/Makefile | 22 +++++++++++----------- Network/IntelGigabit/Makefile | 22 +++++++++++----------- Network/RTL8139/Makefile | 22 +++++++++++----------- Network/RTL8169/Makefile | 22 +++++++++++----------- Network/Virtio/Makefile | 22 +++++++++++----------- Storage/AHCI/Makefile | 22 +++++++++++----------- Storage/ATA/Makefile | 22 +++++++++++----------- 13 files changed, 133 insertions(+), 133 deletions(-) diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 5b947547..69878b23 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -72,7 +72,7 @@ "a32", "DEBUG=\"1\"" ], - "compilerPath": "${workspaceFolder}/../tools/cross/bin/i686-elf-gcc", + "compilerPath": "${workspaceFolder}/../tools/cross/bin/i386-elf-gcc", "cStandard": "c17", "cppStandard": "c++20", "intelliSenseMode": "gcc-x86", @@ -88,7 +88,7 @@ "-mno-red-zone", "-mno-sse", "-mno-sse2", - "-march=i686", + "-march=i386", "-pipe", "-ffunction-sections", "-msoft-float", diff --git a/Audio/AudioCodec97/Makefile b/Audio/AudioCodec97/Makefile index 4da34e42..52148f6a 100644 --- a/Audio/AudioCodec97/Makefile +++ b/Audio/AudioCodec97/Makefile @@ -13,17 +13,17 @@ GIT_COMMIT = $(shell git rev-parse HEAD) GIT_COMMIT_SHORT = $(shell git rev-parse --short HEAD) ifeq ($(OSARCH), amd64) -S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -else ifeq ($(OSARCH), i686) +S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +else ifeq ($(OSARCH), i386) S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") else ifeq ($(OSARCH), aarch64) -S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") -C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") -CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") +S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") +C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") +CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") endif HEADERS = $(sort $(dir $(wildcard ../../include/*))) OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(ASM_SOURCES:.asm=.o) $(S_SOURCES:.S=.o) $(PSF_SOURCES:.psf=.o) $(BMP_SOURCES:.bmp=.o) @@ -50,11 +50,11 @@ CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow \ -march=x86-64 -pipe -ffunction-sections \ -msoft-float -fno-builtin -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow \ -mno-red-zone -mno-sse -mno-sse2 \ - -march=i686 -pipe -ffunction-sections \ + -march=i386 -pipe -ffunction-sections \ -msoft-float -fno-builtin else ifeq ($(OSARCH), aarch64) @@ -66,7 +66,7 @@ endif build: $(FILENAME) ifeq ($(OSARCH), amd64) $(OBJDUMP) -b binary -D -m i386:x86-64 -d $(FILENAME) > file_dump.map -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) else ifeq ($(OSARCH), aarch64) @@ -89,7 +89,7 @@ $(FILENAME): $(OBJ) $(info Compiling $<) ifeq ($(OSARCH), amd64) $(AS) -o $@ $< -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) $(AS) -o $@ $< else ifeq ($(OSARCH), aarch64) $(AS) -o $@ $< diff --git a/Generic/ExampleDriver/Makefile b/Generic/ExampleDriver/Makefile index e8bdf6fe..5b278b97 100644 --- a/Generic/ExampleDriver/Makefile +++ b/Generic/ExampleDriver/Makefile @@ -13,17 +13,17 @@ GIT_COMMIT = $(shell git rev-parse HEAD) GIT_COMMIT_SHORT = $(shell git rev-parse --short HEAD) ifeq ($(OSARCH), amd64) -S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -else ifeq ($(OSARCH), i686) +S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +else ifeq ($(OSARCH), i386) S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") else ifeq ($(OSARCH), aarch64) -S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") -C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") -CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") +S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") +C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") +CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") endif HEADERS = $(sort $(dir $(wildcard ../../include/*))) OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(ASM_SOURCES:.asm=.o) $(S_SOURCES:.S=.o) $(PSF_SOURCES:.psf=.o) $(BMP_SOURCES:.bmp=.o) @@ -50,11 +50,11 @@ CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow \ -march=x86-64 -pipe -ffunction-sections \ -msoft-float -fno-builtin -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow \ -mno-red-zone -mno-sse -mno-sse2 -ffunction-sections \ - -march=i686 -pipe -msoft-float -fno-builtin + -march=i386 -pipe -msoft-float -fno-builtin else ifeq ($(OSARCH), aarch64) @@ -65,7 +65,7 @@ endif build: $(FILENAME) ifeq ($(OSARCH), amd64) $(OBJDUMP) -b binary -D -m i386:x86-64 -d $(FILENAME) > file_dump.map -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) else ifeq ($(OSARCH), aarch64) diff --git a/Input/PS2Mouse/Makefile b/Input/PS2Mouse/Makefile index 989dca3b..e9f8472f 100644 --- a/Input/PS2Mouse/Makefile +++ b/Input/PS2Mouse/Makefile @@ -13,17 +13,17 @@ GIT_COMMIT = $(shell git rev-parse HEAD) GIT_COMMIT_SHORT = $(shell git rev-parse --short HEAD) ifeq ($(OSARCH), amd64) -S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -else ifeq ($(OSARCH), i686) +S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +else ifeq ($(OSARCH), i386) S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") else ifeq ($(OSARCH), aarch64) -S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") -C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") -CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") +S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") +C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") +CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") endif HEADERS = $(sort $(dir $(wildcard ../../include/*))) OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(ASM_SOURCES:.asm=.o) $(S_SOURCES:.S=.o) $(PSF_SOURCES:.psf=.o) $(BMP_SOURCES:.bmp=.o) @@ -50,11 +50,11 @@ CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow \ -march=x86-64 -pipe -ffunction-sections \ -msoft-float -fno-builtin -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow \ -mno-red-zone -mno-sse -mno-sse2 -ffunction-sections \ - -march=i686 -pipe -msoft-float -fno-builtin + -march=i386 -pipe -msoft-float -fno-builtin else ifeq ($(OSARCH), aarch64) @@ -65,7 +65,7 @@ endif build: $(FILENAME) ifeq ($(OSARCH), amd64) $(OBJDUMP) -b binary -D -m i386:x86-64 -d $(FILENAME) > file_dump.map -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) else ifeq ($(OSARCH), aarch64) @@ -88,7 +88,7 @@ $(FILENAME): $(OBJ) $(info Compiling $<) ifeq ($(OSARCH), amd64) $(AS) -o $@ $< -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) $(AS) -o $@ $< else ifeq ($(OSARCH), aarch64) $(AS) -o $@ $< diff --git a/Input/VMwareMouse/Makefile b/Input/VMwareMouse/Makefile index 1d438ee5..73487c95 100644 --- a/Input/VMwareMouse/Makefile +++ b/Input/VMwareMouse/Makefile @@ -13,17 +13,17 @@ GIT_COMMIT = $(shell git rev-parse HEAD) GIT_COMMIT_SHORT = $(shell git rev-parse --short HEAD) ifeq ($(OSARCH), amd64) -S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -else ifeq ($(OSARCH), i686) +S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +else ifeq ($(OSARCH), i386) S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") else ifeq ($(OSARCH), aarch64) -S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") -C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") -CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") +S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") +C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") +CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") endif HEADERS = $(sort $(dir $(wildcard ../../include/*))) OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(ASM_SOURCES:.asm=.o) $(S_SOURCES:.S=.o) $(PSF_SOURCES:.psf=.o) $(BMP_SOURCES:.bmp=.o) @@ -50,11 +50,11 @@ CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow \ -march=x86-64 -pipe -ffunction-sections \ -msoft-float -fno-builtin -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow \ -mno-red-zone -mno-sse -mno-sse2 -ffunction-sections \ - -march=i686 -pipe -msoft-float -fno-builtin + -march=i386 -pipe -msoft-float -fno-builtin else ifeq ($(OSARCH), aarch64) @@ -65,7 +65,7 @@ endif build: $(FILENAME) ifeq ($(OSARCH), amd64) $(OBJDUMP) -b binary -D -m i386:x86-64 -d $(FILENAME) > file_dump.map -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) else ifeq ($(OSARCH), aarch64) @@ -88,7 +88,7 @@ $(FILENAME): $(OBJ) $(info Compiling $<) ifeq ($(OSARCH), amd64) $(AS) -o $@ $< -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) $(AS) -o $@ $< else ifeq ($(OSARCH), aarch64) $(AS) -o $@ $< diff --git a/Input/VirtualBoxMouse/Makefile b/Input/VirtualBoxMouse/Makefile index 4ea31764..0526e781 100644 --- a/Input/VirtualBoxMouse/Makefile +++ b/Input/VirtualBoxMouse/Makefile @@ -13,17 +13,17 @@ GIT_COMMIT = $(shell git rev-parse HEAD) GIT_COMMIT_SHORT = $(shell git rev-parse --short HEAD) ifeq ($(OSARCH), amd64) -S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -else ifeq ($(OSARCH), i686) +S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +else ifeq ($(OSARCH), i386) S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") else ifeq ($(OSARCH), aarch64) -S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") -C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") -CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") +S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") +C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") +CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") endif HEADERS = $(sort $(dir $(wildcard ../../include/*))) OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(ASM_SOURCES:.asm=.o) $(S_SOURCES:.S=.o) $(PSF_SOURCES:.psf=.o) $(BMP_SOURCES:.bmp=.o) @@ -50,11 +50,11 @@ CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow \ -march=x86-64 -pipe -ffunction-sections \ -msoft-float -fno-builtin -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow \ -mno-red-zone -mno-sse -mno-sse2 -ffunction-sections \ - -march=i686 -pipe -msoft-float -fno-builtin + -march=i386 -pipe -msoft-float -fno-builtin else ifeq ($(OSARCH), aarch64) @@ -65,7 +65,7 @@ endif build: $(FILENAME) ifeq ($(OSARCH), amd64) $(OBJDUMP) -b binary -D -m i386:x86-64 -d $(FILENAME) > file_dump.map -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) else ifeq ($(OSARCH), aarch64) @@ -88,7 +88,7 @@ $(FILENAME): $(OBJ) $(info Compiling $<) ifeq ($(OSARCH), amd64) $(AS) -o $@ $< -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) $(AS) -o $@ $< else ifeq ($(OSARCH), aarch64) $(AS) -o $@ $< diff --git a/Network/AMDPCNET/Makefile b/Network/AMDPCNET/Makefile index 86cf9d44..f19fdfc1 100644 --- a/Network/AMDPCNET/Makefile +++ b/Network/AMDPCNET/Makefile @@ -13,17 +13,17 @@ GIT_COMMIT = $(shell git rev-parse HEAD) GIT_COMMIT_SHORT = $(shell git rev-parse --short HEAD) ifeq ($(OSARCH), amd64) -S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -else ifeq ($(OSARCH), i686) +S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +else ifeq ($(OSARCH), i386) S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") else ifeq ($(OSARCH), aarch64) -S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") -C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") -CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") +S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") +C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") +CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") endif HEADERS = $(sort $(dir $(wildcard ../../include/*))) OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(ASM_SOURCES:.asm=.o) $(S_SOURCES:.S=.o) $(PSF_SOURCES:.psf=.o) $(BMP_SOURCES:.bmp=.o) @@ -50,11 +50,11 @@ CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow \ -march=x86-64 -pipe -ffunction-sections \ -msoft-float -fno-builtin -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow \ -mno-red-zone -mno-sse -mno-sse2 -ffunction-sections \ - -march=i686 -pipe -msoft-float -fno-builtin + -march=i386 -pipe -msoft-float -fno-builtin else ifeq ($(OSARCH), aarch64) @@ -65,7 +65,7 @@ endif build: $(FILENAME) ifeq ($(OSARCH), amd64) $(OBJDUMP) -b binary -D -m i386:x86-64 -d $(FILENAME) > file_dump.map -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) else ifeq ($(OSARCH), aarch64) @@ -88,7 +88,7 @@ $(FILENAME): $(OBJ) $(info Compiling $<) ifeq ($(OSARCH), amd64) $(AS) -o $@ $< -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) $(AS) -o $@ $< else ifeq ($(OSARCH), aarch64) $(AS) -o $@ $< diff --git a/Network/IntelGigabit/Makefile b/Network/IntelGigabit/Makefile index 5ea6939f..f534f27c 100644 --- a/Network/IntelGigabit/Makefile +++ b/Network/IntelGigabit/Makefile @@ -13,17 +13,17 @@ GIT_COMMIT = $(shell git rev-parse HEAD) GIT_COMMIT_SHORT = $(shell git rev-parse --short HEAD) ifeq ($(OSARCH), amd64) -S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -else ifeq ($(OSARCH), i686) +S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +else ifeq ($(OSARCH), i386) S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") else ifeq ($(OSARCH), aarch64) -S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") -C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") -CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") +S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") +C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") +CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") endif HEADERS = $(sort $(dir $(wildcard ../../include/*))) OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(ASM_SOURCES:.asm=.o) $(S_SOURCES:.S=.o) $(PSF_SOURCES:.psf=.o) $(BMP_SOURCES:.bmp=.o) @@ -50,11 +50,11 @@ CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow \ -march=x86-64 -pipe -ffunction-sections \ -msoft-float -fno-builtin -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow \ -mno-red-zone -mno-sse -mno-sse2 -ffunction-sections \ - -march=i686 -pipe -msoft-float -fno-builtin + -march=i386 -pipe -msoft-float -fno-builtin else ifeq ($(OSARCH), aarch64) @@ -65,7 +65,7 @@ endif build: $(FILENAME) ifeq ($(OSARCH), amd64) $(OBJDUMP) -b binary -D -m i386:x86-64 -d $(FILENAME) > file_dump.map -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) else ifeq ($(OSARCH), aarch64) @@ -88,7 +88,7 @@ $(FILENAME): $(OBJ) $(info Compiling $<) ifeq ($(OSARCH), amd64) $(AS) -o $@ $< -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) $(AS) -o $@ $< else ifeq ($(OSARCH), aarch64) $(AS) -o $@ $< diff --git a/Network/RTL8139/Makefile b/Network/RTL8139/Makefile index 6fad2fc9..882cda5e 100644 --- a/Network/RTL8139/Makefile +++ b/Network/RTL8139/Makefile @@ -13,17 +13,17 @@ GIT_COMMIT = $(shell git rev-parse HEAD) GIT_COMMIT_SHORT = $(shell git rev-parse --short HEAD) ifeq ($(OSARCH), amd64) -S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -else ifeq ($(OSARCH), i686) +S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +else ifeq ($(OSARCH), i386) S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") else ifeq ($(OSARCH), aarch64) -S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") -C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") -CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") +S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") +C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") +CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") endif HEADERS = $(sort $(dir $(wildcard ../../include/*))) OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(ASM_SOURCES:.asm=.o) $(S_SOURCES:.S=.o) $(PSF_SOURCES:.psf=.o) $(BMP_SOURCES:.bmp=.o) @@ -50,11 +50,11 @@ CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow \ -march=x86-64 -pipe -ffunction-sections \ -msoft-float -fno-builtin -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow \ -mno-red-zone -mno-sse -mno-sse2 -ffunction-sections \ - -march=i686 -pipe -msoft-float -fno-builtin + -march=i386 -pipe -msoft-float -fno-builtin else ifeq ($(OSARCH), aarch64) @@ -65,7 +65,7 @@ endif build: $(FILENAME) ifeq ($(OSARCH), amd64) $(OBJDUMP) -b binary -D -m i386:x86-64 -d $(FILENAME) > file_dump.map -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) else ifeq ($(OSARCH), aarch64) @@ -88,7 +88,7 @@ $(FILENAME): $(OBJ) $(info Compiling $<) ifeq ($(OSARCH), amd64) $(AS) -o $@ $< -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) $(AS) -o $@ $< else ifeq ($(OSARCH), aarch64) $(AS) -o $@ $< diff --git a/Network/RTL8169/Makefile b/Network/RTL8169/Makefile index d2e1a674..f86308c9 100644 --- a/Network/RTL8169/Makefile +++ b/Network/RTL8169/Makefile @@ -13,17 +13,17 @@ GIT_COMMIT = $(shell git rev-parse HEAD) GIT_COMMIT_SHORT = $(shell git rev-parse --short HEAD) ifeq ($(OSARCH), amd64) -S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -else ifeq ($(OSARCH), i686) +S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +else ifeq ($(OSARCH), i386) S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") else ifeq ($(OSARCH), aarch64) -S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") -C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") -CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") +S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") +C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") +CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") endif HEADERS = $(sort $(dir $(wildcard ../../include/*))) OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(ASM_SOURCES:.asm=.o) $(S_SOURCES:.S=.o) $(PSF_SOURCES:.psf=.o) $(BMP_SOURCES:.bmp=.o) @@ -50,11 +50,11 @@ CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow \ -march=x86-64 -pipe -ffunction-sections \ -msoft-float -fno-builtin -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow \ -mno-red-zone -mno-sse -mno-sse2 -ffunction-sections \ - -march=i686 -pipe -msoft-float -fno-builtin + -march=i386 -pipe -msoft-float -fno-builtin else ifeq ($(OSARCH), aarch64) @@ -65,7 +65,7 @@ endif build: $(FILENAME) ifeq ($(OSARCH), amd64) $(OBJDUMP) -b binary -D -m i386:x86-64 -d $(FILENAME) > file_dump.map -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) else ifeq ($(OSARCH), aarch64) @@ -88,7 +88,7 @@ $(FILENAME): $(OBJ) $(info Compiling $<) ifeq ($(OSARCH), amd64) $(AS) -o $@ $< -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) $(AS) -o $@ $< else ifeq ($(OSARCH), aarch64) $(AS) -o $@ $< diff --git a/Network/Virtio/Makefile b/Network/Virtio/Makefile index 7d56b27b..72a6178d 100644 --- a/Network/Virtio/Makefile +++ b/Network/Virtio/Makefile @@ -13,17 +13,17 @@ GIT_COMMIT = $(shell git rev-parse HEAD) GIT_COMMIT_SHORT = $(shell git rev-parse --short HEAD) ifeq ($(OSARCH), amd64) -S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -else ifeq ($(OSARCH), i686) +S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +else ifeq ($(OSARCH), i386) S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") else ifeq ($(OSARCH), aarch64) -S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") -C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") -CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") +S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") +C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") +CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") endif HEADERS = $(sort $(dir $(wildcard ../../include/*))) OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(ASM_SOURCES:.asm=.o) $(S_SOURCES:.S=.o) $(PSF_SOURCES:.psf=.o) $(BMP_SOURCES:.bmp=.o) @@ -50,11 +50,11 @@ CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow \ -march=x86-64 -pipe -ffunction-sections \ -msoft-float -fno-builtin -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow \ -mno-red-zone -mno-sse -mno-sse2 -ffunction-sections \ - -march=i686 -pipe -msoft-float -fno-builtin + -march=i386 -pipe -msoft-float -fno-builtin else ifeq ($(OSARCH), aarch64) @@ -65,7 +65,7 @@ endif build: $(FILENAME) ifeq ($(OSARCH), amd64) $(OBJDUMP) -b binary -D -m i386:x86-64 -d $(FILENAME) > file_dump.map -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) else ifeq ($(OSARCH), aarch64) @@ -88,7 +88,7 @@ $(FILENAME): $(OBJ) $(info Compiling $<) ifeq ($(OSARCH), amd64) $(AS) -o $@ $< -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) $(AS) -o $@ $< else ifeq ($(OSARCH), aarch64) $(AS) -o $@ $< diff --git a/Storage/AHCI/Makefile b/Storage/AHCI/Makefile index 6367bccc..bf725f43 100644 --- a/Storage/AHCI/Makefile +++ b/Storage/AHCI/Makefile @@ -13,17 +13,17 @@ GIT_COMMIT = $(shell git rev-parse HEAD) GIT_COMMIT_SHORT = $(shell git rev-parse --short HEAD) ifeq ($(OSARCH), amd64) -S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -else ifeq ($(OSARCH), i686) +S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +else ifeq ($(OSARCH), i386) S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") else ifeq ($(OSARCH), aarch64) -S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") -C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") -CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") +S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") +C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") +CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") endif HEADERS = $(sort $(dir $(wildcard ../../include/*))) OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(ASM_SOURCES:.asm=.o) $(S_SOURCES:.S=.o) $(PSF_SOURCES:.psf=.o) $(BMP_SOURCES:.bmp=.o) @@ -50,11 +50,11 @@ CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow \ -march=x86-64 -pipe -ffunction-sections \ -msoft-float -fno-builtin -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow \ -mno-red-zone -mno-sse -mno-sse2 -ffunction-sections \ - -march=i686 -pipe -msoft-float -fno-builtin + -march=i386 -pipe -msoft-float -fno-builtin else ifeq ($(OSARCH), aarch64) @@ -65,7 +65,7 @@ endif build: $(FILENAME) ifeq ($(OSARCH), amd64) $(OBJDUMP) -b binary -D -m i386:x86-64 -d $(FILENAME) > file_dump.map -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) else ifeq ($(OSARCH), aarch64) @@ -88,7 +88,7 @@ $(FILENAME): $(OBJ) $(info Compiling $<) ifeq ($(OSARCH), amd64) $(AS) -o $@ $< -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) $(AS) -o $@ $< else ifeq ($(OSARCH), aarch64) $(AS) -o $@ $< diff --git a/Storage/ATA/Makefile b/Storage/ATA/Makefile index a9fbbc09..6d340cbe 100644 --- a/Storage/ATA/Makefile +++ b/Storage/ATA/Makefile @@ -13,17 +13,17 @@ GIT_COMMIT = $(shell git rev-parse HEAD) GIT_COMMIT_SHORT = $(shell git rev-parse --short HEAD) ifeq ($(OSARCH), amd64) -S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") -else ifeq ($(OSARCH), i686) +S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*") +else ifeq ($(OSARCH), i386) S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") else ifeq ($(OSARCH), aarch64) -S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") -C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") -CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") +S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") +C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") +CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i386/*") endif HEADERS = $(sort $(dir $(wildcard ../../include/*))) OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(ASM_SOURCES:.asm=.o) $(S_SOURCES:.S=.o) $(PSF_SOURCES:.psf=.o) $(BMP_SOURCES:.bmp=.o) @@ -50,11 +50,11 @@ CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow \ -march=x86-64 -pipe -ffunction-sections \ -msoft-float -fno-builtin -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow \ -mno-red-zone -mno-sse -mno-sse2 -ffunction-sections \ - -march=i686 -pipe -msoft-float -fno-builtin + -march=i386 -pipe -msoft-float -fno-builtin else ifeq ($(OSARCH), aarch64) @@ -65,7 +65,7 @@ endif build: $(FILENAME) ifeq ($(OSARCH), amd64) $(OBJDUMP) -b binary -D -m i386:x86-64 -d $(FILENAME) > file_dump.map -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) else ifeq ($(OSARCH), aarch64) @@ -88,7 +88,7 @@ $(FILENAME): $(OBJ) $(info Compiling $<) ifeq ($(OSARCH), amd64) $(AS) -o $@ $< -else ifeq ($(OSARCH), i686) +else ifeq ($(OSARCH), i386) $(AS) -o $@ $< else ifeq ($(OSARCH), aarch64) $(AS) -o $@ $<