From 4d611e1261961bb9460faf21418845918ad270fd Mon Sep 17 00:00:00 2001 From: Martin Galvan Date: Sat, 28 Mar 2015 01:31:56 -0300 Subject: 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. --- ChangeLog | 6 ++++++ sysdeps/i386/nptl/tls.h | 5 +++-- sysdeps/x86_64/nptl/tls.h | 4 ++-- 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 + + * 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 * 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)" : \ -- cgit v1.2.3