Attachment 183949 Details for Bug 220381 – Try harder to call libc stubs for cleanup push/pop_imp, if libthr still not yet initialized.

[patch] Try harder to call libc stubs for cleanup push/pop_imp, if libthr still not yet initialized.

1.patch (text/plain), 1.46 KB, created by Konstantin Belousov on 2017-06-30 17:38:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Konstantin Belousov

Created: 2017-06-30 17:38:31 UTC

Size: 1.46 KB

patch

obsolete

>diff --git a/lib/libc/include/libc_private.h b/lib/libc/include/libc_private.h
>index 85674ab3c87..019a271ff61 100644
>--- a/lib/libc/include/libc_private.h
>+++ b/lib/libc/include/libc_private.h
>@@ -415,6 +415,11 @@ void __libc_map_stacks_exec(void);
> void	_pthread_cancel_enter(int);
> void	_pthread_cancel_leave(int);
> 
>+struct _pthread_cleanup_info;
>+void	___pthread_cleanup_push_imp(void (*)(void *), void *,
>+	    struct _pthread_cleanup_info *);
>+void	___pthread_cleanup_pop_imp(int);
>+
> void __throw_constraint_handler_s(const char * restrict msg, int error);
> 
> #endif /* _LIBC_PRIVATE_H_ */
>diff --git a/lib/libc/stdio/local.h b/lib/libc/stdio/local.h
>index 5c70b73d72b..176b55aa2fa 100644
>--- a/lib/libc/stdio/local.h
>+++ b/lib/libc/stdio/local.h
>@@ -148,11 +148,11 @@ void __stdio_cancel_cleanup(void *);
> 		struct _pthread_cleanup_info __cleanup_info__;		\
> 		if (__isthreaded) {					\
> 			_FLOCKFILE(fp);					\
>-			__pthread_cleanup_push_imp(			\
>+			___pthread_cleanup_push_imp(			\
> 			    __stdio_cancel_cleanup, (fp), 		\
> 			    &__cleanup_info__);				\
> 		} else {						\
>-			__pthread_cleanup_push_imp(			\
>+			___pthread_cleanup_push_imp(			\
> 			    __stdio_cancel_cleanup, NULL, 		\
> 			    &__cleanup_info__);				\
> 		}							\
>@@ -160,7 +160,7 @@ void __stdio_cancel_cleanup(void *);
> #define	FUNLOCKFILE_CANCELSAFE()					\
> 			(void)0;					\
> 		}							\
>-		__pthread_cleanup_pop_imp(1);				\
>+		___pthread_cleanup_pop_imp(1);				\
> 	}
> 
> #endif /* _STDIO_LOCAL_H */

Actions: View | Diff

Attachments on bug 220381: 183939 | 183949