This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch roland/sparc-hacks created. glibc-2.19-712-gb5b8fd2
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 27 Jun 2014 21:02:06 -0000
- Subject: GNU C Library master sources branch roland/sparc-hacks created. glibc-2.19-712-gb5b8fd2
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, roland/sparc-hacks has been created
at b5b8fd20f19967c7fd097e2b2741c52b6c1bb352 (commit)
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=b5b8fd20f19967c7fd097e2b2741c52b6c1bb352
commit b5b8fd20f19967c7fd097e2b2741c52b6c1bb352
Author: David S. Miller <davem@davemloft.net>
Date: Fri Jun 27 13:41:18 2014 -0700
Get rid of sparc specific NPTL internaltypes.h header.
diff --git a/ChangeLog b/ChangeLog
index 91f0e87..ae393d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2014-06-25 David S. Miller <davem@davemloft.net>
+
+ * sysdeps/sparc/nptl/internaltypes.h: Delete.
+ * sysdeps/sparc/nptl/sparc-nptl.h: New file.
+ * sysdeps/sparc/nptl/pthread_barrier_destroy.c: Include it.
+ * sysdeps/sparc/nptl/pthread_barrier_init.c: Likewise.
+ * sysdeps/sparc/nptl/pthread_barrier_wait.c: Likewise.
+ * sysdeps/sparc/nptl/sem_init.c: Likewise.
+ * sysdeps/sparc/nptl/sem_post.c: Likewise.
+ * sysdeps/sparc/nptl/sem_timedwait.c: Likewise.
+ * sysdeps/sparc/nptl/sem_wait.c: Likewise.
+ * sysdeps/sparc/sparc32/nptl/pthread_barrier_wait.c: Likewise.
+ * sysdeps/sparc/sparc32/nptl/sem_post.c: Likewise.
+ * sysdeps/sparc/sparc32/nptl/sem_timedwait.c: Likewise.
+ * sysdeps/sparc/sparc32/nptl/sem_wait.c: Likewise.
+
2014-06-27 Roland McGrath <roland@hack.frob.com>
* sysdeps/unix/sysv/linux/mips/mips32/nptl/c++-types.data: Moved ...
diff --git a/sysdeps/sparc/nptl/pthread_barrier_destroy.c b/sysdeps/sparc/nptl/pthread_barrier_destroy.c
index 2221a27..883a101 100644
--- a/sysdeps/sparc/nptl/pthread_barrier_destroy.c
+++ b/sysdeps/sparc/nptl/pthread_barrier_destroy.c
@@ -19,6 +19,7 @@
#include <errno.h>
#include "pthreadP.h"
#include <lowlevellock.h>
+#include <sparc-nptl.h>
int
pthread_barrier_destroy (barrier)
diff --git a/sysdeps/sparc/nptl/pthread_barrier_init.c b/sysdeps/sparc/nptl/pthread_barrier_init.c
index 6af6863..c076386 100644
--- a/sysdeps/sparc/nptl/pthread_barrier_init.c
+++ b/sysdeps/sparc/nptl/pthread_barrier_init.c
@@ -19,6 +19,7 @@
#include <errno.h>
#include "pthreadP.h"
#include <lowlevellock.h>
+#include <sparc-nptl.h>
int
pthread_barrier_init (barrier, attr, count)
diff --git a/sysdeps/sparc/nptl/pthread_barrier_wait.c b/sysdeps/sparc/nptl/pthread_barrier_wait.c
index ed5c1f7..525418c 100644
--- a/sysdeps/sparc/nptl/pthread_barrier_wait.c
+++ b/sysdeps/sparc/nptl/pthread_barrier_wait.c
@@ -20,6 +20,7 @@
#include <sysdep.h>
#include <lowlevellock.h>
#include <pthreadP.h>
+#include <sparc-nptl.h>
/* Wait on barrier. */
int
diff --git a/sysdeps/sparc/nptl/sem_init.c b/sysdeps/sparc/nptl/sem_init.c
index cbefdc4..d33881d 100644
--- a/sysdeps/sparc/nptl/sem_init.c
+++ b/sysdeps/sparc/nptl/sem_init.c
@@ -23,7 +23,7 @@
#include <shlib-compat.h>
#include "semaphoreP.h"
#include <kernel-features.h>
-
+#include <sparc-nptl.h>
int
__new_sem_init (sem, pshared, value)
diff --git a/sysdeps/sparc/nptl/sem_post.c b/sysdeps/sparc/nptl/sem_post.c
index d83b9d8..c2dbe0a 100644
--- a/sysdeps/sparc/nptl/sem_post.c
+++ b/sysdeps/sparc/nptl/sem_post.c
@@ -24,6 +24,7 @@
#include <semaphore.h>
#include <shlib-compat.h>
+#include <sparc-nptl.h>
int
__new_sem_post (sem_t *sem)
diff --git a/sysdeps/sparc/nptl/sem_timedwait.c b/sysdeps/sparc/nptl/sem_timedwait.c
index 0557e4e..3621f0b 100644
--- a/sysdeps/sparc/nptl/sem_timedwait.c
+++ b/sysdeps/sparc/nptl/sem_timedwait.c
@@ -25,7 +25,7 @@
#include <pthreadP.h>
#include <shlib-compat.h>
-
+#include <sparc-nptl.h>
extern void __sem_wait_cleanup (void *arg) attribute_hidden;
diff --git a/sysdeps/sparc/nptl/sem_wait.c b/sysdeps/sparc/nptl/sem_wait.c
index cfa1ef3..ccf714d 100644
--- a/sysdeps/sparc/nptl/sem_wait.c
+++ b/sysdeps/sparc/nptl/sem_wait.c
@@ -25,7 +25,7 @@
#include <pthreadP.h>
#include <shlib-compat.h>
-
+#include <sparc-nptl.h>
void
attribute_hidden
diff --git a/sysdeps/sparc/nptl/internaltypes.h b/sysdeps/sparc/nptl/sparc-nptl.h
similarity index 88%
rename from sysdeps/sparc/nptl/internaltypes.h
rename to sysdeps/sparc/nptl/sparc-nptl.h
index e5c2740..53abeab 100644
--- a/sysdeps/sparc/nptl/internaltypes.h
+++ b/sysdeps/sparc/nptl/sparc-nptl.h
@@ -1,7 +1,3 @@
-#ifndef _INTERNALTYPES_H
-
-#include_next <internaltypes.h>
-
union sparc_pthread_barrier
{
struct pthread_barrier b;
@@ -31,5 +27,3 @@ struct sparc_old_sem
unsigned char lock;
unsigned char private;
};
-
-#endif
diff --git a/sysdeps/sparc/sparc32/pthread_barrier_wait.c b/sysdeps/sparc/sparc32/pthread_barrier_wait.c
index 0fed908..318a47b 100644
--- a/sysdeps/sparc/sparc32/pthread_barrier_wait.c
+++ b/sysdeps/sparc/sparc32/pthread_barrier_wait.c
@@ -20,6 +20,7 @@
#include <sysdep.h>
#include <lowlevellock.h>
#include <pthreadP.h>
+#include <sparc-nptl.h>
/* Wait on barrier. */
int
diff --git a/sysdeps/sparc/sparc32/sem_post.c b/sysdeps/sparc/sparc32/sem_post.c
index d3846c0..40650a0 100644
--- a/sysdeps/sparc/sparc32/sem_post.c
+++ b/sysdeps/sparc/sparc32/sem_post.c
@@ -24,6 +24,7 @@
#include <semaphore.h>
#include <shlib-compat.h>
+#include <sparc-nptl.h>
int
__new_sem_post (sem_t *sem)
diff --git a/sysdeps/sparc/sparc32/sem_timedwait.c b/sysdeps/sparc/sparc32/sem_timedwait.c
index 5c48cb3..a10382a 100644
--- a/sysdeps/sparc/sparc32/sem_timedwait.c
+++ b/sysdeps/sparc/sparc32/sem_timedwait.c
@@ -25,7 +25,7 @@
#include <pthreadP.h>
#include <shlib-compat.h>
-
+#include <sparc-nptl.h>
extern void __sem_wait_cleanup (void *arg) attribute_hidden;
diff --git a/sysdeps/sparc/sparc32/sem_wait.c b/sysdeps/sparc/sparc32/sem_wait.c
index 8c072fe..81dcd09 100644
--- a/sysdeps/sparc/sparc32/sem_wait.c
+++ b/sysdeps/sparc/sparc32/sem_wait.c
@@ -25,7 +25,7 @@
#include <pthreadP.h>
#include <shlib-compat.h>
-
+#include <sparc-nptl.h>
void
attribute_hidden
-----------------------------------------------------------------------
hooks/post-receive
--
GNU C Library master sources