This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

Re: [PATCH] [BZ #19006] Move sysdeps/unix/sysv/linux/i386/i486/*.? to i386

From: "H.J. Lu" <hjl dot tools at gmail dot com>
To: Roland McGrath <roland at hack dot frob dot com>
Cc: GNU C Library <libc-alpha at sourceware dot org>
Date: Wed, 30 Sep 2015 10:16:39 -0700
Subject: Re: [PATCH] [BZ #19006] Move sysdeps/unix/sysv/linux/i386/i486/*.? to i386
Authentication-results: sourceware.org; auth=none
References: <20150928195714 dot GA15135 at intel dot com> <20150929213647 dot 6E33E2C39DF at topped-with-meat dot com>

On Tue, Sep 29, 2015 at 2:36 PM, Roland McGrath <roland@hack.frob.com> wrote:
> Please test i586 too.  Since this should be a no-op, please verify that
> when you say "tested" you mean that you verified the binaries did not
> change at all.  If that's verified for i[456]86, then this is fine.

This is what I checked in.  There are no code changes in libc.so, ld.so
and libpthread.so for i486, i586 and i686.   I didn't update BZ #19006
since my patch doesn't fix it by itself.

Thanks.

-- 
H.J.

From a977c113ee8e11911cb8171611716d4d851decf9 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Mon, 28 Sep 2015 12:44:40 -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.
---
 sysdeps/unix/sysv/linux/i386/i586/libc-lowlevellock.S |  1 -
 .../unix/sysv/linux/i386/i586/lll_timedlock_wait.c    |  1 -
 sysdeps/unix/sysv/linux/i386/i586/lll_timedwait_tid.c |  1 -
 sysdeps/unix/sysv/linux/i386/i586/lowlevellock.S      | 19 -------------------
 .../unix/sysv/linux/i386/i586/lowlevelrobustlock.S    | 19 -------------------
 .../unix/sysv/linux/i386/i586/pthread_barrier_wait.S  | 19 -------------------
 .../sysv/linux/i386/i586/pthread_cond_broadcast.S     | 19 -------------------
 .../unix/sysv/linux/i386/i586/pthread_cond_signal.S   | 19 -------------------
 .../sysv/linux/i386/i586/pthread_cond_timedwait.S     | 19 -------------------
 sysdeps/unix/sysv/linux/i386/i586/pthread_cond_wait.S | 19 -------------------
 sysdeps/unix/sysv/linux/i386/i686/libc-lowlevellock.S |  1 -
 .../unix/sysv/linux/i386/i686/lll_timedlock_wait.c    |  1 -
 sysdeps/unix/sysv/linux/i386/i686/lll_timedwait_tid.c |  1 -
 sysdeps/unix/sysv/linux/i386/i686/lowlevellock.S      | 19 -------------------
 .../unix/sysv/linux/i386/i686/lowlevelrobustlock.S    | 19 -------------------
 .../unix/sysv/linux/i386/i686/pthread_barrier_wait.S  | 19 -------------------
 .../sysv/linux/i386/i686/pthread_cond_broadcast.S     | 19 -------------------
 .../unix/sysv/linux/i386/i686/pthread_cond_signal.S   | 19 -------------------
 .../sysv/linux/i386/i686/pthread_cond_timedwait.S     |  2 +-
 sysdeps/unix/sysv/linux/i386/i686/pthread_cond_wait.S | 19 -------------------
 .../sysv/linux/i386/{i486 => }/libc-lowlevellock.S    |  0
 .../sysv/linux/i386/{i486 => }/lll_timedlock_wait.c   |  0
 .../sysv/linux/i386/{i486 => }/lll_timedwait_tid.c    |  0
 .../unix/sysv/linux/i386/{i486 => }/lowlevellock.S    |  0
 .../sysv/linux/i386/{i486 => }/lowlevelrobustlock.S   |  0
 .../sysv/linux/i386/{i486 => }/pthread_barrier_wait.S |  0
 .../linux/i386/{i486 => }/pthread_cond_broadcast.S    |  0
 .../sysv/linux/i386/{i486 => }/pthread_cond_signal.S  |  0
 .../linux/i386/{i486 => }/pthread_cond_timedwait.S    |  0
 .../sysv/linux/i386/{i486 => }/pthread_cond_wait.S    |  0
 30 files changed, 1 insertion(+), 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/sysdeps/unix/sysv/linux/i386/i586/libc-lowlevellock.S b/sysdeps/unix/sysv/linux/i386/i586/libc-lowlevellock.S
deleted file mode 100644
index f567c1d..0000000
--- 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 fa4357b..0000000
--- 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 1586104..0000000
--- 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 80ae109..0000000
--- 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 caa6615..0000000
--- 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 d48f2bc..0000000
--- 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 9a4006a..0000000
--- 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 59f93b6..0000000
--- 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 d96af08..0000000
--- 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 9696972..0000000
--- 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 f567c1d..0000000
--- 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 fa4357b..0000000
--- 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 1586104..0000000
--- 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 80ae109..0000000
--- 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 caa6615..0000000
--- 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 d48f2bc..0000000
--- 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 9a4006a..0000000
--- 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 59f93b6..0000000
--- 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 0e8d7ff..763144c 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 9696972..0000000
--- 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
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
-- 
2.4.3

References:
- [PATCH] [BZ #19006] Move sysdeps/unix/sysv/linux/i386/i486/*.? to i386
  - From: H.J. Lu
- Re: [PATCH] [BZ #19006] Move sysdeps/unix/sysv/linux/i386/i486/*.? to i386
  - From: Roland McGrath

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]