Fennix/Userspace
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Userspace.git synced 2025-05-28 15:34:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support i386

Browse Source
This commit is contained in:
Alex 2023-03-29 03:02:29 +03:00
parent 0c10aac7df
commit fc97b09d6e
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
11 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.vscode/c_cpp_properties.json vendored
View File

@ -65,7 +65,7 @@
"a32", "a32",
"DEBUG=\"1\"" "DEBUG=\"1\""
], ],
"compilerPath": "${workspaceFolder}/../tools/cross/bin/i686-elf-gcc", "compilerPath": "${workspaceFolder}/../tools/cross/bin/i386-elf-gcc",
"cStandard": "c17", "cStandard": "c17",
"cppStandard": "c++20", "cppStandard": "c++20",
"intelliSenseMode": "gcc-x86", "intelliSenseMode": "gcc-x86",
@ -75,7 +75,7 @@
"-fPIC", "-fPIC",
"-fPIE", "-fPIE",
"-pie", "-pie",
"-march=i686", "-march=i386",
"-pipe", "-pipe",
"-ffunction-sections", "-ffunction-sections",
"-fno-builtin", "-fno-builtin",

20
apps/base/echo/Makefile
View File

@ -15,17 +15,17 @@ GIT_COMMIT = $(shell git rev-parse HEAD)
GIT_COMMIT_SHORT = $(shell git rev-parse --short HEAD) GIT_COMMIT_SHORT = $(shell git rev-parse --short HEAD)
ifeq ($(OSARCH), amd64) ifeq ($(OSARCH), amd64)
S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") 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/i686/*" -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/i686/*" -not -path "./arch/aarch64/*") CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*")
else ifeq ($(OSARCH), i686) else ifeq ($(OSARCH), i386)
S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") 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/*") 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/*") CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*")
else ifeq ($(OSARCH), aarch64) else ifeq ($(OSARCH), aarch64)
S_SOURCES = $(shell find ./ -type f -name '*.S' -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/i686/*") 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/i686/*") CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i386/*")
endif endif
HEADERS = $(sort $(dir $(wildcard ../../../out/system/include/*))) HEADERS = $(sort $(dir $(wildcard ../../../out/system/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) 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)
@ -44,9 +44,9 @@ ifeq ($(OSARCH), amd64)
CFLAGS += -march=x86-64 CFLAGS += -march=x86-64
else ifeq ($(OSARCH), i686) else ifeq ($(OSARCH), i386)
CFLAGS += -march=i686 CFLAGS += -march=i386
else ifeq ($(OSARCH), aarch64) else ifeq ($(OSARCH), aarch64)
@ -74,7 +74,7 @@ $(FILENAME): $(OBJ)
$(info Compiling $<) $(info Compiling $<)
ifeq ($(OSARCH), amd64) ifeq ($(OSARCH), amd64)
$(AS) -o $@ $< $(AS) -o $@ $<
else ifeq ($(OSARCH), i686) else ifeq ($(OSARCH), i386)
$(AS) -o $@ $< $(AS) -o $@ $<
else ifeq ($(OSARCH), aarch64) else ifeq ($(OSARCH), aarch64)
$(AS) -o $@ $< $(AS) -o $@ $<

20
apps/system/init/Makefile
View File

@ -15,17 +15,17 @@ GIT_COMMIT = $(shell git rev-parse HEAD)
GIT_COMMIT_SHORT = $(shell git rev-parse --short HEAD) GIT_COMMIT_SHORT = $(shell git rev-parse --short HEAD)
ifeq ($(OSARCH), amd64) ifeq ($(OSARCH), amd64)
S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") 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/i686/*" -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/i686/*" -not -path "./arch/aarch64/*") CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*")
else ifeq ($(OSARCH), i686) else ifeq ($(OSARCH), i386)
S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") 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/*") 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/*") CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*")
else ifeq ($(OSARCH), aarch64) else ifeq ($(OSARCH), aarch64)
S_SOURCES = $(shell find ./ -type f -name '*.S' -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/i686/*") 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/i686/*") CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i386/*")
endif endif
HEADERS = $(sort $(dir $(wildcard ../../../out/system/include/*))) HEADERS = $(sort $(dir $(wildcard ../../../out/system/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) 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)
@ -42,8 +42,8 @@ CFLAGS := \
ifeq ($(OSARCH), amd64) ifeq ($(OSARCH), amd64)
CFLAGS += -march=x86-64 -fstack-protector-all -fstack-clash-protection CFLAGS += -march=x86-64 -fstack-protector-all -fstack-clash-protection
else ifeq ($(OSARCH), i686) else ifeq ($(OSARCH), i386)
CFLAGS += -march=i686 CFLAGS += -march=i386
else ifeq ($(OSARCH), aarch64) else ifeq ($(OSARCH), aarch64)
CFLAGS += -pipe CFLAGS += -pipe
endif endif
@ -68,7 +68,7 @@ $(FILENAME): $(OBJ)
$(info Compiling $<) $(info Compiling $<)
ifeq ($(OSARCH), amd64) ifeq ($(OSARCH), amd64)
$(AS) -o $@ $< $(AS) -o $@ $<
else ifeq ($(OSARCH), i686) else ifeq ($(OSARCH), i386)
$(AS) -o $@ $< $(AS) -o $@ $<
else ifeq ($(OSARCH), aarch64) else ifeq ($(OSARCH), aarch64)
$(AS) -o $@ $< $(AS) -o $@ $<

2
apps/user/games/doomgeneric

@ -1 +1 @@
Subproject commit a88a9061240a9019478dae54c188b89440db2d95 Subproject commit 74c746cb8f9190e5847b6dfc6b21e2b7e51f3bca

2
libc/ElfInterpreter/Makefile
View File

@ -25,7 +25,7 @@ INCLUDE = ../include
ifeq ($(OSARCH), amd64) ifeq ($(OSARCH), amd64)
ASM_ARCH := elf64 ASM_ARCH := elf64
else ifeq ($(OSARCH), i686) else ifeq ($(OSARCH), i386)
ASM_ARCH := elf32 ASM_ARCH := elf32
endif endif

2
libc/runtime/Makefile
View File

@ -12,7 +12,7 @@ OBJ = ${C_SOURCES:.c=.o} ${ASM_SOURCES:.asm=.o} ${S_SOURCES:.S=.o}
ifeq ($(OSARCH), amd64) ifeq ($(OSARCH), amd64)
ASM_ARCH := elf64 ASM_ARCH := elf64
else ifeq ($(OSARCH), i686) else ifeq ($(OSARCH), i386)
ASM_ARCH := elf32 ASM_ARCH := elf32
endif endif

2
libc/src/Makefile
View File

@ -22,7 +22,7 @@ INCLUDE = ../include
ifeq ($(OSARCH), amd64) ifeq ($(OSARCH), amd64)
ASM_ARCH := elf64 ASM_ARCH := elf64
else ifeq ($(OSARCH), i686) else ifeq ($(OSARCH), i386)
ASM_ARCH := elf32 ASM_ARCH := elf32
endif endif

2
libs/libgraph/Makefile
View File

@ -23,7 +23,7 @@ OBJ = ${C_SOURCES:.c=.o} ${CPP_SOURCES:.cpp=.o} ${ASM_SOURCES:.asm=.o} ${S_SOURC
ifeq ($(OSARCH), amd64) ifeq ($(OSARCH), amd64)
ASM_ARCH := elf64 ASM_ARCH := elf64
else ifeq ($(OSARCH), i686) else ifeq ($(OSARCH), i386)
ASM_ARCH := elf32 ASM_ARCH := elf32
endif endif

2
libs/libinit/Makefile
View File

@ -23,7 +23,7 @@ OBJ = ${C_SOURCES:.c=.o} ${CPP_SOURCES:.cpp=.o} ${ASM_SOURCES:.asm=.o} ${S_SOURC
ifeq ($(OSARCH), amd64) ifeq ($(OSARCH), amd64)
ASM_ARCH := elf64 ASM_ARCH := elf64
else ifeq ($(OSARCH), i686) else ifeq ($(OSARCH), i386)
ASM_ARCH := elf32 ASM_ARCH := elf32
endif endif

2
libs/libssp/Makefile
View File

@ -18,7 +18,7 @@ OBJ = ${C_SOURCES:.c=.o} ${ASM_SOURCES:.asm=.o}
ifeq ($(OSARCH), amd64) ifeq ($(OSARCH), amd64)
ASM_ARCH := elf64 ASM_ARCH := elf64
else ifeq ($(OSARCH), i686) else ifeq ($(OSARCH), i386)
ASM_ARCH := elf32 ASM_ARCH := elf32
endif endif

2
libs/libsys/Makefile
View File

@ -23,7 +23,7 @@ OBJ = ${C_SOURCES:.c=.o} ${CPP_SOURCES:.cpp=.o} ${ASM_SOURCES:.asm=.o} ${S_SOURC
ifeq ($(OSARCH), amd64) ifeq ($(OSARCH), amd64)
ASM_ARCH := elf64 ASM_ARCH := elf64
else ifeq ($(OSARCH), i686) else ifeq ($(OSARCH), i386)
ASM_ARCH := elf32 ASM_ARCH := elf32
endif endif