Skip to content

Commit 9d051d5

Browse files
b1bartb1bart
committed
relocated musl to a mirror of the upstream git://git.musl-libc.org/musl with our changes under a branch called eosio which is now a submodule mounted at ./contracts/musl/upstream build files have been modified to reflect this
1 parent bd3c613 commit 9d051d5

453 files changed

Lines changed: 28 additions & 34352 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitmodules‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,7 @@
99
[submodule "programs/snapshot"]
1010
path = programs/snapshot
1111
url = https://github.com/EOSIO/genesis.git
12+
[submodule "contracts/musl/upstream"]
13+
path = contracts/musl/upstream
14+
url = git@github.com:EOSIO/musl.git
15+
branch = eosio

‎contracts/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
set(STANDARD_INCLUDE_FOLDERS ${CMAKE_SOURCE_DIR}/contracts ${CMAKE_SOURCE_DIR}/contracts/libc++/include ${CMAKE_SOURCE_DIR}/contracts/musl/include)
1+
set(STANDARD_INCLUDE_FOLDERS ${CMAKE_SOURCE_DIR}/contracts ${CMAKE_SOURCE_DIR}/contracts/libc++/include ${CMAKE_SOURCE_DIR}/contracts/musl/upstream/include)
22

33
add_subdirectory(eosiolib)
4-
add_subdirectory(musl/src)
4+
add_subdirectory(musl)
55
add_subdirectory(libc++/src)
66

77
add_subdirectory(eosio.system)

‎contracts/musl/CMakeLists.txt‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
file(GLOB CRYPT_SOURCES "upstream/src/crypt/*.c")
2+
file(GLOB CTYPE_SOURCES "upstream/src/ctype/*.c")
3+
file(GLOB ENV_SOURCES "upstream/src/env/*.c")
4+
file(GLOB ERRNO_SOURCES "upstream/src/errno/*.c")
5+
file(GLOB EXIT_SOURCES "upstream/src/exit/*.c")
6+
file(GLOB LOCALE_SOURCES "upstream/src/locale/*.c")
7+
file(GLOB MBYTE_SOURCES "upstream/src/multibyte/*.c")
8+
file(GLOB SEARCH_SOURCES "upstream/src/search/*.c")
9+
file(GLOB STDIO_SOURCES "upstream/src/stdio/*.c")
10+
file(GLOB STDLIB_SOURCES "upstream/src/stdlib/*.c")
11+
file(GLOB STRING_SOURCES "upstream/src/string/*.c")
12+
file(GLOB TIME_SOURCES "upstream/src/time/*.c")
13+
file(GLOB THREAD_SOURCES "upstream/src/thread/*.c") #only for __lock __unlock
14+
file(GLOB INTERNAL_SOURCES upstream/src/internal/intscan.c upstream/src/internal/shgetc.c upstream/src/internal/libc.c)
15+
16+
add_wast_library(TARGET libc
17+
SOURCE_FILES ${CRYPT_SOURCES} ${CTYPE_SOURCES} ${ENV_SOURCES} ${ERRNO_SOURCES} ${EXIT_SOURCES} ${INTERNAL_SOURCES} ${LOCALE_SOURCES} ${MBYTE_SOURCES}
18+
${SEARCH_SOURCES} ${STDIO_SOURCES} ${STDLIB_SOURCES} ${STRING_SOURCES} ${TIME_SOURCES} ${THREAD_SOURCES}
19+
INCLUDE_FOLDERS ${CMAKE_SOURCE_DIR}/contracts/musl/upstream/include ${CMAKE_SOURCE_DIR}/contracts/musl/upstream/src/internal ${CMAKE_SOURCE_DIR}/contracts/musl/upstream/arch/eos ${CMAKE_SOURCE_DIR}/contracts/
20+
DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
21+
)

‎contracts/musl/arch/eos/atomic_arch.h‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎contracts/musl/arch/eos/pthread_arch.h‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎contracts/musl/arch/generic/bits/errno.h‎

Lines changed: 0 additions & 134 deletions
This file was deleted.

‎contracts/musl/arch/generic/bits/fcntl.h‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎contracts/musl/arch/generic/bits/fenv.h‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎contracts/musl/arch/generic/bits/hwcap.h‎

Whitespace-only changes.

‎contracts/musl/arch/generic/bits/io.h‎

Whitespace-only changes.

0 commit comments

Comments
 (0)