about summary refs log tree commit diff
path: root/nptl/sysdeps/unix
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2014-05-14 10:35:39 -0700
committerRoland McGrath <roland@hack.frob.com>2014-05-14 10:35:39 -0700
commit3a51fb604715776e051691c65e360bdf7d37488e (patch)
treeba32aeb55c28460018802691e0b58ecc52ce6a17 /nptl/sysdeps/unix
parent941d7dfd247bc116b89ec97d530d618b5862a80f (diff)
downloadglibc-3a51fb604715776e051691c65e360bdf7d37488e.tar.gz
glibc-3a51fb604715776e051691c65e360bdf7d37488e.tar.xz
glibc-3a51fb604715776e051691c65e360bdf7d37488e.zip
Move x86_64 timer_*.c out of nptl/
Diffstat (limited to 'nptl/sysdeps/unix')
-rw-r--r--nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c2
-rw-r--r--nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c2
-rw-r--r--nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c2
-rw-r--r--nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c2
-rw-r--r--nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c2
-rw-r--r--nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_create.c2
-rw-r--r--nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_delete.c2
-rw-r--r--nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_getoverr.c2
-rw-r--r--nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_gettime.c2
-rw-r--r--nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_settime.c2
-rw-r--r--nptl/sysdeps/unix/sysv/linux/x86_64/Versions7
-rw-r--r--nptl/sysdeps/unix/sysv/linux/x86_64/timer_create.c65
-rw-r--r--nptl/sysdeps/unix/sysv/linux/x86_64/timer_delete.c44
-rw-r--r--nptl/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c38
-rw-r--r--nptl/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c37
-rw-r--r--nptl/sysdeps/unix/sysv/linux/x86_64/timer_settime.c39
16 files changed, 10 insertions, 240 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c
index 172223af3f..d307135003 100644
--- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c
+++ b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c
@@ -1 +1 @@
-#include "../x86_64/timer_create.c"
+#include <sysdeps/unix/sysv/linux/x86_64/timer_create.c>
diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c
index 537516e0aa..2dd94f5c7a 100644
--- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c
+++ b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c
@@ -1 +1 @@
-#include "../x86_64/timer_delete.c"
+#include <sysdeps/unix/sysv/linux/x86_64/timer_delete.c>
diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c
index 3f21a73c98..22eaff5cda 100644
--- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c
+++ b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c
@@ -1 +1 @@
-#include "../x86_64/timer_getoverr.c"
+#include <sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c>
diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c
index a50143adc5..cea524bae5 100644
--- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c
+++ b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c
@@ -1 +1 @@
-#include "../x86_64/timer_gettime.c"
+#include <sysdeps/unix/sysv/linux/x86_64/timer_gettime.c>
diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c
index 37baeffacc..fa231149d5 100644
--- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c
+++ b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c
@@ -1 +1 @@
-#include "../x86_64/timer_settime.c"
+#include <sysdeps/unix/sysv/linux/x86_64/timer_settime.c>
diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_create.c b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_create.c
index 0a9c3372b8..d307135003 100644
--- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_create.c
+++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_create.c
@@ -1 +1 @@
-#include "../../x86_64/timer_create.c"
+#include <sysdeps/unix/sysv/linux/x86_64/timer_create.c>
diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_delete.c b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_delete.c
index f0d4fd21d6..2dd94f5c7a 100644
--- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_delete.c
+++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_delete.c
@@ -1 +1 @@
-#include "../../x86_64/timer_delete.c"
+#include <sysdeps/unix/sysv/linux/x86_64/timer_delete.c>
diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_getoverr.c b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_getoverr.c
index 82121a7a28..22eaff5cda 100644
--- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_getoverr.c
+++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_getoverr.c
@@ -1 +1 @@
-#include "../../x86_64/timer_getoverr.c"
+#include <sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c>
diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_gettime.c b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_gettime.c
index 313c05feac..cea524bae5 100644
--- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_gettime.c
+++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_gettime.c
@@ -1 +1 @@
-#include "../../x86_64/timer_gettime.c"
+#include <sysdeps/unix/sysv/linux/x86_64/timer_gettime.c>
diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_settime.c b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_settime.c
index 76f549cb47..fa231149d5 100644
--- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_settime.c
+++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_settime.c
@@ -1 +1 @@
-#include "../../x86_64/timer_settime.c"
+#include <sysdeps/unix/sysv/linux/x86_64/timer_settime.c>
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/Versions b/nptl/sysdeps/unix/sysv/linux/x86_64/Versions
deleted file mode 100644
index 3b111ddb51..0000000000
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/Versions
+++ /dev/null
@@ -1,7 +0,0 @@
-librt {
-  GLIBC_2.3.3 {
-    # Changed timer_t.
-    timer_create; timer_delete; timer_getoverrun; timer_gettime;
-    timer_settime;
-  }
-}
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/timer_create.c b/nptl/sysdeps/unix/sysv/linux/x86_64/timer_create.c
deleted file mode 100644
index 7624f2cdb2..0000000000
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/timer_create.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright (C) 2003-2014 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public License as
-   published by the Free Software Foundation; either version 2.1 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If
-   not, see <http://www.gnu.org/licenses/>.  */
-
-#include <shlib-compat.h>
-#include "compat-timer.h"
-#include <atomic.h>
-
-
-#define timer_create_alias __timer_create_new
-#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 (__glibc_unlikely (i == OLD_TIMER_MAX))
-	{
-	  /* 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
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/timer_delete.c b/nptl/sysdeps/unix/sysv/linux/x86_64/timer_delete.c
deleted file mode 100644
index c92da1af35..0000000000
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/timer_delete.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright (C) 2003-2014 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public License as
-   published by the Free Software Foundation; either version 2.1 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If
-   not, see <http://www.gnu.org/licenses/>.  */
-
-#include <shlib-compat.h>
-#include "compat-timer.h"
-
-
-#define timer_delete_alias __timer_delete_new
-#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
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c b/nptl/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c
deleted file mode 100644
index 66d927c56a..0000000000
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright (C) 2003-2014 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public License as
-   published by the Free Software Foundation; either version 2.1 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If
-   not, see <http://www.gnu.org/licenses/>.  */
-
-#include <shlib-compat.h>
-#include "compat-timer.h"
-
-
-#define timer_getoverrun_alias __timer_getoverrun_new
-#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
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c b/nptl/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c
deleted file mode 100644
index 439d553d71..0000000000
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright (C) 2003-2014 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public License as
-   published by the Free Software Foundation; either version 2.1 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If
-   not, see <http://www.gnu.org/licenses/>.  */
-
-#include <shlib-compat.h>
-#include "compat-timer.h"
-
-
-#define timer_gettime_alias __timer_gettime_new
-#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
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/timer_settime.c b/nptl/sysdeps/unix/sysv/linux/x86_64/timer_settime.c
deleted file mode 100644
index f8a8664840..0000000000
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/timer_settime.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright (C) 2003-2014 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public License as
-   published by the Free Software Foundation; either version 2.1 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If
-   not, see <http://www.gnu.org/licenses/>.  */
-
-#include <shlib-compat.h>
-#include "compat-timer.h"
-
-
-#define timer_settime_alias __timer_settime_new
-#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