From f6d1d86d0c2cca118fd6a7734ea0ccd72b51c4b4 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 30 Sep 2015 10:12:26 -0700 Subject: [PATCH] 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. --- ChangeLog | 72 +++++++++++++++++++ .../sysv/linux/i386/i586/libc-lowlevellock.S | 1 - .../sysv/linux/i386/i586/lll_timedlock_wait.c | 1 - .../sysv/linux/i386/i586/lll_timedwait_tid.c | 1 - .../unix/sysv/linux/i386/i586/lowlevellock.S | 19 ----- .../sysv/linux/i386/i586/lowlevelrobustlock.S | 19 ----- .../linux/i386/i586/pthread_barrier_wait.S | 19 ----- .../linux/i386/i586/pthread_cond_broadcast.S | 19 ----- .../linux/i386/i586/pthread_cond_signal.S | 19 ----- .../linux/i386/i586/pthread_cond_timedwait.S | 19 ----- .../sysv/linux/i386/i586/pthread_cond_wait.S | 19 ----- .../sysv/linux/i386/i686/libc-lowlevellock.S | 1 - .../sysv/linux/i386/i686/lll_timedlock_wait.c | 1 - .../sysv/linux/i386/i686/lll_timedwait_tid.c | 1 - .../unix/sysv/linux/i386/i686/lowlevellock.S | 19 ----- .../sysv/linux/i386/i686/lowlevelrobustlock.S | 19 ----- .../linux/i386/i686/pthread_barrier_wait.S | 19 ----- .../linux/i386/i686/pthread_cond_broadcast.S | 19 ----- .../linux/i386/i686/pthread_cond_signal.S | 19 ----- .../linux/i386/i686/pthread_cond_timedwait.S | 2 +- .../sysv/linux/i386/i686/pthread_cond_wait.S | 19 ----- .../linux/i386/{i486 => }/libc-lowlevellock.S | 0 .../i386/{i486 => }/lll_timedlock_wait.c | 0 .../linux/i386/{i486 => }/lll_timedwait_tid.c | 0 .../sysv/linux/i386/{i486 => }/lowlevellock.S | 0 .../i386/{i486 => }/lowlevelrobustlock.S | 0 .../i386/{i486 => }/pthread_barrier_wait.S | 0 .../i386/{i486 => }/pthread_cond_broadcast.S | 0 .../i386/{i486 => }/pthread_cond_signal.S | 0 .../i386/{i486 => }/pthread_cond_timedwait.S | 0 .../linux/i386/{i486 => }/pthread_cond_wait.S | 0 31 files changed, 73 insertions(+), 254 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/i386/i586/libc-lowlevellock.S delete mode 100644 sysdeps/unix/sysv/linux/i386/i586/lll_timedlock_wait.c delete mode 100644 sysdeps/unix/sysv/linux/i386/i586/lll_timedwait_tid.c delete mode 100644 sysdeps/unix/sysv/linux/i386/i586/lowlevellock.S delete mode 100644 sysdeps/unix/sysv/linux/i386/i586/lowlevelrobustlock.S delete mode 100644 sysdeps/unix/sysv/linux/i386/i586/pthread_barrier_wait.S delete mode 100644 sysdeps/unix/sysv/linux/i386/i586/pthread_cond_broadcast.S delete mode 100644 sysdeps/unix/sysv/linux/i386/i586/pthread_cond_signal.S delete mode 100644 sysdeps/unix/sysv/linux/i386/i586/pthread_cond_timedwait.S delete mode 100644 sysdeps/unix/sysv/linux/i386/i586/pthread_cond_wait.S delete mode 100644 sysdeps/unix/sysv/linux/i386/i686/libc-lowlevellock.S delete mode 100644 sysdeps/unix/sysv/linux/i386/i686/lll_timedlock_wait.c delete mode 100644 sysdeps/unix/sysv/linux/i386/i686/lll_timedwait_tid.c delete mode 100644 sysdeps/unix/sysv/linux/i386/i686/lowlevellock.S delete mode 100644 sysdeps/unix/sysv/linux/i386/i686/lowlevelrobustlock.S delete mode 100644 sysdeps/unix/sysv/linux/i386/i686/pthread_barrier_wait.S delete mode 100644 sysdeps/unix/sysv/linux/i386/i686/pthread_cond_broadcast.S delete mode 100644 sysdeps/unix/sysv/linux/i386/i686/pthread_cond_signal.S delete mode 100644 sysdeps/unix/sysv/linux/i386/i686/pthread_cond_wait.S rename sysdeps/unix/sysv/linux/i386/{i486 => }/libc-lowlevellock.S (100%) rename sysdeps/unix/sysv/linux/i386/{i486 => }/lll_timedlock_wait.c (100%) rename sysdeps/unix/sysv/linux/i386/{i486 => }/lll_timedwait_tid.c (100%) rename sysdeps/unix/sysv/linux/i386/{i486 => }/lowlevellock.S (100%) rename sysdeps/unix/sysv/linux/i386/{i486 => }/lowlevelrobustlock.S (100%) rename sysdeps/unix/sysv/linux/i386/{i486 => }/pthread_barrier_wait.S (100%) rename sysdeps/unix/sysv/linux/i386/{i486 => }/pthread_cond_broadcast.S (100%) rename sysdeps/unix/sysv/linux/i386/{i486 => }/pthread_cond_signal.S (100%) rename sysdeps/unix/sysv/linux/i386/{i486 => }/pthread_cond_timedwait.S (100%) rename sysdeps/unix/sysv/linux/i386/{i486 => }/pthread_cond_wait.S (100%) diff --git a/ChangeLog b/ChangeLog index f40bc4463f..f37d5b9b46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,75 @@ +2015-09-30 H.J. Lu + + [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 * 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 , 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 - . */ - -#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 , 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 - . */ - -#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 , 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 - . */ - -#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 , 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 - . */ - -#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 , 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 - . */ - -#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 , 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 - . */ - -#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 , 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 - . */ - -#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 , 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 - . */ - -#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 , 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 - . */ - -#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 , 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 - . */ - -#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 , 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 - . */ - -#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 , 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 - . */ - -#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 @@ . */ #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 , 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 - . */ - -#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 similarity index 100% rename from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S rename to 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 similarity index 100% rename from sysdeps/unix/sysv/linux/i386/i486/lll_timedlock_wait.c rename to 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 similarity index 100% rename from sysdeps/unix/sysv/linux/i386/i486/lll_timedwait_tid.c rename to 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 similarity index 100% rename from sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S rename to 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 similarity index 100% rename from sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S rename to 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 similarity index 100% rename from sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S rename to 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 similarity index 100% rename from sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S rename to 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 similarity index 100% rename from sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S rename to 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 similarity index 100% rename from sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S rename to 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 similarity index 100% rename from sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S rename to sysdeps/unix/sysv/linux/i386/pthread_cond_wait.S