From 533247c1c843ebafed07de995ee33fef388a3676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= Date: Thu, 28 Oct 2021 23:38:21 +0200 Subject: [PATCH] Add -Zunstable-options instead of feature --- src/test/run-make-fulldeps/foreign-exceptions/foo.rs | 2 -- src/test/run-make-fulldeps/tools.mk | 4 ++-- src/test/run-make/issue-36710/foo.rs | 3 --- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/test/run-make-fulldeps/foreign-exceptions/foo.rs b/src/test/run-make-fulldeps/foreign-exceptions/foo.rs index 0919def5b9ab..dd3b7c76f286 100644 --- a/src/test/run-make-fulldeps/foreign-exceptions/foo.rs +++ b/src/test/run-make-fulldeps/foreign-exceptions/foo.rs @@ -2,8 +2,6 @@ // are caught by catch_unwind. Also tests that Rust panics can unwind through // C++ code. -// For linking libstdc++ on MinGW -#![cfg_attr(all(windows, target_env = "gnu"), feature(native_link_modifiers))] #![feature(c_unwind)] use std::panic::{catch_unwind, AssertUnwindSafe}; diff --git a/src/test/run-make-fulldeps/tools.mk b/src/test/run-make-fulldeps/tools.mk index bc647e138ad6..9655d09df0f2 100644 --- a/src/test/run-make-fulldeps/tools.mk +++ b/src/test/run-make-fulldeps/tools.mk @@ -117,10 +117,10 @@ else # that it is compiled with the expectation that pthreads is dynamically # linked as a DLL and will fail to link with a statically linked libpthread. # - # So we end up with the following hack: we link use static-nobundle to only + # So we end up with the following hack: we link use static:-bundle to only # link the parts of libstdc++ that we actually use, which doesn't include # the dependency on the pthreads DLL. - EXTRARSCXXFLAGS := -l static:-bundle=stdc++ + EXTRARSCXXFLAGS := -l static:-bundle=stdc++ -Z unstable-options endif else ifeq ($(UNAME),Darwin) diff --git a/src/test/run-make/issue-36710/foo.rs b/src/test/run-make/issue-36710/foo.rs index a78e8294881c..f30a35e27c0b 100644 --- a/src/test/run-make/issue-36710/foo.rs +++ b/src/test/run-make/issue-36710/foo.rs @@ -1,8 +1,5 @@ // Tests that linking to C++ code with global destructors works. -// For linking libstdc++ on MinGW -#![cfg_attr(all(windows, target_env = "gnu"), feature(native_link_modifiers))] - extern "C" { fn get() -> u32; }