Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
bbd925f
wip
pavelsavara Nov 30, 2022
fa5081a
wip
pavelsavara Nov 30, 2022
31964c3
wip
pavelsavara Nov 30, 2022
d261d1b
wip
pavelsavara Nov 30, 2022
2782819
wip
pavelsavara Nov 30, 2022
867e8d8
wip
pavelsavara Nov 30, 2022
87de23e
wip
pavelsavara Nov 30, 2022
2ae0339
fix
pavelsavara Nov 30, 2022
269d7a2
Merge branch 'main' into wasi_native_prep
pavelsavara Dec 1, 2022
2efd28f
provision SDK to WASI_SDK_PATH
pavelsavara Dec 1, 2022
6bffc9d
fix
pavelsavara Dec 1, 2022
83a54e3
wip
pavelsavara Dec 1, 2022
8de88e1
wip
pavelsavara Dec 1, 2022
9382309
Merge branch 'wasi_native_prep' of https://github.com/pavelsavara/run…
pavelsavara Dec 1, 2022
dd71877
Merge branch 'main' into wasi_native_prep
pavelsavara Dec 5, 2022
9b36c3b
fix after merge
pavelsavara Dec 5, 2022
e67bb29
Merge branch 'main' into wasi_native_prep
pavelsavara Dec 5, 2022
2a3d7ea
wip
pavelsavara Dec 5, 2022
f213ab6
feedback
pavelsavara Dec 5, 2022
97687bc
Merge branch 'main' into wasi_native_prep
pavelsavara Dec 6, 2022
61f1276
add wasi_wasm container
pavelsavara Dec 6, 2022
288199b
feedback
pavelsavara Dec 6, 2022
db57540
wip
pavelsavara Dec 6, 2022
0434363
fix
pavelsavara Dec 6, 2022
8a3c728
container
pavelsavara Dec 6, 2022
d494bec
fix
pavelsavara Dec 7, 2022
461eeda
Merge branch 'main' into wasi_native_prep
pavelsavara Dec 7, 2022
b4f9759
Merge remote-tracking branch 'origin/main' into wasi_native_prep
radical Dec 8, 2022
d039ca6
Merge remote-tracking branch 'origin/main' into wasi_native_prep
radical Dec 12, 2022
f80e897
wasm-library-tests: re-enable tests
radical Dec 12, 2022
596689a
Add back wasm linker-tests job
radical Dec 12, 2022
033164b
getrusage isn't available
radical Dec 12, 2022
86a1024
Merge remote-tracking branch 'origin/main' into wasi_native_prep
radical Dec 12, 2022
4947cf8
Merge branch 'main' into wasi_native_prep
pavelsavara Dec 14, 2022
a9fd1ad
fix
pavelsavara Dec 14, 2022
39e58f2
Merge branch 'main' into wasi_native_prep
pavelsavara Dec 16, 2022
bd8fb9e
Update eng/pipelines/common/templates/pipeline-with-resources.yml
pavelsavara Dec 19, 2022
9bb5faf
Update src/libraries/System.Private.CoreLib/src/System/Runtime/Intero…
pavelsavara Dec 19, 2022
d4ba0b2
Update src/libraries/System.Private.CoreLib/src/System/Threading/Over…
pavelsavara Dec 19, 2022
829ae38
Update src/mono/Directory.Build.props
pavelsavara Dec 19, 2022
d640c98
Update Directory.Build.props
pavelsavara Dec 19, 2022
1dc21c6
Update src/mono/cmake/configure.cmake
pavelsavara Dec 19, 2022
0d79ba5
Merge branch 'main' into wasi_native_prep
pavelsavara Dec 20, 2022
17f9043
feedback
pavelsavara Dec 20, 2022
92f9bc8
wip
pavelsavara Dec 20, 2022
9d26f1d
wip
pavelsavara Dec 20, 2022
8026107
feedback
pavelsavara Dec 20, 2022
609c42e
Merge branch 'main' into wasi_native_prep
pavelsavara Dec 21, 2022
99065d9
feedback
pavelsavara Dec 21, 2022
2700e30
Merge branch 'main' into wasi_native_prep
pavelsavara Dec 26, 2022
f53ba77
Merge branch 'main' into wasi_native_prep
pavelsavara Jan 2, 2023
b172a04
Merge branch 'main' into wasi_native_prep
pavelsavara Jan 3, 2023
edfe354
feedback
pavelsavara Jan 3, 2023
f7f8cb9
Merge branch 'main' into wasi_native_prep
pavelsavara Jan 6, 2023
3a273db
fix merge
pavelsavara Jan 6, 2023
c1b834d
fix
pavelsavara Jan 6, 2023
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
Prev Previous commit
Next Next commit
getrusage isn't available
  • Loading branch information
