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] Add missing sparc32 NPTL file otherwise we use thewrong lowlevellock.c implementation.


From: Richard Henderson <rth@twiddle.net>
Date: Fri, 16 Mar 2012 10:06:37 -0700

> On 03/16/12 03:03, David Miller wrote:
>> Ok, would something as simple as having it include <lowlevellock.c>
>> instead of "lowlevellock.c" do the right thing?
> 
> Probably.  If that works for sparc it'll work for arm too.

Ok, I confirmed that this does the right thing, committed as
follows:

--------------------
Fix libc-lowlevellock.c sysdep finding more generically.

nptl/

	[BZ #13844]
	* sysdeps/unix/sysv/linux/libc-lowlevellock.c: Include using <..>
	instead of "...".
	* sysdeps/unix/sysv/linux/sparc/sparc32/libc-lowlevellock.c:
	Delete, not needed.
---
 nptl/ChangeLog                                     |    8 ++++++++
 nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c   |    2 +-
 .../sysv/linux/sparc/sparc32/libc-lowlevellock.c   |    1 -
 3 files changed, 9 insertions(+), 2 deletions(-)
 delete mode 100644 nptl/sysdeps/unix/sysv/linux/sparc/sparc32/libc-lowlevellock.c

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 700fb72..7c6005b 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,11 @@
+2012-03-16  David S. Miller  <davem@davemloft.net>
+
+	[BZ #13844]
+	* sysdeps/unix/sysv/linux/libc-lowlevellock.c: Include using <..>
+	instead of "...".
+	* sysdeps/unix/sysv/linux/sparc/sparc32/libc-lowlevellock.c:
+	Delete, not needed.
+
 2012-03-15  David S. Miller  <davem@davemloft.net>
 
 	[BZ #13844]
diff --git a/nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c b/nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c
index 28672a6..4883765 100644
--- a/nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c
+++ b/nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c
@@ -17,4 +17,4 @@
    <http://www.gnu.org/licenses/>.  */
 
 /* No difference to lowlevellock.c, except we lose a couple of functions.  */
-#include "lowlevellock.c"
+#include <lowlevellock.c>
diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/libc-lowlevellock.c b/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/libc-lowlevellock.c
deleted file mode 100644
index 61296a4..0000000
--- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/libc-lowlevellock.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "lowlevellock.c"
-- 
1.7.9.1


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