Attachment #183949 for bug #220381

Lines 415-420 void __libc_map_stacks_exec(void); Link Here

(-)b/lib/libc/include/libc_private.h (+5 lines)
415	void _pthread_cancel_enter(int);	415	void _pthread_cancel_enter(int);
416	void _pthread_cancel_leave(int);	416	void _pthread_cancel_leave(int);
417		417
		418	struct _pthread_cleanup_info;
		419	void ___pthread_cleanup_push_imp(void ()(void ), void *,
		420	struct _pthread_cleanup_info *);
		421	void ___pthread_cleanup_pop_imp(int);
		422
418	void __throw_constraint_handler_s(const char * restrict msg, int error);	423	void __throw_constraint_handler_s(const char * restrict msg, int error);
419		424
420	#endif /* _LIBC_PRIVATE_H_ */	425	#endif /* _LIBC_PRIVATE_H_ */




		struct _pthread_cleanup_info __cleanup_info__;		\
		if (__isthreaded) {					\
			_FLOCKFILE(fp);					\
			___pthread_cleanup_push_imp(			\
			    __stdio_cancel_cleanup, (fp), 		\
			    &__cleanup_info__);				\
		} else {						\
			___pthread_cleanup_push_imp(			\
			    __stdio_cancel_cleanup, NULL, 		\
			    &__cleanup_info__);				\
		}							\

#define	FUNLOCKFILE_CANCELSAFE()					\
			(void)0;					\
		}							\
		___pthread_cleanup_pop_imp(1);				\
	}

#endif /* _STDIO_LOCAL_H */

Return to bug 220381

Lines 148-158 void __stdio_cancel_cleanup(void *); Link Here

(-)b/lib/libc/stdio/local.h (-3 / +3 lines)
148	struct _pthread_cleanup_info __cleanup_info__; \	148	struct _pthread_cleanup_info __cleanup_info__; \
149	if (__isthreaded) { \	149	if (__isthreaded) { \
150	_FLOCKFILE(fp); \	150	_FLOCKFILE(fp); \
151	__pthread_cleanup_push_imp( \	151	___pthread_cleanup_push_imp( \
152	__stdio_cancel_cleanup, (fp), \	152	__stdio_cancel_cleanup, (fp), \
153	&__cleanup_info__); \	153	&__cleanup_info__); \
154	} else { \	154	} else { \
155	__pthread_cleanup_push_imp( \	155	___pthread_cleanup_push_imp( \
156	__stdio_cancel_cleanup, NULL, \	156	__stdio_cancel_cleanup, NULL, \
157	&__cleanup_info__); \	157	&__cleanup_info__); \
158	} \	158	} \
Lines 160-166 void __stdio_cancel_cleanup(void *); Link Here
160	#define FUNLOCKFILE_CANCELSAFE() \	160	#define FUNLOCKFILE_CANCELSAFE() \
161	(void)0; \	161	(void)0; \
162	} \	162	} \
163	__pthread_cleanup_pop_imp(1); \	163	___pthread_cleanup_pop_imp(1); \
164	}	164	}
165		165
166	#endif /* _STDIO_LOCAL_H */	166	#endif /* _STDIO_LOCAL_H */