qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove SJLJ exceptions conditionals for ARM.

This commit is contained in:
Joseph Myers 2012-05-30 10:07:11 +00:00
parent cc824a2e80
commit 17cb6fe2a4
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog.arm
View File

@ -1,5 +1,10 @@
2012-05-30 Joseph Myers <joseph@codesourcery.com> 2012-05-30 Joseph Myers <joseph@codesourcery.com>
* sysdeps/arm/start.S [!__USING_SJLJ_EXCEPTIONS__]: Make code
unconditional.
* sysdeps/unix/sysv/linux/arm/nptl/pthread_once.c
[__USING_SJLJ_EXCEPTIONS__ && !__PIC__]: Remove conditional code.
* sysdeps/unix/sysv/linux/arm/nptl/pthread_once.c: Replace * sysdeps/unix/sysv/linux/arm/nptl/pthread_once.c: Replace
_internal alias by hidden_def. _internal alias by hidden_def.

5
sysdeps/arm/start.S
View File

@ -73,10 +73,8 @@
.globl _start .globl _start
.type _start,#function .type _start,#function
_start: _start:
#if !defined(__USING_SJLJ_EXCEPTIONS__)
/* Protect against unhandled exceptions. */ /* Protect against unhandled exceptions. */
.fnstart .fnstart
#endif
/* Clear the frame pointer and link register since this is the outermost frame. */ /* Clear the frame pointer and link register since this is the outermost frame. */
mov fp, #0 mov fp, #0
mov lr, #0 mov lr, #0
@ -138,11 +136,8 @@ _start:
.word main(GOT) .word main(GOT)
#endif #endif
#if !defined(__USING_SJLJ_EXCEPTIONS__)
.cantunwind .cantunwind
.fnend .fnend
#endif
/* Define a symbol for the first piece of initialized data. */ /* Define a symbol for the first piece of initialized data. */
.data .data

9
sysdeps/unix/sysv/linux/arm/nptl/pthread_once.c
View File

@ -87,12 +87,3 @@ __pthread_once (pthread_once_t *once_control, void (*init_routine) (void))
} }
weak_alias (__pthread_once, pthread_once) weak_alias (__pthread_once, pthread_once)
hidden_def (__pthread_once) hidden_def (__pthread_once)
#if defined(__USING_SJLJ_EXCEPTIONS__) && !defined(__PIC__)
/* When statically linked, if pthread_create is used, this file
will be brought in. The exception handling code in GCC assumes
that if pthread_create is available, so are these. */
const void *include_pthread_getspecific attribute_hidden = pthread_getspecific;
const void *include_pthread_setspecific attribute_hidden = pthread_setspecific;
const void *include_pthread_key_create attribute_hidden = pthread_key_create;
#endif