Google Git
Sign in
mingw/mingw-w64/51d629b8bfd993e3e298e2fc978e344c9171aadc^!/.
commit
51d629b8bfd993e3e298e2fc978e344c9171aadc
[log]
author
LIU Hao <lh_mouse@126.com>
Thu Dec 08 14:20:04 2022 +0800
committer
LIU Hao <lh_mouse@126.com>
Thu Dec 08 14:20:04 2022 +0800
tree
06c4115d6335110c389b76989f77a4cb6ddc3986
parent
f0dec49890f381b0a308791cb412b0e5c1c2ebc4 [diff]
Revert "crt: Provide wrappers for `*exit()` in libmingwex"

This reverts commit 2262488410e53e28e348b80fc672c3548691f2d0.

diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 45e6a31..5aac06e 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am

@@ -127,7 +127,7 @@
   crt/usermatherr.c   \
   crt/xtxtmode.c      crt/crt_handler.c    \
   crt/tlsthrd.c       crt/tlsmthread.c     crt/tlsmcrt.c   \
-  crt/cxa_atexit.c    crt/cxa_thread_atexit.c   crt/tls_atexit.c   crt/exit_wrappers.c   crt/ucrt_exit_wrappers.c
+  crt/cxa_atexit.c    crt/cxa_thread_atexit.c crt/tls_atexit.c
 
 if !LD_PROVIDES_IMAGEBASE
 src_libmingw32+=crt/__imagebase.c

diff --git a/mingw-w64-crt/crt/exit_wrappers.c b/mingw-w64-crt/crt/exit_wrappers.c
deleted file mode 100644
index 256c26d..0000000
--- a/mingw-w64-crt/crt/exit_wrappers.c
+++ /dev/null

@@ -1,25 +0,0 @@
-/**
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the mingw-w64 runtime package.
- * No warranty is given; refer to the file DISCLAIMER.PD within this package.
- */
-
-#include <_mingw.h>
-
-/* `exit()`, C89  */
-void exit(int status) __attribute__((__noreturn__));
-extern void (*__MINGW_IMP_SYMBOL(exit))(int) __attribute__((__noreturn__));
-
-void exit(int status)
-{
-  (*__MINGW_IMP_SYMBOL(exit))(status);
-}
-
-/* `_exit()`, POSIX  */
-void _exit(int status) __attribute__((__noreturn__));
-extern void (*__MINGW_IMP_SYMBOL(_exit))(int) __attribute__((__noreturn__));
-
-void _exit(int status)
-{
-  (*__MINGW_IMP_SYMBOL(_exit))(status);
-}

diff --git a/mingw-w64-crt/crt/ucrt_exit_wrappers.c b/mingw-w64-crt/crt/ucrt_exit_wrappers.c
deleted file mode 100644
index 112d8e3..0000000
--- a/mingw-w64-crt/crt/ucrt_exit_wrappers.c
+++ /dev/null

@@ -1,27 +0,0 @@
-/**
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the mingw-w64 runtime package.
- * No warranty is given; refer to the file DISCLAIMER.PD within this package.
- */
-
-#undef __MSVCRT_VERSION__
-#define _UCRT
-#include <_mingw.h>
-
-/* `quick_exit()`, C99  */
-void quick_exit(int status) __attribute__((__noreturn__));
-extern void (*__MINGW_IMP_SYMBOL(quick_exit))(int) __attribute__((__noreturn__));
-
-void quick_exit(int status)
-{
-  (*__MINGW_IMP_SYMBOL(quick_exit))(status);
-}
-
-/* `_Exit()`, C99  */
-void _Exit(int status) __attribute__((__noreturn__));
-extern void (*__MINGW_IMP_SYMBOL(_Exit))(int) __attribute__((__noreturn__));
-
-void _Exit(int status)
-{
-  (*__MINGW_IMP_SYMBOL(_Exit))(status);
-}

diff --git a/mingw-w64-crt/lib-common/api-ms-win-crt-runtime-l1-1-0.def.in b/mingw-w64-crt/lib-common/api-ms-win-crt-runtime-l1-1-0.def.in
index 33e4f55..ea310d4 100644
--- a/mingw-w64-crt/lib-common/api-ms-win-crt-runtime-l1-1-0.def.in
+++ b/mingw-w64-crt/lib-common/api-ms-win-crt-runtime-l1-1-0.def.in

@@ -4,7 +4,7 @@
 
 #include "func.def.in"
 
-_Exit DATA
+_Exit
 F_I386(__control87_2)
 __doserrno
 __fpe_flt_rounds
@@ -42,7 +42,7 @@
 _endthreadex
 _errno
 _execute_onexit_table
