From 6275b3e73bd919e9eba48dc6b054aeb14a91b774 Mon Sep 17 00:00:00 2001 From: Lephenixnoir Date: Tue, 11 May 2021 09:22:34 +0200 Subject: [PATCH] move bits/unistd_32.h to bits/asm on all targets Only Vhex had it at the correct place previously. --- CMakeLists.txt | 4 +++- include/target/casiowin-cg/bits/{ => asm}/unistd_32.h | 0 include/target/casiowin-fx/bits/{ => asm}/unistd_32.h | 0 src/posix/unistd/target/casiowin-fx/close.S | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) rename include/target/casiowin-cg/bits/{ => asm}/unistd_32.h (100%) rename include/target/casiowin-fx/bits/{ => asm}/unistd_32.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 53664d1..42ad3d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,10 +17,12 @@ if(FXLIBC_TARGET STREQUAL vhex-sh) add_definitions(-D__SUPPORT_VHEX_KERNEL) endif() -if(FXLIB_TARGET STREQUAL vhex-x86) +if(FXLIBC_TARGET STREQUAL vhex-x86) list(APPEND TARGET_FOLDERS vhex-generic x86-generic) set(FXLIBC_ARCH x86) add_definitions(-D__SUPPORT_VHEX_KERNEL) + # TODO: Maybe add -nostdinc (but that removes compiler-provided headers like + # ), or use another compiler than the system one? endif() if(FXLIBC_TARGET STREQUAL casiowin-fx) diff --git a/include/target/casiowin-cg/bits/unistd_32.h b/include/target/casiowin-cg/bits/asm/unistd_32.h similarity index 100% rename from include/target/casiowin-cg/bits/unistd_32.h rename to include/target/casiowin-cg/bits/asm/unistd_32.h diff --git a/include/target/casiowin-fx/bits/unistd_32.h b/include/target/casiowin-fx/bits/asm/unistd_32.h similarity index 100% rename from include/target/casiowin-fx/bits/unistd_32.h rename to include/target/casiowin-fx/bits/asm/unistd_32.h diff --git a/src/posix/unistd/target/casiowin-fx/close.S b/src/posix/unistd/target/casiowin-fx/close.S index 7dd04d1..f6f1fab 100644 --- a/src/posix/unistd/target/casiowin-fx/close.S +++ b/src/posix/unistd/target/casiowin-fx/close.S @@ -1,4 +1,4 @@ -#include +#include #include .text .global _close