+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
/* 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