-_exit DATA
+_exit
 F_NON_I386(_fpieee_flt)
 ; DATA added manually
 _fpreset DATA
@@ -96,7 +96,7 @@
 _wperror
 _wsystem
 abort
-exit DATA
+exit
 ; Don't use the float env functions from UCRT; fesetround doesn't seem to have
 ; any effect on the FPU control word as required by other libmingwex math
 ; routines.
@@ -110,7 +110,7 @@
 fesetround DATA
 fetestexcept DATA
 perror
-quick_exit DATA
+quick_exit
 raise
 set_terminate
 signal

diff --git a/mingw-w64-crt/lib-common/msvcr120_app.def.in b/mingw-w64-crt/lib-common/msvcr120_app.def.in
index 33f2e93..ddb407d 100644
--- a/mingw-w64-crt/lib-common/msvcr120_app.def.in
+++ b/mingw-w64-crt/lib-common/msvcr120_app.def.in

@@ -1080,7 +1080,7 @@
 F_ARM32(_execve)
 F_ARM32(_execvp)
 F_ARM32(_execvpe)
-_exit DATA
+_exit
 F_X86_ANY(_exit_app)
 _expand
 F_X86_ANY(_fclose_nolock)
@@ -2143,7 +2143,7 @@
 erff
 erfl
 #endif
-exit DATA
+exit
 exp
 exp2
 exp2f

diff --git a/mingw-w64-crt/lib-common/msvcrt.def.in b/mingw-w64-crt/lib-common/msvcrt.def.in
index c741532..695a4d7 100644
--- a/mingw-w64-crt/lib-common/msvcrt.def.in
+++ b/mingw-w64-crt/lib-common/msvcrt.def.in

@@ -483,7 +483,7 @@
 _execve
 _execvp
 _execvpe
-_exit DATA
+_exit
 _expand
 F_ARM_ANY(_expand_dbg)
 _fcloseall
@@ -1352,7 +1352,7 @@
 ctime
 difftime
 div
-exit DATA
+exit
 exp F_X86_ANY(DATA)
 F_NON_I386(expf F_X86_ANY(DATA))
 F_ARM_ANY(expl == exp)

diff --git a/mingw-w64-crt/lib-common/ucrtbase.def.in b/mingw-w64-crt/lib-common/ucrtbase.def.in
index ae3d3f9..a90fd72 100644
--- a/mingw-w64-crt/lib-common/ucrtbase.def.in
+++ b/mingw-w64-crt/lib-common/ucrtbase.def.in

@@ -30,7 +30,7 @@
 F_I386(_CxxThrowException@8)
 F_NON_I386(_CxxThrowException)
 F_I386(_EH_prolog)
-_Exit DATA
+_Exit
 _FCbuild
 _FCmulcc
 _FCmulcr
@@ -299,7 +299,7 @@
 _execve
 _execvp
 _execvpe
-_exit DATA
+_exit
 _expand
 _fclose_nolock
 _fcloseall
@@ -2305,7 +2305,7 @@
 erfcl F_X86_ANY(DATA)
 erff
 erfl F_X86_ANY(DATA)
-exit DATA
+exit
 exp F_X86_ANY(DATA)
 exp2
 exp2f
@@ -2500,7 +2500,7 @@
 putwchar
 qsort
 qsort_s
-quick_exit DATA
+quick_exit
 raise
 rand
 rand_s

diff --git a/mingw-w64-crt/lib32/crtdll.def b/mingw-w64-crt/lib32/crtdll.def
index 2886cc2..4864025 100644
--- a/mingw-w64-crt/lib32/crtdll.def
+++ b/mingw-w64-crt/lib32/crtdll.def

@@ -266,7 +266,7 @@
 _execve
 _execvp
 _execvpe
-_exit DATA
+_exit
 _expand
 _fcloseall
 _fcvt
@@ -549,7 +549,7 @@
 ;_ctime32 = ctime
 difftime
 div
-exit DATA
+exit
 exp DATA
 fabs DATA
 fclose

diff --git a/mingw-w64-crt/lib32/msvcr100.def.in b/mingw-w64-crt/lib32/msvcr100.def.in
index b4ef4d6..6765892 100644
--- a/mingw-w64-crt/lib32/msvcr100.def.in
+++ b/mingw-w64-crt/lib32/msvcr100.def.in

@@ -833,7 +833,7 @@
 _execve
 _execvp
 _execvpe
-_exit DATA
+_exit
 _expand
 _fclose_nolock
 _fcloseall
@@ -1701,7 +1701,7 @@
 ; If we implement cosh too, we can set it to DATA only.
 cosh
 div
