From: Ulrich Drepper <drepper@redhat.com>
Date: Sat, 5 Oct 2002 06:52:02 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2-3-1~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=05a5122742c8519f28628cf16129a5a3d65a957d;p=platform%2Fupstream%2Fglibc.git

Update.

2002-10-05  Kaz Kojima  <kkojima@rr.iij4u.or.jp>

	* elf/tls-macros.h: Fix SH version of macros so as to match ABI syntax.

2002-10-03  Ulrich Drepper  <drepper@redhat.com>

	* version.h (RELEASE): Change to stable.

See ChangeLog.13 for earlier changes.
---

diff --git a/ChangeLog b/ChangeLog
index 9bf4230..39f099d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-10-05  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* elf/tls-macros.h: Fix SH version of macros so as to match ABI syntax.
+
+2002-10-03  Ulrich Drepper  <drepper@redhat.com>
+
+	* version.h (RELEASE): Change to stable.
+
 2002-10-03  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/unix/sysv/linux/_exit.c (__syscall_exit,
@@ -7,4 +15,4 @@
 
 	* glibc 2.3 released.
 
-See ChangeLog.12 for earlier changes.
+See ChangeLog.13 for earlier changes.
diff --git a/elf/tls-macros.h b/elf/tls-macros.h
index 1f9cf44..846da91 100644
--- a/elf/tls-macros.h
+++ b/elf/tls-macros.h
@@ -154,8 +154,8 @@
 	  "bra 2f\n\t"							      \
 	  " add %1,%0\n\t"						      \
 	  ".align 2\n\t"						      \
-	  "0: .long _GLOBAL_OFFSET_TABLE_\n\t"				      \
 	  "1: .long " #x "@gottpoff\n\t"				      \
+	  "0: .long _GLOBAL_OFFSET_TABLE_\n\t"				      \
 	  "2:"								      \
 	  : "=r" (__l), "=r" (__tp) : : "r0", "r12");			      \
      __l; })
@@ -171,17 +171,20 @@
 	  "add r0,r1\n\t"						      \
 	  "jsr @r1\n\t"							      \
 	  " add r12,r4\n\t"						      \
-	  "mov.l 3f,%0\n\t"						      \
 	  "bra 4f\n\t"							      \
-	  " add r0,%0\n\t"						      \
+	  " nop\n\t"							      \
 	  ".align 2\n\t"						      \
-	  "0: .long _GLOBAL_OFFSET_TABLE_\n\t"				      \
 	  "1: .long " #x "@tlsldm\n\t"					      \
 	  "2: .long __tls_get_addr@plt\n\t"				      \
+	  "0: .long _GLOBAL_OFFSET_TABLE_\n\t"				      \
+	  "4: mov.l 3f,%0\n\t"						      \
+	  "bra 5f\n\t"							      \
+	  " add r0,%0\n\t"						      \
+	  ".align 2\n\t"						      \
 	  "3: .long " #x "@dtpoff\n\t"					      \
-	  "4:"								      \
+	  "5:"								      \
 	  : "=r" (__l) : : "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",    \
-			   "r12", "pr", "t");					      \
+			   "r12", "pr", "t");				      \
      __l; })
 
 # define TLS_GD(x) \
@@ -198,12 +201,12 @@
 	  "bra 3f\n\t"							      \
 	  " mov r0,%0\n\t"						      \
 	  ".align 2\n\t"						      \
-	  "0: .long _GLOBAL_OFFSET_TABLE_\n\t"				      \
 	  "1: .long " #x "@tlsgd\n\t"					      \
 	  "2: .long __tls_get_addr@plt\n\t"				      \
+	  "0: .long _GLOBAL_OFFSET_TABLE_\n\t"				      \
 	  "3:"								      \
 	  : "=r" (__l) : : "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",    \
-			   "r12", "pr", "t");					      \
+			   "r12", "pr", "t");				      \
      __l; })
 
 #else
diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index 3e64c74..a8145e1 100644
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -209,7 +209,7 @@
 #endif
 
 /* On x86, the set_thread_area syscall was introduced in 2.5.29, but its
-   semantics was changed in 2.5.30, and again after 2.3.31.  */
+   semantics was changed in 2.5.30, and again after 2.5.31.  */
 #if __LINUX_KERNEL_VERSION >= 132384 && defined __i386__
 # define __ASSUME_SET_THREAD_AREA_SYSCALL	1
 #endif
diff --git a/version.h b/version.h
index d10413a..ee1d91e 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
 /* This file just defines the current version number of libc.  */
 
-#define RELEASE "development"
+#define RELEASE "stable"
 #define VERSION "2.3"