aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2015-09-30 10:12:26 -0700
committerH.J. Lu <hjl.tools@gmail.com>2015-09-30 10:12:44 -0700
commitf6d1d86d0c2cca118fd6a7734ea0ccd72b51c4b4 (patch)
tree5dbcd06d40065685351e75cb21f7a3bba8d340f8
parent629d220d49e0842af2766808a131893efaf6ecda (diff)
downloadglibc-f6d1d86d0c2cca118fd6a7734ea0ccd72b51c4b4.tar
glibc-f6d1d86d0c2cca118fd6a7734ea0ccd72b51c4b4.tar.gz
glibc-f6d1d86d0c2cca118fd6a7734ea0ccd72b51c4b4.tar.bz2
glibc-f6d1d86d0c2cca118fd6a7734ea0ccd72b51c4b4.zip
Move sysdeps/unix/sysv/linux/i386/i486/*.? to i386
Since glibc doesn't support i386 any more, we can move sysdeps/unix/sysv/linux/i386/i486/*.? to i386. [BZ #19006] * sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S: Moved to ... * sysdeps/unix/sysv/linux/i386/libc-lowlevellock.S: Here. * sysdeps/unix/sysv/linux/i386/i486/lll_timedlock_wait.c: Moved to ... * sysdeps/unix/sysv/linux/i386/lll_timedlock_wait.c: Here. * sysdeps/unix/sysv/linux/i386/i486/lll_timedwait_tid.c: Moved to ... * sysdeps/unix/sysv/linux/i386/lll_timedwait_tid.c: Here. * sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: Moved to ... * sysdeps/unix/sysv/linux/i386/lowlevellock.S: Here. * sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S: Moved to ... * sysdeps/unix/sysv/linux/i386/lowlevelrobustlock.S: Here. * sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S: Moved to ... * sysdeps/unix/sysv/linux/i386/pthread_barrier_wait.S: Here. * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S: Moved to ... * sysdeps/unix/sysv/linux/i386/pthread_cond_broadcast.S: Here. * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S: Moved to ... * sysdeps/unix/sysv/linux/i386/pthread_cond_signal.S: Here. * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S: Moved to ... * sysdeps/unix/sysv/linux/i386/pthread_cond_timedwait.S: Here. * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S: Moved to ... * sysdeps/unix/sysv/linux/i386/pthread_cond_wait.S: Here. * sysdeps/unix/sysv/linux/i386/i586/libc-lowlevellock.S: Removed. * sysdeps/unix/sysv/linux/i386/i586/lll_timedlock_wait.c: Likewise. * sysdeps/unix/sysv/linux/i386/i586/lll_timedwait_tid.c: Likewise. * sysdeps/unix/sysv/linux/i386/i586/lowlevellock.S: Likewise. * sysdeps/unix/sysv/linux/i386/i586/lowlevelrobustlock.S: Likewise. * sysdeps/unix/sysv/linux/i386/i586/pthread_barrier_wait.S: Likewise. * sysdeps/unix/sysv/linux/i386/i586/pthread_cond_broadcast.S: Likewise. * sysdeps/unix/sysv/linux/i386/i586/pthread_cond_signal.S: Likewise. * sysdeps/unix/sysv/linux/i386/i586/pthread_cond_timedwait.S: Likewise. * sysdeps/unix/sysv/linux/i386/i586/pthread_cond_wait.S: Likewise. * sysdeps/unix/sysv/linux/i386/i686/libc-lowlevellock.S: Likewise. * sysdeps/unix/sysv/linux/i386/i686/lll_timedlock_wait.c: Likewise. * sysdeps/unix/sysv/linux/i386/i686/lll_timedwait_tid.c: Likewise. * sysdeps/unix/sysv/linux/i386/i686/lowlevellock.S: Likewise. * sysdeps/unix/sysv/linux/i386/i686/lowlevelrobustlock.S: Likewise. * sysdeps/unix/sysv/linux/i386/i686/pthread_barrier_wait.S: Likewise. * sysdeps/unix/sysv/linux/i386/i686/pthread_cond_broadcast.S: Likewise. * sysdeps/unix/sysv/linux/i386/i686/pthread_cond_signal.S: Likewise. * sysdeps/unix/sysv/linux/i386/i686/pthread_cond_wait.S: Likewise. * sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S: Replace ../i486/pthread_cond_timedwait.S with ../pthread_cond_timedwait.S.
-rw-r--r--ChangeLog72
-rw-r--r--sysdeps/unix/sysv/linux/i386/i586/libc-lowlevellock.S1
-rw-r--r--sysdeps/unix/sysv/linux/i386/i586/lll_timedlock_wait.c1
-rw-r--r--sysdeps/unix/sysv/linux/i386/i586/lll_timedwait_tid.c1
-rw-r--r--sysdeps/unix/sysv/linux/i386/i586/lowlevellock.S19
-rw-r--r--sysdeps/unix/sysv/linux/i386/i586/lowlevelrobustlock.S19
-rw-r--r--sysdeps/unix/sysv/linux/i386/i586/pthread_barrier_wait.S19
-rw-r--r--sysdeps/unix/sysv/linux/i386/i586/pthread_cond_broadcast.S19
-rw-r--r--sysdeps/unix/sysv/linux/i386/i586/pthread_cond_signal.S19
-rw-r--r--sysdeps/unix/sysv/linux/i386/i586/pthread_cond_timedwait.S19
-rw-r--r--sysdeps/unix/sysv/linux/i386/i586/pthread_cond_wait.S19
-rw-r--r--sysdeps/unix/sysv/linux/i386/i686/libc-lowlevellock.S1
-rw-r--r--sysdeps/unix/sysv/linux/i386/i686/lll_timedlock_wait.c1
-rw-r--r--sysdeps/unix/sysv/linux/i386/i686/lll_timedwait_tid.c1
-rw-r--r--sysdeps/unix/sysv/linux/i386/i686/lowlevellock.S19
-rw-r--r--sysdeps/unix/sysv/linux/i386/i686/lowlevelrobustlock.S19
-rw-r--r--sysdeps/unix/sysv/linux/i386/i686/pthread_barrier_wait.S19
-rw-r--r--sysdeps/unix/sysv/linux/i386/i686/pthread_cond_broadcast.S19
-rw-r--r--sysdeps/unix/sysv/linux/i386/i686/pthread_cond_signal.S19
-rw-r--r--sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S2
-rw-r--r--sysdeps/unix/sysv/linux/i386/i686/pthread_cond_wait.S19
-rw-r--r--sysdeps/unix/sysv/linux/i386/libc-lowlevellock.S (renamed from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S)0
-rw-r--r--sysdeps/unix/sysv/linux/i386/lll_timedlock_wait.c (renamed from sysdeps/unix/sysv/linux/i386/i486/lll_timedlock_wait.c)0
-rw-r--r--sysdeps/unix/sysv/linux/i386/lll_timedwait_tid.c (renamed from sysdeps/unix/sysv/linux/i386/i486/lll_timedwait_tid.c)0
-rw-r--r--sysdeps/unix/sysv/linux/i386/lowlevellock.S (renamed from sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S)0
-rw-r--r--sysdeps/unix/sysv/linux/i386/lowlevelrobustlock.S (renamed from sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S)0
-rw-r--r--sysdeps/unix/sysv/linux/i386/pthread_barrier_wait.S (renamed from sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S)0
-rw-r--r--sysdeps/unix/sysv/linux/i386/pthread_cond_broadcast.S (renamed from sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S)0
-rw-r--r--sysdeps/unix/sysv/linux/i386/pthread_cond_signal.S (renamed from sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S)0
-rw-r--r--sysdeps/unix/sysv/linux/i386/pthread_cond_timedwait.S (renamed from sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S)0
-rw-r--r--sysdeps/unix/sysv/linux/i386/pthread_cond_wait.S (renamed from sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S)0
31 files changed, 73 insertions, 254 deletions
diff --git a/ChangeLog b/ChangeLog
index f40bc4463f..f37d5b9b46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,75 @@
+2015-09-30 H.J. Lu <hongjiu.lu@intel.com>
+
+ [BZ #19006]
+ * sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S: Moved
+ to ...
+ * sysdeps/unix/sysv/linux/i386/libc-lowlevellock.S: Here.
+ * sysdeps/unix/sysv/linux/i386/i486/lll_timedlock_wait.c: Moved
+ to ...
+ * sysdeps/unix/sysv/linux/i386/lll_timedlock_wait.c: Here.
+ * sysdeps/unix/sysv/linux/i386/i486/lll_timedwait_tid.c: Moved
+ to ...
+ * sysdeps/unix/sysv/linux/i386/lll_timedwait_tid.c: Here.
+ * sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: Moved to ...
+ * sysdeps/unix/sysv/linux/i386/lowlevellock.S: Here.
+ * sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S: Moved
+ to ...
+ * sysdeps/unix/sysv/linux/i386/lowlevelrobustlock.S: Here.
+ * sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S:
+ Moved to ...
+ * sysdeps/unix/sysv/linux/i386/pthread_barrier_wait.S: Here.
+ * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S:
+ Moved to ...
+ * sysdeps/unix/sysv/linux/i386/pthread_cond_broadcast.S: Here.
+ * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S: Moved
+ to ...
+ * sysdeps/unix/sysv/linux/i386/pthread_cond_signal.S: Here.
+ * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S:
+ Moved to ...
+ * sysdeps/unix/sysv/linux/i386/pthread_cond_timedwait.S: Here.
+ * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S: Moved
+ to ...
+ * sysdeps/unix/sysv/linux/i386/pthread_cond_wait.S: Here.
+ * sysdeps/unix/sysv/linux/i386/i586/libc-lowlevellock.S:
+ Removed.
+ * sysdeps/unix/sysv/linux/i386/i586/lll_timedlock_wait.c:
+ Likewise.
+ * sysdeps/unix/sysv/linux/i386/i586/lll_timedwait_tid.c:
+ Likewise.
+ * sysdeps/unix/sysv/linux/i386/i586/lowlevellock.S: Likewise.
+ * sysdeps/unix/sysv/linux/i386/i586/lowlevelrobustlock.S:
+ Likewise.
+ * sysdeps/unix/sysv/linux/i386/i586/pthread_barrier_wait.S:
+ Likewise.
+ * sysdeps/unix/sysv/linux/i386/i586/pthread_cond_broadcast.S:
+ Likewise.
+ * sysdeps/unix/sysv/linux/i386/i586/pthread_cond_signal.S:
+ Likewise.
+ * sysdeps/unix/sysv/linux/i386/i586/pthread_cond_timedwait.S:
+ Likewise.
+ * sysdeps/unix/sysv/linux/i386/i586/pthread_cond_wait.S:
+ Likewise.
+ * sysdeps/unix/sysv/linux/i386/i686/libc-lowlevellock.S:
+ Likewise.
+ * sysdeps/unix/sysv/linux/i386/i686/lll_timedlock_wait.c:
+ Likewise.
+ * sysdeps/unix/sysv/linux/i386/i686/lll_timedwait_tid.c:
+ Likewise.
+ * sysdeps/unix/sysv/linux/i386/i686/lowlevellock.S: Likewise.
+ * sysdeps/unix/sysv/linux/i386/i686/lowlevelrobustlock.S:
+ Likewise.
+ * sysdeps/unix/sysv/linux/i386/i686/pthread_barrier_wait.S:
+ Likewise.
+ * sysdeps/unix/sysv/linux/i386/i686/pthread_cond_broadcast.S:
+ Likewise.
+ * sysdeps/unix/sysv/linux/i386/i686/pthread_cond_signal.S:
+ Likewise.
+ * sysdeps/unix/sysv/linux/i386/i686/pthread_cond_wait.S:
+ Likewise.
+ * sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S:
+ Replace ../i486/pthread_cond_timedwait.S with
+ ../pthread_cond_timedwait.S.
+
2015-09-30 Joseph Myers <joseph@codesourcery.com>
* math/libm-test.inc (acos_test_data): Refine expectations for
diff --git a/sysdeps/unix/sysv/linux/i386/i586/libc-lowlevellock.S b/sysdeps/unix/sysv/linux/i386/i586/libc-lowlevellock.S
deleted file mode 100644
index f567c1d6d5..0000000000
--- a/sysdeps/unix/sysv/linux/i386/i586/libc-lowlevellock.S
+++ /dev/null
@@ -1 +0,0 @@
-#include "../i486/libc-lowlevellock.S"
diff --git a/sysdeps/unix/sysv/linux/i386/i586/lll_timedlock_wait.c b/sysdeps/unix/sysv/linux/i386/i586/lll_timedlock_wait.c
deleted file mode 100644
index fa4357bf5d..0000000000
--- a/sysdeps/unix/sysv/linux/i386/i586/lll_timedlock_wait.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../i486/lll_timedlock_wait.c"
diff --git a/sysdeps/unix/sysv/linux/i386/i586/lll_timedwait_tid.c b/sysdeps/unix/sysv/linux/i386/i586/lll_timedwait_tid.c
deleted file mode 100644
index 1586104c08..0000000000
--- a/sysdeps/unix/sysv/linux/i386/i586/lll_timedwait_tid.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../i486/lll_timedwait_tid.c"
diff --git a/sysdeps/unix/sysv/linux/i386/i586/lowlevellock.S b/sysdeps/unix/sysv/linux/i386/i586/lowlevellock.S
deleted file mode 100644
index 80ae109f5d..0000000000
--- a/sysdeps/unix/sysv/linux/i386/i586/lowlevellock.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
-
- 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, see
- <http://www.gnu.org/licenses/>. */
-
-#include "../i486/lowlevellock.S"
diff --git a/sysdeps/unix/sysv/linux/i386/i586/lowlevelrobustlock.S b/sysdeps/unix/sysv/linux/i386/i586/lowlevelrobustlock.S
deleted file mode 100644
index caa6615f5a..0000000000
--- a/sysdeps/unix/sysv/linux/i386/i586/lowlevelrobustlock.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
-
- 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, see
- <http://www.gnu.org/licenses/>. */
-
-#include "../i486/lowlevelrobustlock.S"
diff --git a/sysdeps/unix/sysv/linux/i386/i586/pthread_barrier_wait.S b/sysdeps/unix/sysv/linux/i386/i586/pthread_barrier_wait.S
deleted file mode 100644
index d48f2bc375..0000000000
--- a/sysdeps/unix/sysv/linux/i386/i586/pthread_barrier_wait.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
-
- 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, see
- <http://www.gnu.org/licenses/>. */
-
-#include "../i486/pthread_barrier_wait.S"
diff --git a/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_broadcast.S b/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_broadcast.S
deleted file mode 100644
index 9a4006af40..0000000000
--- a/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_broadcast.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright (C) 2003-2015 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; if not, see
- <http://www.gnu.org/licenses/>. */
-
-#include "../i486/pthread_cond_broadcast.S"
diff --git a/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_signal.S b/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_signal.S
deleted file mode 100644
index 59f93b6729..0000000000
--- a/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_signal.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright (C) 2003-2015 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; if not, see
- <http://www.gnu.org/licenses/>. */
-
-#include "../i486/pthread_cond_signal.S"
diff --git a/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_timedwait.S b/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_timedwait.S
deleted file mode 100644
index d96af08649..0000000000
--- a/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_timedwait.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright (C) 2003-2015 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; if not, see
- <http://www.gnu.org/licenses/>. */
-
-#include "../i486/pthread_cond_timedwait.S"
diff --git a/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_wait.S b/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_wait.S
deleted file mode 100644
index 9696972c74..0000000000
--- a/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_wait.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright (C) 2003-2015 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; if not, see
- <http://www.gnu.org/licenses/>. */
-
-#include "../i486/pthread_cond_wait.S"
diff --git a/sysdeps/unix/sysv/linux/i386/i686/libc-lowlevellock.S b/sysdeps/unix/sysv/linux/i386/i686/libc-lowlevellock.S
deleted file mode 100644
index f567c1d6d5..0000000000
--- a/sysdeps/unix/sysv/linux/i386/i686/libc-lowlevellock.S
+++ /dev/null
@@ -1 +0,0 @@
-#include "../i486/libc-lowlevellock.S"
diff --git a/sysdeps/unix/sysv/linux/i386/i686/lll_timedlock_wait.c b/sysdeps/unix/sysv/linux/i386/i686/lll_timedlock_wait.c
deleted file mode 100644
index fa4357bf5d..0000000000
--- a/sysdeps/unix/sysv/linux/i386/i686/lll_timedlock_wait.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../i486/lll_timedlock_wait.c"
diff --git a/sysdeps/unix/sysv/linux/i386/i686/lll_timedwait_tid.c b/sysdeps/unix/sysv/linux/i386/i686/lll_timedwait_tid.c
deleted file mode 100644
index 1586104c08..0000000000
--- a/sysdeps/unix/sysv/linux/i386/i686/lll_timedwait_tid.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../i486/lll_timedwait_tid.c"
diff --git a/sysdeps/unix/sysv/linux/i386/i686/lowlevellock.S b/sysdeps/unix/sysv/linux/i386/i686/lowlevellock.S
deleted file mode 100644
index 80ae109f5d..0000000000
--- a/sysdeps/unix/sysv/linux/i386/i686/lowlevellock.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
-
- 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, see
- <http://www.gnu.org/licenses/>. */
-
-#include "../i486/lowlevellock.S"
diff --git a/sysdeps/unix/sysv/linux/i386/i686/lowlevelrobustlock.S b/sysdeps/unix/sysv/linux/i386/i686/lowlevelrobustlock.S
deleted file mode 100644
index caa6615f5a..0000000000
--- a/sysdeps/unix/sysv/linux/i386/i686/lowlevelrobustlock.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
-
- 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, see
- <http://www.gnu.org/licenses/>. */
-
-#include "../i486/lowlevelrobustlock.S"
diff --git a/sysdeps/unix/sysv/linux/i386/i686/pthread_barrier_wait.S b/sysdeps/unix/sysv/linux/i386/i686/pthread_barrier_wait.S
deleted file mode 100644
index d48f2bc375..0000000000
--- a/sysdeps/unix/sysv/linux/i386/i686/pthread_barrier_wait.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
-
- 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, see
- <http://www.gnu.org/licenses/>. */
-
-#include "../i486/pthread_barrier_wait.S"
diff --git a/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_broadcast.S b/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_broadcast.S
deleted file mode 100644
index 9a4006af40..0000000000
--- a/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_broadcast.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright (C) 2003-2015 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; if not, see
- <http://www.gnu.org/licenses/>. */
-
-#include "../i486/pthread_cond_broadcast.S"
diff --git a/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_signal.S b/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_signal.S
deleted file mode 100644
index 59f93b6729..0000000000
--- a/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_signal.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright (C) 2003-2015 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; if not, see
- <http://www.gnu.org/licenses/>. */
-
-#include "../i486/pthread_cond_signal.S"
diff --git a/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S b/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S
index 0e8d7ff894..763144c6d6 100644
--- a/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S
+++ b/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S
@@ -17,4 +17,4 @@
<http://www.gnu.org/licenses/>. */
#define HAVE_CMOV 1
-#include "../i486/pthread_cond_timedwait.S"
+#include "../pthread_cond_timedwait.S"
diff --git a/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_wait.S b/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_wait.S
deleted file mode 100644
index 9696972c74..0000000000
--- a/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_wait.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright (C) 2003-2015 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; if not, see
- <http://www.gnu.org/licenses/>. */
-
-#include "../i486/pthread_cond_wait.S"
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/sysdeps/unix/sysv/linux/i386/libc-lowlevellock.S
index 111e9c88ed..111e9c88ed 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/sysdeps/unix/sysv/linux/i386/libc-lowlevellock.S
diff --git a/sysdeps/unix/sysv/linux/i386/i486/lll_timedlock_wait.c b/sysdeps/unix/sysv/linux/i386/lll_timedlock_wait.c
index f6875b8f89..f6875b8f89 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/lll_timedlock_wait.c
+++ b/sysdeps/unix/sysv/linux/i386/lll_timedlock_wait.c
diff --git a/sysdeps/unix/sysv/linux/i386/i486/lll_timedwait_tid.c b/sysdeps/unix/sysv/linux/i386/lll_timedwait_tid.c
index 43900c6294..43900c6294 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/lll_timedwait_tid.c
+++ b/sysdeps/unix/sysv/linux/i386/lll_timedwait_tid.c
diff --git a/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S b/sysdeps/unix/sysv/linux/i386/lowlevellock.S
index 94bb59b384..94bb59b384 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
+++ b/sysdeps/unix/sysv/linux/i386/lowlevellock.S
diff --git a/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S b/sysdeps/unix/sysv/linux/i386/lowlevelrobustlock.S
index aefe77cce9..aefe77cce9 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S
+++ b/sysdeps/unix/sysv/linux/i386/lowlevelrobustlock.S
diff --git a/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S b/sysdeps/unix/sysv/linux/i386/pthread_barrier_wait.S
index ad1a774fbd..ad1a774fbd 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S
+++ b/sysdeps/unix/sysv/linux/i386/pthread_barrier_wait.S
diff --git a/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S b/sysdeps/unix/sysv/linux/i386/pthread_cond_broadcast.S
index 5ddd5ac592..5ddd5ac592 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
+++ b/sysdeps/unix/sysv/linux/i386/pthread_cond_broadcast.S
diff --git a/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S b/sysdeps/unix/sysv/linux/i386/pthread_cond_signal.S
index 8f4d937ec1..8f4d937ec1 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
+++ b/sysdeps/unix/sysv/linux/i386/pthread_cond_signal.S
diff --git a/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S b/sysdeps/unix/sysv/linux/i386/pthread_cond_timedwait.S
index 130c090c9c..130c090c9c 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
+++ b/sysdeps/unix/sysv/linux/i386/pthread_cond_timedwait.S
diff --git a/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/sysdeps/unix/sysv/linux/i386/pthread_cond_wait.S
index ec3538f561..ec3538f561 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
+++ b/sysdeps/unix/sysv/linux/i386/pthread_cond_wait.S