diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2014-01-04 08:55:03 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-01-04 08:58:08 -0500 |
| commit | 19f6b98b55b9bd3c8cad4c22212efdb7545752f2 (patch) | |
| tree | 236bd4ccec5e1a6a27a819b43eb64d659a426c34 /ports | |
| parent | 0c813d1f3e31b59844655c0c1b61462b32102c1a (diff) | |
| download | glibc-19f6b98b55b9bd3c8cad4c22212efdb7545752f2.tar.gz glibc-19f6b98b55b9bd3c8cad4c22212efdb7545752f2.tar.xz glibc-19f6b98b55b9bd3c8cad4c22212efdb7545752f2.zip | |
ia64: fix build failure after async tls updates
The recent commit 7f507ee17aee720fa423fa38502bc3caa0dd03d7 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>
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/ChangeLog.ia64 | 7 | ||||
| -rw-r--r-- | ports/sysdeps/ia64/dl-tls.h | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/ports/ChangeLog.ia64 b/ports/ChangeLog.ia64 index c0bac5567c..143e015035 100644 --- a/ports/ChangeLog.ia64 +++ b/ports/ChangeLog.ia64 @@ -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 diff --git a/ports/sysdeps/ia64/dl-tls.h b/ports/sysdeps/ia64/dl-tls.h index 0b687fb8bc..9e63c8edd5 100644 --- a/ports/sysdeps/ia64/dl-tls.h +++ b/ports/sysdeps/ia64/dl-tls.h @@ -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 |