about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMartin Galvan <martin.galvan@tallertechnologies.com>2015-03-28 01:31:56 -0300
committerMike Frysinger <vapier@gentoo.org>2015-03-28 00:44:22 -0400
commit4d611e1261961bb9460faf21418845918ad270fd (patch)
tree1544863ccfb5cb0be9860203c80d2ee0a861503a
parent7285eb535aa8bdb43298069b353a3a4b4340a2b4 (diff)
downloadglibc-4d611e1261961bb9460faf21418845918ad270fd.tar.gz
glibc-4d611e1261961bb9460faf21418845918ad270fd.tar.xz
glibc-4d611e1261961bb9460faf21418845918ad270fd.zip
NPTL: swap comments for THREAD_SETMEM and THREAD_SETMEM_NC for i386 and x86_64
The comments for THREAD_SETMEM and THREAD_SETMEM_NC were swapped for
i386 and x86_64; this patch fixes that.
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/i386/nptl/tls.h5
-rw-r--r--sysdeps/x86_64/nptl/tls.h4
3 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 09ceae6884..70a4657c55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-27  Martin Galvan  <martin.galvan@tallertechnologies.com>
+
+	* sysdeps/i386/nptl/tls.h: Swap comments between THREAD_SETMEM and
+	THREAD_SETMEM_NC.
+	* sysdeps/x86_64/nptl/tls.h: Ditto.
+
 2015-03-27  Roland McGrath  <roland@hack.frob.com>
 
 	* dlfcn/tststatic.c (main): Converted to ...
diff --git a/sysdeps/i386/nptl/tls.h b/sysdeps/i386/nptl/tls.h
index 40f84ef4f7..829cd3a008 100644
--- a/sysdeps/i386/nptl/tls.h
+++ b/sysdeps/i386/nptl/tls.h
@@ -316,7 +316,8 @@ tls_fill_user_desc (union user_desc_init *desc,
      __value; })
 
 
-/* Same as THREAD_SETMEM, but the member offset can be non-constant.  */
+
+/* Set member of the thread descriptor directly.  */
 # define THREAD_SETMEM(descr, member, value) \
   ({ if (sizeof (descr->member) == 1)					      \
        asm volatile ("movb %b0,%%gs:%P1" :				      \
@@ -341,7 +342,7 @@ tls_fill_user_desc (union user_desc_init *desc,
        }})
 
 
-/* Set member of the thread descriptor directly.  */
+/* Same as THREAD_SETMEM, but the member offset can be non-constant.  */
 # define THREAD_SETMEM_NC(descr, member, idx, value) \
   ({ if (sizeof (descr->member[0]) == 1)				      \
        asm volatile ("movb %b0,%%gs:%P1(%2)" :				      \
diff --git a/sysdeps/x86_64/nptl/tls.h b/sysdeps/x86_64/nptl/tls.h
index b947d57447..d7543c651f 100644
--- a/sysdeps/x86_64/nptl/tls.h
+++ b/sysdeps/x86_64/nptl/tls.h
@@ -250,7 +250,7 @@ typedef struct
 #endif
 
 
-/* Same as THREAD_SETMEM, but the member offset can be non-constant.  */
+/* Set member of the thread descriptor directly.  */
 # define THREAD_SETMEM(descr, member, value) \
   ({ if (sizeof (descr->member) == 1)					      \
        asm volatile ("movb %b0,%%fs:%P1" :				      \
@@ -273,7 +273,7 @@ typedef struct
        }})
 
 
-/* Set member of the thread descriptor directly.  */
+/* Same as THREAD_SETMEM, but the member offset can be non-constant.  */
 # define THREAD_SETMEM_NC(descr, member, idx, value) \
   ({ if (sizeof (descr->member[0]) == 1)				      \
        asm volatile ("movb %b0,%%fs:%P1(%q2)" :				      \