From: Bart Van Assche <bvanassche@acm.org>
Date: Sat, 15 Mar 2008 10:23:53 +0000 (+0000)
Subject: Because of a recent change the glibc 2.0 and glibc 2.x (x>=1) redirections are now... 
X-Git-Tag: svn/VALGRIND_3_4_0~876
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=39932c9a4441abdfaecdbe6916026a2bba91d627;p=thirdparty%2Fvalgrind.git

Because of a recent change the glibc 2.0 and glibc 2.x (x>=1) redirections are now identical. Removed the duplicate redirections.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7686
---

diff --git a/exp-drd/drd_pthread_intercepts.c b/exp-drd/drd_pthread_intercepts.c
index 4a36af2677..34229f5250 100644
--- a/exp-drd/drd_pthread_intercepts.c
+++ b/exp-drd/drd_pthread_intercepts.c
@@ -639,23 +639,6 @@ PTH_FUNC(int, pthreadZubarrierZuwait, // pthread_barrier_wait
 
 
 // sem_init
-PTH_FUNC(int, semZuinitZAGLIBCZu2Zd0, // sem_init@GLIBC_2.0
-         sem_t *sem,
-         int pshared,
-         unsigned int value)
-{
-  int   ret;
-  int   res;
-  OrigFn fn;
-  VALGRIND_GET_ORIG_FN(fn);
-  VALGRIND_DO_CLIENT_REQUEST(res, -1, VG_USERREQ__PRE_SEM_INIT,
-                             sem, pshared, value, 0, 0);
-  CALL_FN_W_WWW(ret, fn, sem, pshared, value);
-  VALGRIND_DO_CLIENT_REQUEST(res, -1, VG_USERREQ__POST_SEM_INIT,
-                             sem, 0, 0, 0, 0);
-  return ret;
-}
-
 PTH_FUNC(int, semZuinitZa, // sem_init*
          sem_t *sem,
          int pshared,
@@ -674,21 +657,6 @@ PTH_FUNC(int, semZuinitZa, // sem_init*
 }
 
 // sem_destroy
-PTH_FUNC(int, semZudestroyZAGLIBCZu2Zd0, // sem_destroy@GLIBC_2.0
-         sem_t *sem)
-{
-  int   ret;
-  int   res;
-  OrigFn fn;
-  VALGRIND_GET_ORIG_FN(fn);
-  VALGRIND_DO_CLIENT_REQUEST(res, -1, VG_USERREQ__PRE_SEM_DESTROY,
-                             sem, 0, 0, 0, 0);
-  CALL_FN_W_W(ret, fn, sem);
-  VALGRIND_DO_CLIENT_REQUEST(res, -1, VG_USERREQ__POST_SEM_DESTROY,
-                             sem, 0, 0, 0, 0);
-  return ret;
-}
-
 PTH_FUNC(int, semZudestroyZa, // sem_destroy*
          sem_t *sem)
 {
@@ -704,22 +672,6 @@ PTH_FUNC(int, semZudestroyZa, // sem_destroy*
   return ret;
 }
 
-// sem_wait
-PTH_FUNC(int, semZuwaitZAGLIBCZu2Zd0, // sem_wait@GLIBC_2.0
-         sem_t *sem)
-{
-  int   ret;
-  int   res;
-  OrigFn fn;
-  VALGRIND_GET_ORIG_FN(fn);
-  VALGRIND_DO_CLIENT_REQUEST(res, -1, VG_USERREQ__PRE_SEM_WAIT,
-                             sem, 0, 0, 0, 0);
-  CALL_FN_W_W(ret, fn, sem);
-  VALGRIND_DO_CLIENT_REQUEST(res, -1, VG_USERREQ__POST_SEM_WAIT,
-                             sem, ret == 0, 0, 0, 0);
-  return ret;
-}
-
 // sem_wait
 PTH_FUNC(int, semZuwaitZa, // sem_wait*
          sem_t *sem)
@@ -737,21 +689,6 @@ PTH_FUNC(int, semZuwaitZa, // sem_wait*
 }
 
 // sem_trywait
-PTH_FUNC(int, semZutrywaitZAGLIBCZu2Zd0, // sem_trywait@GLIBC_2.0
-         sem_t *sem)
-{
-  int   ret;
-  int   res;
-  OrigFn fn;
-  VALGRIND_GET_ORIG_FN(fn);
-  VALGRIND_DO_CLIENT_REQUEST(res, -1, VG_USERREQ__PRE_SEM_WAIT,
-                             sem, 0, 0, 0, 0);
-  CALL_FN_W_W(ret, fn, sem);
-  VALGRIND_DO_CLIENT_REQUEST(res, -1, VG_USERREQ__POST_SEM_WAIT,
-                             sem, ret == 0, 0, 0, 0);
-  return ret;
-}
-
 PTH_FUNC(int, semZutrywaitZa, // sem_trywait*
          sem_t *sem)
 {
@@ -783,22 +720,6 @@ PTH_FUNC(int, semZutimedwait, // sem_timedwait
   return ret;
 }
 
-// sem_post
-PTH_FUNC(int, semZupostZAGLIBCZu2Zd0, // sem_post@GLIBC_2.0
-         sem_t *sem)
-{
-  int   ret;
-  int   res;
-  OrigFn fn;
-  VALGRIND_GET_ORIG_FN(fn);
-  VALGRIND_DO_CLIENT_REQUEST(res, -1, VG_USERREQ__PRE_SEM_POST,
-                             sem, 0, 0, 0, 0);
-  CALL_FN_W_W(ret, fn, sem);
-  VALGRIND_DO_CLIENT_REQUEST(res, -1, VG_USERREQ__POST_SEM_POST,
-                             sem, ret == 0, 0, 0, 0);
-  return ret;
-}
-
 // sem_post
 PTH_FUNC(int, semZupostZa, // sem_post*
          sem_t *sem)