diff options
| -rw-r--r-- | c/src/exec/libcsupport/src/newlibc.c | 12 | ||||
| -rw-r--r-- | c/src/lib/libc/newlibc.c | 12 | ||||
| -rw-r--r-- | cpukit/libcsupport/src/newlibc.c | 12 |
3 files changed, 33 insertions, 3 deletions
diff --git a/c/src/exec/libcsupport/src/newlibc.c b/c/src/exec/libcsupport/src/newlibc.c index 4926467837..6331997750 100644 --- a/c/src/exec/libcsupport/src/newlibc.c +++ b/c/src/exec/libcsupport/src/newlibc.c @@ -84,7 +84,11 @@ libc_wrapup(void) if (!_System_state_Is_up(_System_state_Get())) return; + /* + * This was already done if the user called exit() directly . + _wrapup_reent(0); + */ if (_REENT != &libc_global_reent) { _wrapup_reent(&libc_global_reent); @@ -363,7 +367,13 @@ int get_errno() #if !defined(RTEMS_UNIX) && !defined(_AM29K) void _exit(int status) { - libc_wrapup(); /* Why? XXX */ + /* + * We need to do the exit processing on the global reentrancy structure. + * This has already been done on the per task reentrancy structure + * associated with this task. + */ + + libc_wrapup(); rtems_shutdown_executive(status); } diff --git a/c/src/lib/libc/newlibc.c b/c/src/lib/libc/newlibc.c index 4926467837..6331997750 100644 --- a/c/src/lib/libc/newlibc.c +++ b/c/src/lib/libc/newlibc.c @@ -84,7 +84,11 @@ libc_wrapup(void) if (!_System_state_Is_up(_System_state_Get())) return; + /* + * This was already done if the user called exit() directly . + _wrapup_reent(0); + */ if (_REENT != &libc_global_reent) { _wrapup_reent(&libc_global_reent); @@ -363,7 +367,13 @@ int get_errno() #if !defined(RTEMS_UNIX) && !defined(_AM29K) void _exit(int status) { - libc_wrapup(); /* Why? XXX */ + /* + * We need to do the exit processing on the global reentrancy structure. + * This has already been done on the per task reentrancy structure + * associated with this task. + */ + + libc_wrapup(); rtems_shutdown_executive(status); } diff --git a/cpukit/libcsupport/src/newlibc.c b/cpukit/libcsupport/src/newlibc.c index 4926467837..6331997750 100644 --- a/cpukit/libcsupport/src/newlibc.c +++ b/cpukit/libcsupport/src/newlibc.c @@ -84,7 +84,11 @@ libc_wrapup(void) if (!_System_state_Is_up(_System_state_Get())) return; + /* + * This was already done if the user called exit() directly . + _wrapup_reent(0); + */ if (_REENT != &libc_global_reent) { _wrapup_reent(&libc_global_reent); @@ -363,7 +367,13 @@ int get_errno() #if !defined(RTEMS_UNIX) && !defined(_AM29K) void _exit(int status) { - libc_wrapup(); /* Why? XXX */ + /* + * We need to do the exit processing on the global reentrancy structure. + * This has already been done on the per task reentrancy structure + * associated with this task. + */ + + libc_wrapup(); rtems_shutdown_executive(status); } |