From ed0915ba70d0ff6ed0a78f45d46822763a580737 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 17 Feb 2010 23:42:28 -0800
Subject: Get new nptl building on SH4

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S           | 1 +
 libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h           | 1 -
 libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S     | 1 +
 libpthread/nptl/sysdeps/unix/sysv/linux/sh/not-cancel.h             | 1 -
 libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S | 1 +
 libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S    | 1 +
 libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S           | 1 +
 libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S  | 1 +
 libpthread/nptl/sysdeps/unix/sysv/linux/sh/vfork.S                  | 2 +-
 9 files changed, 7 insertions(+), 3 deletions(-)
 delete mode 100644 libpthread/nptl/sysdeps/unix/sysv/linux/sh/not-cancel.h

(limited to 'libpthread/nptl/sysdeps/unix/sysv/linux/sh')

diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
index 6d4036496..542804862 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
@@ -21,6 +21,7 @@
 #include <pthread-errnos.h>
 #include <bits/kernel-features.h>
 #include <lowlevellock.h>
+#include <tcb-offsets.h>
 #include "lowlevel-atomic.h"
 
 	.text
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
index d7fada991..19ce7fe40 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
@@ -27,7 +27,6 @@
 #include <bits/kernel-features.h>
 #endif
 
-#define SYS_futex		240
 #define FUTEX_WAIT		0
 #define FUTEX_WAKE		1
 #define FUTEX_CMP_REQUEUE	4
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S
index dab1ae4ab..1e05a56c0 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S
@@ -22,6 +22,7 @@
 #include <lowlevellock.h>
 #include <lowlevelrobustlock.h>
 #include <bits/kernel-features.h>
+#include <tcb-offsets.h>
 #include "lowlevel-atomic.h"
 
 	.text
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/not-cancel.h b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/not-cancel.h
deleted file mode 100644
index acf1a617e..000000000
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/not-cancel.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../i386/not-cancel.h"
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S
index 382512490..1242fc2cc 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S
@@ -22,6 +22,7 @@
 #include <bits/kernel-features.h>
 #include <pthread-pi-defines.h>
 #include <pthread-errnos.h>
+#include <tcb-offsets.h>
 #include "lowlevel-atomic.h"
 
 	.text
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S
index 914a1bad0..1c3bacbe6 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S
@@ -21,6 +21,7 @@
 #include <lowlevelcond.h>
 #include <bits/kernel-features.h>
 #include <pthread-errnos.h>
+#include <tcb-offsets.h>
 #include "lowlevel-atomic.h"
 
 	.text
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S
index caebb935a..a1477b3ac 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S
@@ -20,6 +20,7 @@
 #include <sysdep.h>
 #include <bits/kernel-features.h>
 #include <lowlevellock.h>
+#include <tcb-offsets.h>
 #include "lowlevel-atomic.h"
 
 
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S
index 239090b20..bc6c6c233 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S
@@ -20,6 +20,7 @@
 #include <lowlevellock.h>
 #include <lowlevelrwlock.h>
 #include <bits/kernel-features.h>
+#include <tcb-offsets.h>
 #include "lowlevel-atomic.h"
 
 
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/vfork.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/vfork.S
index 5433eacbe..a45c09fd6 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/vfork.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/vfork.S
@@ -66,6 +66,6 @@ ENTRY (__vfork)
 	.word	PID - TLS_PRE_TCB_SIZE
 	.align	2
 PSEUDO_END (__vfork)
-libc_hidden_def (__vfork)
+hidden_def (vfork)
 
 weak_alias (__vfork, vfork)
-- 
cgit v1.2.3