summaryrefslogtreecommitdiff
path: root/ports/sysdeps
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2014-01-04 08:55:03 -0500
committerMike Frysinger <vapier@gentoo.org>2014-01-04 08:58:08 -0500
commit19f6b98b55b9bd3c8cad4c22212efdb7545752f2 (patch)
tree236bd4ccec5e1a6a27a819b43eb64d659a426c34 /ports/sysdeps
parent0c813d1f3e31b59844655c0c1b61462b32102c1a (diff)
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/sysdeps')
-rw-r--r--ports/sysdeps/ia64/dl-tls.h8
1 files changed, 4 insertions, 4 deletions
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