procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

runtime: Fix call to _dl_get_tls_static_info for i386.

Browse source 
From-SVN: r188230
This commit is contained in:
Ian Lance Taylor 2012-06-05 06:19:19 +00:00
parent 70b9f51628
commit 44072af5b0
4 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libgo/config.h.in
View file

@ -286,6 +286,9 @@
/* Define to 1 if you have the `wait4' function. */
#undef HAVE_WAIT4
/* Define to 1 if you have the `_dl_get_tls_static_info' function. */
#undef HAVE__DL_GET_TLS_STATIC_INFO
/* Define if the C++ compiler is configured for setjmp/longjmp exceptions. */
#undef LIBGO_SJLJ_EXCEPTIONS

2
libgo/configure vendored
View file

@ -14584,7 +14584,7 @@ else
fi
for ac_func in strerror_r strsignal wait4 mincore setenv
for ac_func in strerror_r strsignal wait4 mincore setenv _dl_get_tls_static_info
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"

2
libgo/configure.ac
View file

@ -481,7 +481,7 @@ fi
AM_CONDITIONAL(HAVE_SYS_MMAN_H, test "$ac_cv_header_sys_mman_h" = yes)
AC_CHECK_FUNCS(strerror_r strsignal wait4 mincore setenv)
AC_CHECK_FUNCS(strerror_r strsignal wait4 mincore setenv _dl_get_tls_static_info)
AM_CONDITIONAL(HAVE_STRERROR_R, test "$ac_cv_func_strerror_r" = yes)
AM_CONDITIONAL(HAVE_WAIT4, test "$ac_cv_func_wait4" = yes)

27
libgo/runtime/proc.c
View file

@ -1105,6 +1105,7 @@ runtime_newm(void)
M *m;
pthread_attr_t attr;
pthread_t tid;
size_t stacksize;
m = runtime_malloc(sizeof(M));
mcommoninit(m);
@ -1118,7 +1119,31 @@ runtime_newm(void)
#ifndef PTHREAD_STACK_MIN
#define PTHREAD_STACK_MIN 8192
#endif
if(pthread_attr_setstacksize(&attr, PTHREAD_STACK_MIN) != 0)
stacksize = PTHREAD_STACK_MIN;
#ifdef HAVE__DL_GET_TLS_STATIC_INFO
{
/* On GNU/Linux the static TLS size is taken out of
the stack size, and we get an error or a crash if
there is not enough stack space left. Add it back
in if we can, in case the program uses a lot of TLS
space. */
#ifndef internal_function
#ifdef __i386__
#define internal_function __attribute__ ((regparm (3), stdcall))
#else
#define internal_function
#endif
#endif
extern void _dl_get_tls_static_info(size_t*, size_t*) internal_function;
size_t tlssize, tlsalign;
_dl_get_tls_static_info(&tlssize, &tlsalign);
stacksize += tlssize;
}
#endif
if(pthread_attr_setstacksize(&attr, stacksize) != 0)
runtime_throw("pthread_attr_setstacksize");
if(pthread_create(&tid, &attr, runtime_mstart, m) != 0)