-exit DATA
+exit
 exp DATA
 fabs DATA
 fclose

diff --git a/mingw-w64-crt/lib32/msvcr110.def.in b/mingw-w64-crt/lib32/msvcr110.def.in
index f3eebf2..2f2e19b 100644
--- a/mingw-w64-crt/lib32/msvcr110.def.in
+++ b/mingw-w64-crt/lib32/msvcr110.def.in

@@ -956,7 +956,7 @@
 _execve
 _execvp
 _execvpe
-_exit DATA
+_exit
 _expand
 _fclose_nolock
 _fcloseall
@@ -1834,7 +1834,7 @@
 ; If we implement cosh, we can set it to DATA only.
 cosh
 div
-exit DATA
+exit
 exp DATA
 fabs DATA
 fclose

diff --git a/mingw-w64-crt/lib32/msvcr120.def.in b/mingw-w64-crt/lib32/msvcr120.def.in
index af92ebf..82adab0 100644
--- a/mingw-w64-crt/lib32/msvcr120.def.in
+++ b/mingw-w64-crt/lib32/msvcr120.def.in

@@ -973,7 +973,7 @@
 _execve
 _execvp
 _execvpe
-_exit DATA
+_exit
 _expand
 _fclose_nolock
 _fcloseall
@@ -1958,7 +1958,7 @@
 erfcl
 erff
 erfl
-exit DATA
+exit
 exp
 exp2
 exp2f

diff --git a/mingw-w64-crt/lib32/msvcr120d.def.in b/mingw-w64-crt/lib32/msvcr120d.def.in
index b77a366..a9552f0 100644
--- a/mingw-w64-crt/lib32/msvcr120d.def.in
+++ b/mingw-w64-crt/lib32/msvcr120d.def.in

@@ -1026,7 +1026,7 @@
 _execve
 _execvp
 _execvpe
-_exit DATA
+_exit
 _expand
 _expand_dbg
 _fclose_nolock
@@ -2025,7 +2025,7 @@
 erfcl
 erff
 erfl
-exit DATA
+exit
 exp
 exp2
 exp2f

diff --git a/mingw-w64-crt/lib32/msvcr70.def b/mingw-w64-crt/lib32/msvcr70.def
index 496cfe0..6c8af84 100644
--- a/mingw-w64-crt/lib32/msvcr70.def
+++ b/mingw-w64-crt/lib32/msvcr70.def

@@ -313,7 +313,7 @@
 _execve
 _execvp
 _execvpe
-_exit DATA
+_exit
 _expand
 _fcloseall
 _fcvt
@@ -728,7 +728,7 @@
 ctime
 difftime
 div
-exit DATA
+exit
 exp
 fabs
 fclose

diff --git a/mingw-w64-crt/lib32/msvcr71.def b/mingw-w64-crt/lib32/msvcr71.def
index 628b816..4bafa68 100644
--- a/mingw-w64-crt/lib32/msvcr71.def
+++ b/mingw-w64-crt/lib32/msvcr71.def

@@ -306,7 +306,7 @@
 _execve
 _execvp
 _execvpe
-_exit DATA
+_exit
 _expand
 _fcloseall
 _fcvt
@@ -723,7 +723,7 @@
 ctime
 difftime
 div
-exit DATA
+exit
 exp
 fabs
 fclose

diff --git a/mingw-w64-crt/lib32/msvcr80.def.in b/mingw-w64-crt/lib32/msvcr80.def.in
index 990f63a..42ded14 100644
--- a/mingw-w64-crt/lib32/msvcr80.def.in
+++ b/mingw-w64-crt/lib32/msvcr80.def.in

@@ -163,7 +163,7 @@
 _execve
 _execvp
 _execvpe
-_exit DATA
+_exit
 _expand
 _fcloseall
 _fcvt
@@ -589,7 +589,7 @@
 ctime == _ctime32
 difftime
 div
-exit DATA
+exit
 exp DATA
 fabs DATA
 fclose

diff --git a/mingw-w64-crt/lib32/msvcr90.def.in b/mingw-w64-crt/lib32/msvcr90.def.in
index e27c56a..f6de764 100644
--- a/mingw-w64-crt/lib32/msvcr90.def.in
+++ b/mingw-w64-crt/lib32/msvcr90.def.in

@@ -460,7 +460,7 @@
 _execve
 _execvp
 _execvpe
-_exit DATA
+_exit
 _expand
 _fclose_nolock
 _fcloseall
@@ -1337,7 +1337,7 @@
 ; If we have cosh implementation, we can set it to DATA only.
 cosh
 div
