diff options
| author | 王宇逸 <Strawberry_Str@hotmail.com> | 2025-02-26 00:05:40 +0800 |
|---|---|---|
| committer | 王宇逸 <Strawberry_Str@hotmail.com> | 2025-03-10 21:23:31 +0800 |
| commit | abcbd881754651af73f7454cbcbdab953d2e4e30 (patch) | |
| tree | bfd593a70b99834046eb543fe6f95e39c2132526 | |
| parent | 886fb15c0fb1125624a3d8e5f82f147431e8f708 (diff) | |
| download | rust-abcbd881754651af73f7454cbcbdab953d2e4e30.tar.gz rust-abcbd881754651af73f7454cbcbdab953d2e4e30.zip | |
Revert changes for rtstartup
| -rw-r--r-- | library/rtstartup/rsbegin.rs | 2 | ||||
| -rw-r--r-- | library/rtstartup/rsend.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/library/rtstartup/rsbegin.rs b/library/rtstartup/rsbegin.rs index 4ae218c2f9f..67b09599d9d 100644 --- a/library/rtstartup/rsbegin.rs +++ b/library/rtstartup/rsbegin.rs @@ -49,7 +49,7 @@ pub unsafe fn drop_in_place<T: ?Sized>(to_drop: *mut T) { // enumerating currently loaded modules via the dl_iterate_phdr() API and // finding their ".eh_frame" sections); Others, like Windows, require modules // to actively register their unwind info sections via unwinder API. -#[cfg(all(any(target_os = "cygwin", all(target_os = "windows", target_env = "gnu")), target_arch = "x86"))] +#[cfg(all(target_os = "windows", target_arch = "x86", target_env = "gnu"))] pub mod eh_frames { #[no_mangle] #[unsafe(link_section = ".eh_frame")] diff --git a/library/rtstartup/rsend.rs b/library/rtstartup/rsend.rs index 9809f4b0878..a6f7d103356 100644 --- a/library/rtstartup/rsend.rs +++ b/library/rtstartup/rsend.rs @@ -27,7 +27,7 @@ pub unsafe fn drop_in_place<T: ?Sized>(to_drop: *mut T) { drop_in_place(to_drop); } -#[cfg(all(any(target_os = "cygwin", all(target_os = "windows", target_env = "gnu")), target_arch = "x86"))] +#[cfg(all(target_os = "windows", target_arch = "x86", target_env = "gnu"))] pub mod eh_frames { // Terminate the frame unwind info section with a 0 as a sentinel; // this would be the 'length' field in a real FDE. |