Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement ARM64 Support #4

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Implement ARM64 Support #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,15 @@ else (TARGET_x86_64)
add_library(libc-x86_64 OBJECT darling/src/empty.c)
endif (TARGET_x86_64)

if(TARGET_I386 OR TARGET_X86_64)
make_fat(
libc-gen_noinode64
libc-sys_noinode64
)
set(TARGET_OBJECTS_LIBC_GEN_NOINODE64 "$<TARGET_OBJECTS:libc-gen_noinode64>")
set(TARGET_OBJECTS_LIBC_SYS_NOINODE64 "$<TARGET_OBJECTS:libc-sys_noinode64>")
endif()

make_fat(
libc-db
libc-compat
Expand All @@ -120,7 +129,6 @@ make_fat(
libc-gen
libc-gen_pre1050
libc-gen_cancelable
libc-gen_noinode64
libc-gen_extsn
libc-gmon
libc-os
Expand All @@ -129,7 +137,6 @@ make_fat(
libc-string
libc-stdtime
libc-sys
libc-sys_noinode64
libc-stdlib
libc-stdlib_extsn
libc-stdlib_cancelable
Expand Down Expand Up @@ -159,7 +166,7 @@ add_circular(system_c FAT OBJECTS
$<TARGET_OBJECTS:libc-gen>
$<TARGET_OBJECTS:libc-gen_pre1050>
$<TARGET_OBJECTS:libc-gen_cancelable>
$<TARGET_OBJECTS:libc-gen_noinode64>
${TARGET_OBJECTS_LIBC_GEN_NOINODE64}
$<TARGET_OBJECTS:libc-gen_extsn>
$<TARGET_OBJECTS:libc-gmon>
$<TARGET_OBJECTS:libc-os>
Expand All @@ -168,7 +175,7 @@ add_circular(system_c FAT OBJECTS
$<TARGET_OBJECTS:libc-string>
$<TARGET_OBJECTS:libc-stdtime>
$<TARGET_OBJECTS:libc-sys>
$<TARGET_OBJECTS:libc-sys_noinode64>
${TARGET_OBJECTS_LIBC_SYS_NOINODE64}
$<TARGET_OBJECTS:libc-stdlib>
$<TARGET_OBJECTS:libc-stdlib_extsn>
$<TARGET_OBJECTS:libc-stdlib_cancelable>
Expand Down
2 changes: 2 additions & 0 deletions gen/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,11 @@ set_target_properties(libc-gen_cancelable PROPERTIES COMPILE_FLAGS "-D__DARWIN_N
# ***
# No-INODE64 variants
# ***
if (TARGET_I386 OR TARGET_X86_64)
set(gen-noinode64_sources FreeBSD/seekdir.c FreeBSD/readdir.c FreeBSD/scandir.c FreeBSD/rewinddir.c FreeBSD/telldir.c fts.c FreeBSD/getmntinfo.c FreeBSD/glob.c FreeBSD/opendir.c nftw.c)
add_library(libc-gen_noinode64 OBJECT ${gen-noinode64_sources})
SET_TARGET_PROPERTIES(libc-gen_noinode64 PROPERTIES COMPILE_FLAGS "-U__DARWIN_UNIX03 -U__DARWIN_64_BIT_INO_T -DVARIANT_INODE32 -DBUILDING_VARIANT -D_DARWIN_NO_64_BIT_INODE")
endif (TARGET_I386 OR TARGET_X86_64)


# ***
Expand Down
2 changes: 2 additions & 0 deletions sys/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,11 @@ add_darling_object_library(libc-sys ${sys_sources})
# ***
# No-INODE64 variants
# ***
if(TARGET_I386 OR TARGET_X86_64)
set(sys-noinode64_sources statx_np.c)
add_library(libc-sys_noinode64 OBJECT ${sys-noinode64_sources})
SET_TARGET_PROPERTIES(libc-sys_noinode64 PROPERTIES COMPILE_FLAGS "-U__DARWIN_UNIX03 -U__DARWIN_64_BIT_INO_T -DVARIANT_INODE32 -DBUILDING_VARIANT -D_DARWIN_NO_64_BIT_INODE")
endif(TARGET_I386 OR TARGET_X86_64)

add_library(libc-sys_dyld OBJECT gettimeofday.c crt_externs.c sigaction.c)
SET_TARGET_PROPERTIES(libc-sys_dyld PROPERTIES COMPILE_FLAGS "-UBUILDING_VARIANT -DVARIANT_DYLD -DVARIANT_CANCELABLE -DVARIANT_DARWINEXTSN")
Expand Down