radical committed Dec 12, 2022
commit 033164b35943adf3a201d88760ebfa644116e1ce
2 changes: 2 additions & 0 deletions src/native/libs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,13 @@ if (CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_BROWSER OR CLR_CMAKE_TARGET_WASI)
endif ()

if (CLR_CMAKE_TARGET_WASI)
set(HOST_WASI 1)
add_compile_options(-I${CLR_REPO_ROOT_DIR}/src/mono/wasi/include/)
add_compile_options(-I${CLR_REPO_ROOT_DIR}/src/mono/wasi/libs-include/)
add_compile_options(-Wno-unused-variable)
add_compile_options(-Wno-unused-parameter)
add_compile_options(-Wno-gnu-statement-expression)
add_compile_options(-DHOST_WASI)
add_compile_options(-D_WASI_EMULATED_PROCESS_CLOCKS)
add_compile_options(-D_WASI_EMULATED_SIGNAL)
add_compile_options(-D_WASI_EMULATED_MMAN)
Expand Down
5 changes: 4 additions & 1 deletion src/native/libs/Common/pal_config.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
#cmakedefine01 HAVE_FDS_BITS
#cmakedefine01 HAVE_PRIVATE_FDS_BITS
#cmakedefine01 HAVE_STATFS
#cmakedefine01 HAVE_GETRUSAGE
#cmakedefine01 HAVE_SYS_SOCKIO_H
#cmakedefine01 HAVE_ETHTOOL_H
#cmakedefine01 HAVE_SYS_POLL_H
Expand Down Expand Up @@ -148,6 +147,10 @@
#cmakedefine01 HAVE_MAKEDEV_SYSMACROSH
#cmakedefine01 HAVE_GETGRGID_R

#ifndef HOST_WASI
#cmakedefine01 HAVE_GETRUSAGE
#endif

// Mac OS X has stat64, but it is deprecated since plain stat now
// provides the same 64-bit aware struct when targeting OS X > 10.5
// and not passing _DARWIN_NO_64_BIT_INODE.
Expand Down
4 changes: 2 additions & 2 deletions src/native/libs/System.Native/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ set(NATIVE_SOURCES
)

if (NOT CLR_CMAKE_TARGET_WASI)
list (APPEND NATIVE_SOURCES
list (APPEND NATIVE_SOURCES
pal_dynamicload.c
pal_mount.c
pal_networking.c
Expand All @@ -41,7 +41,7 @@ if (NOT CLR_CMAKE_TARGET_WASI)
pal_uid.c
)
else()
list (APPEND NATIVE_SOURCES
list (APPEND NATIVE_SOURCES
pal_dynamicload_wasi.c
pal_mount_wasi.c
pal_networking_wasi.c
Expand Down
5 changes: 0 additions & 5 deletions src/native/libs/configure.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -377,11 +377,6 @@ check_symbol_exists(
${STATFS_INCLUDES}
HAVE_STATFS)

check_symbol_exists(
"getrusage"
"sys/resource.h"
HAVE_GETRUSAGE)

check_symbol_exists(
"getrlimit"
"sys/resource.h"
Expand Down