Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 0 insertions, 76 deletions

diff --git a/src/test/run-make/wasm-symbols-not-exported/Makefile b/src/test/run-make/wasm-symbols-not-exported/Makefile
deleted file mode 100644
index 60b0dee00..000000000
--- a/src/test/run-make/wasm-symbols-not-exported/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-include ../../run-make-fulldeps/tools.mk
-
-# only-wasm32-bare
-
-all:
-	$(RUSTC) foo.rs --target wasm32-unknown-unknown
-	$(NODE) verify-exported-symbols.js $(TMPDIR)/foo.wasm
-	$(RUSTC) foo.rs --target wasm32-unknown-unknown -O
-	$(NODE) verify-exported-symbols.js $(TMPDIR)/foo.wasm
-	$(RUSTC) bar.rs --target wasm32-unknown-unknown
-	$(NODE) verify-exported-symbols.js $(TMPDIR)/bar.wasm
-	$(RUSTC) bar.rs --target wasm32-unknown-unknown -O
-	$(NODE) verify-exported-symbols.js $(TMPDIR)/bar.wasm
diff --git a/src/test/run-make/wasm-symbols-not-exported/bar.rs b/src/test/run-make/wasm-symbols-not-exported/bar.rs
deleted file mode 100644
index 6ffbd3ec6..000000000
--- a/src/test/run-make/wasm-symbols-not-exported/bar.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-#![feature(panic_handler, alloc_error_handler)]
-#![crate_type = "cdylib"]
-#![no_std]
-
-use core::alloc::*;
-
-struct B;
-
-unsafe impl GlobalAlloc for B {
-    unsafe fn alloc(&self, x: Layout) -> *mut u8 {
-        1 as *mut u8
-    }
-
-    unsafe fn dealloc(&self, ptr: *mut u8, x: Layout) {
-    }
-}
-
-#[global_allocator]
-static A: B = B;
-
-#[no_mangle]
-pub extern fn foo(a: u32) -> u32 {
-    assert_eq!(a, 3);
-    a * 2
-}
-
-#[alloc_error_handler]
-fn a(_: core::alloc::Layout) -> ! {
-    loop {}
-}
-
-#[panic_handler]
-fn b(_: &core::panic::PanicInfo) -> ! {
-    loop {}
-}
diff --git a/src/test/run-make/wasm-symbols-not-exported/foo.rs b/src/test/run-make/wasm-symbols-not-exported/foo.rs
deleted file mode 100644
index d46baee01..000000000
--- a/src/test/run-make/wasm-symbols-not-exported/foo.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#![crate_type = "cdylib"]
-
-#[no_mangle]
-pub extern fn foo() {
-    println!("foo");
-    panic!("test");
-}
diff --git a/src/test/run-make/wasm-symbols-not-exported/verify-exported-symbols.js b/src/test/run-make/wasm-symbols-not-exported/verify-exported-symbols.js
deleted file mode 100644
index afc8a7241..000000000
--- a/src/test/run-make/wasm-symbols-not-exported/verify-exported-symbols.js
+++ /dev/null
@@ -1,21 +0,0 @@
-const fs = require('fs');
-const process = require('process');
-const assert = require('assert');
-const buffer = fs.readFileSync(process.argv[2]);
-
-let m = new WebAssembly.Module(buffer);
-let list = WebAssembly.Module.exports(m);
-console.log('exports', list);
-
-let bad = false;
-for (let i = 0; i < list.length; i++) {
-  const e = list[i];
-  if (e.name == "foo" || e.kind != "function")
-    continue;
-
-  console.log('unexpected exported symbol:', e.name);
-  bad = true;
-}
-
-if (bad)
-  process.exit(1);