12 files changed, 51 insertions, 47 deletions
diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions
index 220bb2dffe..c864ad38ca 100644
--- a/sysdeps/unix/sysv/linux/Versions
+++ b/sysdeps/unix/sysv/linux/Versions
@@ -86,6 +86,16 @@ libc {
 
     # ipc ctl interface change.
     semctl; shmctl; msgctl;
+
+    # Old symbol versions from libpthread.
+    __pread64;
+    __pwrite64;
+    lseek64;
+    open64;
+    pread;
+    pread64;
+    pwrite;
+    pwrite64;
   }
   GLIBC_2.2.1 {
     # p*
@@ -102,7 +112,14 @@ libc {
     epoll_create; epoll_ctl; epoll_wait;
   }
   GLIBC_2.3.3 {
-    gnu_dev_major; gnu_dev_minor; gnu_dev_makedev;
+    _sys_siglist;
+    gnu_dev_major;
+    gnu_dev_makedev;
+    gnu_dev_minor;
+    posix_fadvise64;
+    posix_fallocate64;
+    sys_sigabbrev;
+    sys_siglist;
   }
   GLIBC_2.3.4 {
     sched_getaffinity; sched_setaffinity;
diff --git a/sysdeps/unix/sysv/linux/alpha/Versions b/sysdeps/unix/sysv/linux/alpha/Versions
index b90d5f2e5a..b113cb60e4 100644
--- a/sysdeps/unix/sysv/linux/alpha/Versions
+++ b/sysdeps/unix/sysv/linux/alpha/Versions
@@ -64,6 +64,11 @@ libc {
   GLIBC_2.3 {
     _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
   }
+  GLIBC_2.3.3 {
+    # Changed PTHREAD_STACK_MIN.
+    pthread_attr_setstack;
+    pthread_attr_setstacksize;
+  }
   GLIBC_2.4 {
     _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
   }
@@ -85,12 +90,6 @@ ld {
     __libc_alpha_cache_shape;
   }
 }
-libpthread {
-  GLIBC_2.3.3 {
-    # Changed PTHREAD_STACK_MIN.
-    pthread_attr_setstack; pthread_attr_setstacksize;
-  }
-}
 librt {
   GLIBC_2.3 {
     # AIO functions.
diff --git a/sysdeps/unix/sysv/linux/i386/Versions b/sysdeps/unix/sysv/linux/i386/Versions
index b59ace48da..1335e6551b 100644
--- a/sysdeps/unix/sysv/linux/i386/Versions
+++ b/sysdeps/unix/sysv/linux/i386/Versions
@@ -33,10 +33,6 @@ libc {
     # v*
     versionsort64;
   }
-  GLIBC_2.3.3 {
-    # p*
-    posix_fadvise64; posix_fallocate64;
-  }
   GLIBC_2.3.4 {
     # v*
     vm86;
diff --git a/sysdeps/unix/sysv/linux/ia64/Versions b/sysdeps/unix/sysv/linux/ia64/Versions
index 214e6f9f1a..54e7723ca4 100644
--- a/sysdeps/unix/sysv/linux/ia64/Versions
+++ b/sysdeps/unix/sysv/linux/ia64/Versions
@@ -14,6 +14,11 @@ libc {
     # w*
     wordexp;
   }
+  GLIBC_2.3.3 {
+    # Changed PTHREAD_STACK_MIN.
+    pthread_attr_setstack;
+    pthread_attr_setstacksize;
+  }
   GLIBC_2.2.6 {
     getunwind;
   }
@@ -21,12 +26,6 @@ libc {
     recvmsg; sendmsg;
   }
 }
-libpthread {
-  GLIBC_2.3.3 {
-    # Changed PTHREAD_STACK_MIN.
-    pthread_attr_setstack; pthread_attr_setstacksize;
-  }
-}
 librt {
   GLIBC_2.3.3 {
     # Changed timer_t.
diff --git a/sysdeps/unix/sysv/linux/mips/Versions b/sysdeps/unix/sysv/linux/mips/Versions
index aeaac41744..db6222e9a7 100644
--- a/sysdeps/unix/sysv/linux/mips/Versions
+++ b/sysdeps/unix/sysv/linux/mips/Versions
@@ -21,6 +21,11 @@ libc {
     # _*
     _test_and_set;
   }
+  GLIBC_2.3.3 {
+    # Changed PTHREAD_STACK_MIN.
+    pthread_attr_setstack;
+    pthread_attr_setstacksize;
+  }
   GLIBC_2.11 {
     fallocate64;
   }
diff --git a/sysdeps/unix/sysv/linux/powerpc/Versions b/sysdeps/unix/sysv/linux/powerpc/Versions
index 416272b718..4e814077b5 100644
--- a/sysdeps/unix/sysv/linux/powerpc/Versions
+++ b/sysdeps/unix/sysv/linux/powerpc/Versions
@@ -1,4 +1,9 @@
 libc {
+  GLIBC_2.6 {
+    # Changed PTHREAD_STACK_MIN.
+    pthread_attr_setstack;
+    pthread_attr_setstacksize;
+  }
   GLIBC_PRIVATE {
     __vdso_get_tbfreq;
     __vdso_clock_gettime;
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions b/sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions
index ee505efb9e..918e0231d0 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions
@@ -21,11 +21,15 @@ libc {
     scandir64;
   }
   GLIBC_2.3.3 {
-    posix_fadvise64; posix_fallocate64;
     setcontext; getcontext; swapcontext; makecontext;
   }
   GLIBC_2.3.4 {
-    setcontext; getcontext; swapcontext; makecontext;
+    getcontext;
+    longjmp;
+    makecontext;
+    setcontext;
+    siglongjmp;
+    swapcontext;
   }
   GLIBC_2.11 {
     fallocate64;
@@ -34,9 +38,3 @@ libc {
     __ppc_get_timebase_freq;
   }
 }
-
-libpthread {
-  GLIBC_2.3.4 {
-    longjmp; siglongjmp;
-  }
-}
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions b/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions
index 7a166f2400..84c809507f 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions
@@ -16,7 +16,9 @@ libc {
   }
   GLIBC_2.3.4 {
     getcontext;
+    longjmp;
     setcontext;
+    siglongjmp;
     swapcontext;
   }
   GLIBC_2.17 {
@@ -31,9 +33,3 @@ librt {
     timer_settime;
   }
 }
-
-libpthread {
-  GLIBC_2.3.4 {
-    longjmp; siglongjmp;
-  }
-}
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/Versions b/sysdeps/unix/sysv/linux/s390/s390-32/Versions
index 99193982a7..cc03e70015 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/Versions
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/Versions
@@ -26,9 +26,6 @@ libc {
     # v*
     versionsort64;
   }
-  GLIBC_2.3.3 {
-    posix_fadvise64; posix_fallocate64;
-  }
   GLIBC_2.9 {
     getutent;
     getutid;
diff --git a/sysdeps/unix/sysv/linux/sh/Versions b/sysdeps/unix/sysv/linux/sh/Versions
index e0938c4165..19ba1d8d91 100644
--- a/sysdeps/unix/sysv/linux/sh/Versions
+++ b/sysdeps/unix/sysv/linux/sh/Versions
@@ -21,9 +21,6 @@ libc {
     # v*
     versionsort64;
   }
-  GLIBC_2.3.3 {
-    posix_fadvise64; posix_fallocate64;
-  }
   GLIBC_2.11 {
     fallocate64;
   }
diff --git a/sysdeps/unix/sysv/linux/sparc/Versions b/sysdeps/unix/sysv/linux/sparc/Versions
index 61e57fae99..f1027603a4 100644
--- a/sysdeps/unix/sysv/linux/sparc/Versions
+++ b/sysdeps/unix/sysv/linux/sparc/Versions
@@ -8,6 +8,11 @@ libc {
   GLIBC_2.3 {
     _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
   }
+  GLIBC_2.3.3 {
+    # Changed PTHREAD_STACK_MIN.
+    pthread_attr_setstack;
+    pthread_attr_setstacksize;
+  }
   GLIBC_2.4 {
     _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
   }
@@ -25,13 +30,6 @@ libc {
   }
 }
 
-libpthread {
-  GLIBC_2.3.3 {
-    # Changed PTHREAD_STACK_MIN.
-    pthread_attr_setstack; pthread_attr_setstacksize;
-  }
-}
-
 librt {
   GLIBC_2.3 {
     # AIO functions.
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/Versions b/sysdeps/unix/sysv/linux/sparc/sparc32/Versions
index c9a5b3e9d5..d928a65346 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/Versions
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/Versions
@@ -17,9 +17,6 @@ libc {
     # s*
     scandir64;
   }
-  GLIBC_2.3.3 {
-    posix_fadvise64; posix_fallocate64;
-  }
   GLIBC_2.11 {
     fallocate64;
   }