Get rid of versioning and shared library compatibility code. We want to start with as clean of a slate as possible. Whip me, beat me, make me shrink the code.

5 files changed, 5 insertions, 97 deletions

diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_create.c b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_create.c
index 1849f72a4..a07b1afe5 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_create.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_create.c
@@ -17,7 +17,6 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <shlib-compat.h>
 #include "compat-timer.h"
 #include <atomic.h>
 
@@ -26,41 +25,4 @@
 #include "../timer_create.c"
 
 #undef timer_create
-versioned_symbol (librt, __timer_create_new, timer_create, GLIBC_2_3_3);
-
-
-#if SHLIB_COMPAT (librt, GLIBC_2_2, GLIBC_2_3_3)
-timer_t __compat_timer_list[OLD_TIMER_MAX] attribute_hidden;
-
-
-int
-__timer_create_old (clockid_t clock_id, struct sigevent *evp, int *timerid)
-{
-  timer_t newp;
-
-  int res = __timer_create_new (clock_id, evp, &newp);
-  if (res == 0)
-    {
-      int i;
-      for (i = 0; i < OLD_TIMER_MAX; ++i)
-	if (__compat_timer_list[i] == NULL
-	    && ! atomic_compare_and_exchange_bool_acq (&__compat_timer_list[i],
-						       newp, NULL))
-	  {
-	    *timerid = i;
-	    break;
-	  }
-
-      if (__builtin_expect (i == OLD_TIMER_MAX, 0))
-	{
-	  /* No free slot.  */
-	  (void) __timer_delete_new (newp);
-	  __set_errno (EINVAL);
-	  res = -1;
-	}
-    }
-
-  return res;
-}
-compat_symbol (librt, __timer_create_old, timer_create, GLIBC_2_2);
-#endif
+weak_alias(__timer_create_new, timer_create)
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_delete.c b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_delete.c
index 6e0d9d033..8456dc31a 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_delete.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_delete.c
@@ -17,7 +17,6 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <shlib-compat.h>
 #include "compat-timer.h"
 
 
@@ -25,21 +24,4 @@
 #include "../timer_delete.c"
 
 #undef timer_delete
-versioned_symbol (librt, __timer_delete_new, timer_delete, GLIBC_2_3_3);
-
-
-#if SHLIB_COMPAT (librt, GLIBC_2_2, GLIBC_2_3_3)
-int
-__timer_delete_old (int timerid)
-{
-  int res = __timer_delete_new (__compat_timer_list[timerid]);
-
-  if (res == 0)
-    /* Successful timer deletion, now free the index.  We only need to
-       store a word and that better be atomic.  */
-    __compat_timer_list[timerid] = NULL;
-
-  return res;
-}
-compat_symbol (librt, __timer_delete_old, timer_delete, GLIBC_2_2);
-#endif
+weak_alias(__timer_delete_new, timer_delete)
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c
index d75636c99..86a2df696 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c
@@ -17,7 +17,6 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <shlib-compat.h>
 #include "compat-timer.h"
 
 
@@ -25,15 +24,4 @@
 #include "../timer_getoverr.c"
 
 #undef timer_getoverrun
-versioned_symbol (librt, __timer_getoverrun_new, timer_getoverrun,
-		  GLIBC_2_3_3);
-
-
-#if SHLIB_COMPAT (librt, GLIBC_2_2, GLIBC_2_3_3)
-int
-__timer_getoverrun_old (int timerid)
-{
-  return __timer_getoverrun_new (__compat_timer_list[timerid]);
-}
-compat_symbol (librt, __timer_getoverrun_old, timer_getoverrun, GLIBC_2_2);
-#endif
+weak_alias(__timer_getoverrun_new, timer_getoverrun)
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c
index 1f1253af2..6b260e453 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c
@@ -17,7 +17,6 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <shlib-compat.h>
 #include "compat-timer.h"
 
 
@@ -25,14 +24,4 @@
 #include "../timer_gettime.c"
 
 #undef timer_gettime
-versioned_symbol (librt, __timer_gettime_new, timer_gettime, GLIBC_2_3_3);
-
-
-#if SHLIB_COMPAT (librt, GLIBC_2_2, GLIBC_2_3_3)
-int
-__timer_gettime_old (int timerid, struct itimerspec *value)
-{
-  return __timer_gettime_new (__compat_timer_list[timerid], value);
-}
-compat_symbol (librt, __timer_gettime_old, timer_gettime, GLIBC_2_2);
-#endif
+weak_alias(__timer_gettime_new, timer_gettime)
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_settime.c b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_settime.c
index 4c945ec51..0ec178246 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_settime.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_settime.c
@@ -17,7 +17,6 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <shlib-compat.h>
 #include "compat-timer.h"
 
 
@@ -25,16 +24,4 @@
 #include "../timer_settime.c"
 
 #undef timer_settime
-versioned_symbol (librt, __timer_settime_new, timer_settime, GLIBC_2_3_3);
-
-
-#if SHLIB_COMPAT (librt, GLIBC_2_2, GLIBC_2_3_3)
-int
-__timer_settime_old (int timerid, int flags, const struct itimerspec *value,
-		     struct itimerspec *ovalue)
-{
-  return __timer_settime_new (__compat_timer_list[timerid], flags,
-			      value, ovalue);
-}
-compat_symbol (librt, __timer_settime_old, timer_settime, GLIBC_2_2);
-#endif
+weak_alias(__timer_settime_new, timer_settime)