-
Notifications
You must be signed in to change notification settings - Fork 0
/
0007-Cygwin-__cxa-atexit.patch
49 lines (45 loc) · 1.47 KB
/
0007-Cygwin-__cxa-atexit.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
From c4dd31d2a2c6dfa1f68393e6b57d2e4f9dd19a62 Mon Sep 17 00:00:00 2001
From: Jonathan Yong <[email protected]>
Date: Thu, 30 Oct 2014 17:15:02 +0800
Subject: [PATCH 07/13] Cygwin: __cxa-atexit
---
gcc/config.gcc | 2 ++
libgcc/config/i386/cygming-crtbegin.c | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 5636acc2270..7a654f18923 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2132,6 +2132,7 @@ i[34567]86-*-cygwin*)
fi
default_use_cxa_atexit=yes
use_gcc_stdint=wrap
+ default_use_cxa_atexit=yes
;;
x86_64-*-cygwin*)
need_64bit_isa=yes
@@ -2746,6 +2747,7 @@ mipstx39-*-elf* | mipstx39el-*-elf*)
mmix-knuth-mmixware)
tm_file="${tm_file} newlib-stdint.h"
use_gcc_stdint=wrap
+ default_use_cxa_atexit=yes
;;
mn10300-*-*)
tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file}"
diff --git a/libgcc/config/i386/cygming-crtbegin.c b/libgcc/config/i386/cygming-crtbegin.c
index a89dfedca76..76fd3907ec5 100644
--- a/libgcc/config/i386/cygming-crtbegin.c
+++ b/libgcc/config/i386/cygming-crtbegin.c
@@ -145,7 +145,11 @@ __gcc_register_frame (void)
/* If we use the __cxa_atexit method to register C++ dtors
at object construction, also use atexit to register eh frame
info cleanup. */
+#ifdef __CYGWIN__
+ __cxa_atexit(__gcc_deregister_frame, NULL, (void *)&__dso_handle);
+#else
atexit(__gcc_deregister_frame);
+#endif /* __CYGWIN__ */
#endif /* DEFAULT_USE_CXA_ATEXIT */
}
--
2.39.0