From b54e18ebb31d856711e2f096a23d85753fbe57d7 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 27 Nov 2002 19:58:24 +0000
Subject: [PATCH] Update.

	* sysdeps/x86_64/pthread_sigmask.c: New file.

	* sysdeps/i386/pthread_sigmask.c (pthread_sigmask): Return correct
	value in case of an error.
---
 nptl/ChangeLog                        |  5 +++++
 nptl/sysdeps/i386/pthread_sigmask.c   |  6 +++++-
 nptl/sysdeps/x86_64/pthread_sigmask.c |  1 +
 nptl/sysdeps/x86_64/tls.h             | 11 -----------
 4 files changed, 11 insertions(+), 12 deletions(-)
 create mode 100644 nptl/sysdeps/x86_64/pthread_sigmask.c

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index c8caf21..530d6f4 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,10 @@
 2002-11-27  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/x86_64/pthread_sigmask.c: New file.
+
+	* sysdeps/i386/pthread_sigmask.c (pthread_sigmask): Return correct
+	value in case of an error.
+
 	* sysdeps/x86_64/tls.h: New file.
 
 2002-11-26  Ulrich Drepper  <drepper@redhat.com>
diff --git a/nptl/sysdeps/i386/pthread_sigmask.c b/nptl/sysdeps/i386/pthread_sigmask.c
index 2ae9198..aa07184 100644
--- a/nptl/sysdeps/i386/pthread_sigmask.c
+++ b/nptl/sysdeps/i386/pthread_sigmask.c
@@ -30,5 +30,9 @@ pthread_sigmask (how, newmask, oldmask)
      const sigset_t *newmask;
      sigset_t *oldmask;
 {
-  return INLINE_SYSCALL (sigprocmask, 3, how, newmask, oldmask);
+  int result = INTERNAL_SYSCALL (sigprocmask, 3, how, newmask, oldmask);
+
+  return (INTERNAL_SYSCALL_ERROR_P (result)
+	  ? INTERNAL_SYSCALL_ERRNO (result)
+	  : 0);
 }
diff --git a/nptl/sysdeps/x86_64/pthread_sigmask.c b/nptl/sysdeps/x86_64/pthread_sigmask.c
new file mode 100644
index 0000000..802d61f
--- /dev/null
+++ b/nptl/sysdeps/x86_64/pthread_sigmask.c
@@ -0,0 +1 @@
+#include "../i386/pthread_sigmask.c"
diff --git a/nptl/sysdeps/x86_64/tls.h b/nptl/sysdeps/x86_64/tls.h
index 2daf032..8a4b718 100644
--- a/nptl/sysdeps/x86_64/tls.h
+++ b/nptl/sysdeps/x86_64/tls.h
@@ -119,17 +119,6 @@ union user_desc_init
   (((tcbhead_t *) (descr))->dtv)
 
 
-/* Macros to load from and store into segment registers.  */
-# ifndef TLS_GET_GS
-#  define TLS_GET_GS() \
-  ({ int __seg; __asm ("movw %%gs, %w0" : "=q" (__seg)); __seg & 0xffff; })
-# endif
-# ifndef TLS_SET_GS
-#  define TLS_SET_GS(val) \
-  __asm ("movw %w0, %%gs" :: "q" (val))
-# endif
-
-
 # ifndef __NR_set_thread_area
 #  define __NR_set_thread_area 243
 # endif
-- 
2.7.4