-exit DATA
+exit
 exp DATA
 fabs DATA
 fclose

diff --git a/mingw-w64-crt/lib32/msvcr90d.def.in b/mingw-w64-crt/lib32/msvcr90d.def.in
index 0ab3e58..52c33dc 100644
--- a/mingw-w64-crt/lib32/msvcr90d.def.in
+++ b/mingw-w64-crt/lib32/msvcr90d.def.in

@@ -517,7 +517,7 @@
 _execve
 _execvp
 _execvpe
-_exit DATA
+_exit
 _expand
 _expand_dbg
 _fclose_nolock
@@ -1409,7 +1409,7 @@
 ; If we implement cosh too, we can set it to DATA only.
 cosh
 div
-exit DATA
+exit
 exp DATA
 fabs DATA
 fclose

diff --git a/mingw-w64-crt/lib32/msvcrt10.def b/mingw-w64-crt/lib32/msvcrt10.def
index 6fcb35b..0265add 100644
--- a/mingw-w64-crt/lib32/msvcrt10.def
+++ b/mingw-w64-crt/lib32/msvcrt10.def

@@ -943,7 +943,7 @@
 _execve
 _execvp
 _execvpe
-_exit DATA
+_exit
 _expand
 _fcloseall
 _fcvt
@@ -1126,7 +1126,7 @@
 ctime
 difftime
 div
-exit DATA
+exit
 exp
 fabs
 fclose

diff --git a/mingw-w64-crt/lib32/msvcrt20.def b/mingw-w64-crt/lib32/msvcrt20.def
index de320ec..e0e3897 100644
--- a/mingw-w64-crt/lib32/msvcrt20.def
+++ b/mingw-w64-crt/lib32/msvcrt20.def

@@ -1013,7 +1013,7 @@
 _execve
 _execvp
 _execvpe
-_exit DATA
+_exit
 _expand
 _fcloseall
 _fcvt
@@ -1394,7 +1394,7 @@
 ctime
 difftime
 div
-exit DATA
+exit
 exp
 fabs
 fclose

diff --git a/mingw-w64-crt/lib32/msvcrt40.def b/mingw-w64-crt/lib32/msvcrt40.def
index e07065e..5abc344 100644
--- a/mingw-w64-crt/lib32/msvcrt40.def
+++ b/mingw-w64-crt/lib32/msvcrt40.def

@@ -1112,7 +1112,7 @@
 _execve
 _execvp
 _execvpe
-_exit DATA
+_exit
 _expand
 _fcloseall
 _fcvt
@@ -1478,7 +1478,7 @@
 ctime
 difftime
 div
-exit DATA
+exit
 exp
 fabs
 fclose

diff --git a/mingw-w64-crt/lib64/msvcr100.def.in b/mingw-w64-crt/lib64/msvcr100.def.in
index 1515566..1530a71 100644
--- a/mingw-w64-crt/lib64/msvcr100.def.in
+++ b/mingw-w64-crt/lib64/msvcr100.def.in

@@ -788,7 +788,7 @@
 _execve
 _execvp
 _execvpe
-_exit DATA
+_exit
 _expand
 _fclose_nolock
 _fcloseall
@@ -1654,7 +1654,7 @@
 cosh
 coshf DATA
 div
-exit DATA
+exit
 exp DATA
 expf DATA
 fabs DATA

diff --git a/mingw-w64-crt/lib64/msvcr110.def.in b/mingw-w64-crt/lib64/msvcr110.def.in
index 21beceb..b5b9e3e 100644
--- a/mingw-w64-crt/lib64/msvcr110.def.in
+++ b/mingw-w64-crt/lib64/msvcr110.def.in

@@ -913,7 +913,7 @@
 _execve
 _execvp
 _execvpe
-_exit DATA
+_exit
 _expand
 _fclose_nolock
 _fcloseall
@@ -1778,7 +1778,7 @@
 cosh
 coshf
 div
-exit DATA
+exit
 exp
 expf
 fabs

diff --git a/mingw-w64-crt/lib64/msvcr120.def.in b/mingw-w64-crt/lib64/msvcr120.def.in
index f63e9f0..a37df57 100644
--- a/mingw-w64-crt/lib64/msvcr120.def.in
+++ b/mingw-w64-crt/lib64/msvcr120.def.in

@@ -927,7 +927,7 @@
 _execve
 _execvp
 _execvpe
-_exit DATA
+_exit
 _expand
 _fclose_nolock
 _fcloseall
@@ -1903,7 +1903,7 @@
 erfcl
 erff
 erfl
-exit DATA
+exit
 exp
 exp2
 exp2f

