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 9bf42305e36b909089662986324e4ea6e627f596..39f099d1f0c6a0d4475a8dfa1b4ca610ed9fec5e 100644 (file)
--- 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 1f9cf4448a8c479cf57b7b698c5cf96422b20bd7..846da91080d9df166c3580fb21885862e3b20088 100644 (file)
--- 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 3e64c7411be36ee5c50617991e66a358c06ef022..a8145e159009e72bf02de3a512e7397da92172e5 100644 (file)
--- 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 d10413a5e7a53cf2006eb8e25f2b9ff865f9f67b..ee1d91e594b611de075b039c22ccad7795a7a4b0 100644 (file)
--- 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"