about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ports/ChangeLog.ia647
-rw-r--r--ports/sysdeps/ia64/dl-tls.h8
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