about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--linuxthreads/ChangeLog7
-rw-r--r--linuxthreads/pthread.c4
-rw-r--r--linuxthreads/signals.c2
3 files changed, 10 insertions, 3 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index c419535c46..68d4de08d0 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,10 @@
+2000-03-14  Andreas Jaeger  <aj@suse.de>
+
+	* pthread.c (pthread_handle_sigcancel_rt): GS has been renamed to
+	REG_GS.
+	(pthread_handle_sigrestart_rt): Likewise.
+	* signals.c (pthread_sighandler_rt): Likewise.
+
 2000-03-02  Andreas Jaeger  <aj@suse.de>
 
 	* sysdeps/pthread/bits/libc-lock.h: Fix typo.
diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c
index 5f544c75d5..5884b9b460 100644
--- a/linuxthreads/pthread.c
+++ b/linuxthreads/pthread.c
@@ -655,7 +655,7 @@ static void pthread_handle_sigrestart_nonrt(int sig, struct sigcontext ctx)
 static void pthread_handle_sigrestart_rt(int sig, struct siginfo *si,
 					 struct ucontext *uc)
 {
-  asm volatile ("movw %w0,%%gs" : : "r" (uc->uc_mcontext.gregs[GS]));
+  asm volatile ("movw %w0,%%gs" : : "r" (uc->uc_mcontext.gregs[REG_GS]));
   pthread_handle_sigrestart(sig);
 }
 #endif
@@ -704,7 +704,7 @@ static void pthread_handle_sigcancel_nonrt(int sig, struct sigcontext ctx)
 static void pthread_handle_sigcancel_rt(int sig, struct siginfo *si,
 					 struct ucontext *uc)
 {
-  asm volatile ("movw %w0,%%gs" : : "r" (uc->uc_mcontext.gregs[GS]));
+  asm volatile ("movw %w0,%%gs" : : "r" (uc->uc_mcontext.gregs[REG_GS]));
   pthread_handle_sigcancel(sig);
 }
 #endif
diff --git a/linuxthreads/signals.c b/linuxthreads/signals.c
index be221d7a99..c044576065 100644
--- a/linuxthreads/signals.c
+++ b/linuxthreads/signals.c
@@ -109,7 +109,7 @@ static void pthread_sighandler_rt(int signo, struct siginfo *si,
   pthread_descr self;
   char * in_sighandler;
 #ifdef __i386__
-  asm volatile ("movw %w0,%%gs" : : "r" (uc->uc_mcontext.gregs[GS]));
+  asm volatile ("movw %w0,%%gs" : : "r" (uc->uc_mcontext.gregs[REG_GS]));
 #endif
   self =  thread_self();
   /* If we're in a sigwait operation, just record the signal received