diff --git a/Examples/Embedded/Package.swift b/Examples/Embedded/Package.swift index 5ae19adc..42702394 100644 --- a/Examples/Embedded/Package.swift +++ b/Examples/Embedded/Package.swift @@ -5,32 +5,17 @@ import PackageDescription let package = Package( name: "Embedded", dependencies: [ - .package(name: "JavaScriptKit", path: "../../"), - .package(url: "https://github.com/swiftwasm/swift-dlmalloc", branch: "0.1.0"), + .package(name: "JavaScriptKit", path: "../../") ], targets: [ .executableTarget( name: "EmbeddedApp", dependencies: [ - "JavaScriptKit", - .product(name: "dlmalloc", package: "swift-dlmalloc"), + "JavaScriptKit" ], - cSettings: [.unsafeFlags(["-fdeclspec"])], swiftSettings: [ - .enableExperimentalFeature("Embedded"), - .enableExperimentalFeature("Extern"), - .unsafeFlags([ - "-Xfrontend", "-gnone", - "-Xfrontend", "-disable-stack-protector", - ]), + .enableExperimentalFeature("Extern") ], - linkerSettings: [ - .unsafeFlags([ - "-Xclang-linker", "-nostdlib", - "-Xlinker", "--no-entry", - "-Xlinker", "--export-if-defined=__main_argc_argv", - ]) - ] ) ], swiftLanguageModes: [.v5] diff --git a/Examples/Embedded/Sources/EmbeddedApp/_thingsThatShouldNotBeNeeded.swift b/Examples/Embedded/Sources/EmbeddedApp/_thingsThatShouldNotBeNeeded.swift deleted file mode 100644 index 8f45ccee..00000000 --- a/Examples/Embedded/Sources/EmbeddedApp/_thingsThatShouldNotBeNeeded.swift +++ /dev/null @@ -1,36 +0,0 @@ -import JavaScriptKit - -// NOTE: it seems the embedded tree shaker gets rid of these exports if they are not used somewhere -func _i_need_to_be_here_for_wasm_exports_to_work() { - _ = _swjs_library_features - _ = _swjs_call_host_function - _ = _swjs_free_host_function -} - -// TODO: why do I need this? and surely this is not ideal... figure this out, or at least have this come from a C lib -@_cdecl("strlen") -func strlen(_ s: UnsafePointer) -> Int { - var p = s - while p.pointee != 0 { - p += 1 - } - return p - s -} - -enum LCG { - static var x: UInt8 = 0 - static let a: UInt8 = 0x05 - static let c: UInt8 = 0x0b - - static func next() -> UInt8 { - x = a &* x &+ c - return x - } -} - -@_cdecl("arc4random_buf") -public func arc4random_buf(_ buffer: UnsafeMutableRawPointer, _ size: Int) { - for i in 0..=6.3) - @Test(.requireEmbeddedSwiftInToolchain(triple: "wasm32-unknown-none-wasm")) - func embeddedWasmUnknownNone() throws { - try withPackage(at: "Examples/Embedded") { packageDir, _, runSwift in - try runSwift( - ["package", "--triple", "wasm32-unknown-none-wasm", "js", "-c", "release"], - [ - "JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM": "true" - ] - ) - } - } - @Test(.requireEmbeddedSwiftInSwiftSDK()) func embeddedWasmUnknownWasi() throws { let swiftSDKID = try #require(Self.getEmbeddedSwiftSDKID())