Skip to content

Commit 25c484c

Browse files
committed
Removing wasm
1 parent 6bbbd95 commit 25c484c

File tree

10 files changed

+7
-33
lines changed

10 files changed

+7
-33
lines changed

.github/workflows/release_experimental.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
matrix:
1515
cpu: ["x86_64", "aarch64"]
16-
platform: ["debug", "mmu_linux", "kvm", "wasm"]
16+
platform: ["debug", "mmu_linux", "kvm"]
1717
build: ["Debug", "Release"]
1818
include:
1919
- host: "ubuntu-24.04"

.github/workflows/release_latest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
matrix:
1414
cpu: ["x86_64", "aarch64"]
15-
platform: ["debug", "mmu_linux", "kvm", "wasm"]
15+
platform: ["debug", "mmu_linux", "kvm"]
1616
build: ["Debug", "Release"]
1717
include:
1818
- host: "ubuntu-24.04"

CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ if(CMAKE_BUILD_TYPE MATCHES "Debug")
4646
add_compile_options(-gdwarf-4)
4747
endif()
4848

49-
# wasm does not support newlib
50-
if(DANDELION_PLATFORM MATCHES "wasm")
51-
set(NEWLIB OFF)
52-
endif()
53-
5449
# set dependent options
5550
if(NEWLIB)
5651
set(DANDELION_FS ON)

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ RUN apt-get install -y gcc g++ # clang uses gcc to interface with the linker
1717
# download initial clang
1818
RUN wget https://apt.llvm.org/llvm.sh -O ~/llvm.sh
1919
RUN chmod +x ~/llvm.sh
20-
RUN ~/llvm.sh
20+
RUN ~/llvm.sh 20
2121
RUN ln -s /usr/bin/ld.lld-19 /usr/bin/ld.lld
2222
RUN rm -r /usr/include/*
2323

2424
# download and set up dandelionSDK
2525
RUN wget https://github.com/eth-easl/dandelionSDK/releases/download/${VERSION}/dandelion_sdk_${BUILD}_${PLATFORM}_${TARGET_ARCH}.tar.gz -O ~/dandelionSDK.tar.gz
2626
RUN tar -xzf ~/dandelionSDK.tar.gz -C ~/
27-
RUN ~/dandelion_sdk/create-compiler.sh -d -c clang-19
27+
RUN ~/dandelion_sdk/create-compiler.sh -d -c clang-20
2828

2929
ENV CC="clang"
3030
ENV CXX="clang++"

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ The platforms are:
2222
- `MMU_FREEBSD`, for the mmu-based platforms running on freebsd
2323
- `MMU_LINUX`, for mmu-based platforms running on linux
2424
- `KVM`, for the kvm-based platform
25-
- `WASM`, for the webassembly platform
2625
- `DEBUG` (default), for running applications locally on a linux system with mock inputs,
2726
dumping outputs to the terminal when terminating.
2827

include/dandelion/crt.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ void _start(void) __attribute__((naked));
1111
void _start(void) {
1212
#if defined(__x86_64__)
1313
__asm__("call __dandelion_entry\n");
14-
#elif defined(__wasm__)
15-
__asm__("call __dandelion_entry\n");
16-
__asm__("return\n");
1714
#elif defined(__aarch64__)
1815
__asm__("bl __dandelion_entry");
1916
#else

sdk_install/CMakeLists.txt

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
# actions to make the SDK build possible for outside sources
22

3-
if(DANDELION_PLATFORM MATCHES "wasm")
4-
set(DANDELION_TARGET "wasm32-unknown-dandelion")
5-
set(TEMPLATE_TARGET "wasm32-unknown-unknown")
6-
else()
7-
set(DANDELION_TARGET "${ARCHITECTURE}-unknown-dandelion")
8-
set(TEMPLATE_TARGET "${ARCHITECTURE}-unknown-elf")
9-
set(BUILTIN_LIB "\"\${CMAKE_CURRENT_SOURCE_DIR}/lib/generic/libclang_rt.builtins-${ARCHITECTURE}.a\"")
10-
endif()
3+
set(DANDELION_TARGET "${ARCHITECTURE}-unknown-dandelion")
4+
set(TEMPLATE_TARGET "${ARCHITECTURE}-unknown-elf")
5+
set(BUILTIN_LIB "\"\${CMAKE_CURRENT_SOURCE_DIR}/lib/generic/libclang_rt.builtins-${ARCHITECTURE}.a\"")
116

127
# Configure CMakeLists containing runtime, dlibc and dlibcxx
138
configure_file(CMakeTemplate.txt ${CMAKE_INSTALL_PREFIX}/CMakeLists.txt

system/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ elseif(DANDELION_PLATFORM MATCHES "mmu_linux")
3131
add_subdirectory(syscall/linux)
3232
elseif(DANDELION_PLATFORM MATCHES "kvm")
3333
add_subdirectory(platform/kvm)
34-
elseif(DANDELION_PLATFORM MATCHES "wasm")
35-
add_subdirectory(platform/wasm)
3634
else()
3735
message(FATAL_ERROR "Invalid platform: ${DANDELION_PLATFORM}")
3836
endif()

system/platform/wasm/CMakeLists.txt

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

system/platform/wasm/wasm.c

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

0 commit comments

Comments
 (0)