OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ia64: fix build failure after async tls updates 

The recent commit 7f507ee17a added a new
local variable "offset" to tls_get_addr_tail.  This conflicts with the
ia64 code which also declares an offset code inline in this func.  So
have the ia64 code rename its local vars with a prefix that shouldn't
collide with anything else in the future.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2014-01-04 08:55:03 -05:00
parent 0c813d1f3e
commit 19f6b98b55
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ports/ChangeLog.ia64
View File

@ -1,3 +1,10 @@
2014-01-04 Mike Frysinger <vapier@gentoo.org>
* sysdeps/ia64/dl-tls.h (GET_ADDR_ARGS): Add "tls_ia64_" prefix to vars.
(GET_ADDR_PARAM): Likewise.
(GET_ADDR_MODULE): Likewise.
(GET_ADDR_OFFSET): Likewise.
2013-12-30 Mike Frysinger <vapier@gentoo.org>
* sysdeps/unix/sysv/linux/ia64/Makefile (gen-as-const-headers): Add

8
ports/sysdeps/ia64/dl-tls.h
View File

@ -19,10 +19,10 @@
/* On IA-64 the __tls_get_addr function take the module ID and the
offset as parameters. */
#define GET_ADDR_ARGS size_t m, size_t offset
#define GET_ADDR_PARAM m, offset
#define GET_ADDR_MODULE m
#define GET_ADDR_OFFSET offset
#define GET_ADDR_ARGS size_t tls_ia64_m, size_t tls_ia64_offset
#define GET_ADDR_PARAM tls_ia64_m, tls_ia64_offset
#define GET_ADDR_MODULE tls_ia64_m
#define GET_ADDR_OFFSET tls_ia64_offset
/* We have no tls_index type. */
#define DONT_USE_TLS_INDEX 1