diff --git a/mingw-w64-crt/lib64/msvcr120d.def.in b/mingw-w64-crt/lib64/msvcr120d.def.in
index 8298c5f..98a7b5f 100644
--- a/mingw-w64-crt/lib64/msvcr120d.def.in
+++ b/mingw-w64-crt/lib64/msvcr120d.def.in

@@ -978,7 +978,7 @@
 _execve
 _execvp
 _execvpe
-_exit DATA
+_exit
 _expand
 _expand_dbg
 _fclose_nolock
@@ -1967,7 +1967,7 @@
 erfcl
 erff
 erfl
-exit DATA
+exit
 exp
 exp2
 exp2f

diff --git a/mingw-w64-crt/lib64/msvcr80.def.in b/mingw-w64-crt/lib64/msvcr80.def.in
index 825afc1..171f585 100644
--- a/mingw-w64-crt/lib64/msvcr80.def.in
+++ b/mingw-w64-crt/lib64/msvcr80.def.in

@@ -251,7 +251,7 @@
 _execve
 _execvp
 _execvpe
-_exit DATA
+_exit
 _expand
 _fcloseall
 _fcvt
@@ -718,7 +718,7 @@
 _ctime32
 difftime
 div
-exit DATA
+exit
 exp DATA
 expf DATA
 fabs

diff --git a/mingw-w64-crt/lib64/msvcr90.def.in b/mingw-w64-crt/lib64/msvcr90.def.in
index 00f13b5..876a672 100644
--- a/mingw-w64-crt/lib64/msvcr90.def.in
+++ b/mingw-w64-crt/lib64/msvcr90.def.in

@@ -405,7 +405,7 @@
 _execve
 _execvp
 _execvpe
-_exit DATA
+_exit
 _expand
 _fclose_nolock
 _fcloseall
@@ -1276,7 +1276,7 @@
 cosh
 coshf DATA
 div
-exit DATA
+exit
 exp DATA
 expf DATA
 fabs DATA

diff --git a/mingw-w64-crt/lib64/msvcr90d.def.in b/mingw-w64-crt/lib64/msvcr90d.def.in
index 2634295..26c5888 100644
--- a/mingw-w64-crt/lib64/msvcr90d.def.in
+++ b/mingw-w64-crt/lib64/msvcr90d.def.in

@@ -456,7 +456,7 @@
 _execve
 _execvp
 _execvpe
-_exit DATA
+_exit
 _expand
 _expand_dbg
 _fclose_nolock
@@ -1342,7 +1342,7 @@
 cosh
 coshf
 div
-exit DATA
+exit
 exp DATA
 expf DATA
 fabs

diff --git a/mingw-w64-crt/libarm32/kernelbase.def b/mingw-w64-crt/libarm32/kernelbase.def
index f6626c5..d6a487d 100644
--- a/mingw-w64-crt/libarm32/kernelbase.def
+++ b/mingw-w64-crt/libarm32/kernelbase.def

@@ -1882,7 +1882,7 @@
 _amsg_exit
 _c_exit
 _cexit
-_exit DATA
+_exit
 _initterm
 _initterm_e
 _invalid_parameter
@@ -1890,7 +1890,7 @@
 _purecall
 _time64
 atexit DATA
-exit DATA
+exit
 hgets
 hwprintf
 lstrcmp

diff --git a/mingw-w64-crt/libarm32/msvcr110.def b/mingw-w64-crt/libarm32/msvcr110.def
index 0c052a4..e9835df 100644
--- a/mingw-w64-crt/libarm32/msvcr110.def
+++ b/mingw-w64-crt/libarm32/msvcr110.def

@@ -574,7 +574,7 @@
 _execve
 _execvp
 _execvpe
-_exit DATA
+_exit
 _expand
 _fclose_nolock
 _fcloseall
@@ -1410,7 +1410,7 @@
 cosh
 coshf
 div
-exit DATA
+exit
 exp
 expf
 fabs

diff --git a/mingw-w64-crt/libarm32/msvcr120_clr0400.def b/mingw-w64-crt/libarm32/msvcr120_clr0400.def
index dcb34cc..a778c7e 100644
--- a/mingw-w64-crt/libarm32/msvcr120_clr0400.def
+++ b/mingw-w64-crt/libarm32/msvcr120_clr0400.def

@@ -573,7 +573,7 @@
 _execve
 _execvp
 _execvpe
-_exit DATA
+_exit
 _expand
 _fclose_nolock
 _fcloseall
@@ -1409,7 +1409,7 @@
 cosh
 coshf
 div
-exit DATA
+exit
 exp
 expf
 fabs