Merge changes between r16568 and r17050 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@17051 7b3dc134-2b1b-0410-93df-9e9f96275f8d

1 files changed, 0 insertions, 32 deletions

diff --git a/libc/sysdeps/unix/sysv/linux/ia64/clock_getcpuclockid.c b/libc/sysdeps/unix/sysv/linux/ia64/clock_getcpuclockid.c
deleted file mode 100644
index 2f3985153..000000000
--- a/libc/sysdeps/unix/sysv/linux/ia64/clock_getcpuclockid.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* clock_getcpuclockid -- Get a clockid_t for process CPU time.  Linux/IA64
-   Copyright (C) 2000,2001,2003,2004 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <time.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <fcntl.h>
-
-
-#include "has_cpuclock.c"
-
-#define HAS_CPUCLOCK (has_cpuclock () > 0)
-
-#include <sysdeps/unix/sysv/linux/clock_getcpuclockid.c>