d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply r246556 to powerpc:

Browse Source 
Avoid use of register variables, which some compilers (e.g. clang)
don't like. It makes the code a little clearer as well.

This allows a clang 3.5 built powerpc world to run (tested in a jail).

MFC after:	1 week
This commit is contained in:
Justin Hibbits 2015-01-06 03:49:22 +00:00
parent cc6dd788c6
commit 8c29a9824b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=276733
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libexec/rtld-elf/powerpc/reloc.c
View File

@ -622,8 +622,7 @@ init_pltgot(Obj_Entry *obj)
void
allocate_initial_tls(Obj_Entry *list)
{
register Elf_Addr **tp __asm__("r2");
Elf_Addr **_tp;
Elf_Addr **tp;
/*
* Fix the size of the static TLS block by using the maximum
@ -633,22 +632,23 @@ allocate_initial_tls(Obj_Entry *list)
tls_static_space = tls_last_offset + tls_last_size + RTLD_STATIC_TLS_EXTRA;
_tp = (Elf_Addr **) ((char *) allocate_tls(list, NULL, TLS_TCB_SIZE, 8)
tp = (Elf_Addr **) ((char *) allocate_tls(list, NULL, TLS_TCB_SIZE, 8)
+ TLS_TP_OFFSET + TLS_TCB_SIZE);
/*
* XXX gcc seems to ignore 'tp = _tp;'
*/
__asm __volatile("mr %0,%1" : "=r"(tp) : "r"(_tp));
__asm __volatile("mr 2,%0" :: "r"(tp));
}
void*
__tls_get_addr(tls_index* ti)
{
register Elf_Addr **tp __asm__("r2");
register Elf_Addr **tp;
char *p;
__asm __volatile("mr %0,2" : "=r"(tp));
p = tls_get_addr_common((Elf_Addr**)((Elf_Addr)tp - TLS_TP_OFFSET
- TLS_TCB_SIZE), ti->ti_module, ti->ti_offset);