Paul Mundt <lethal@linux-sh.org> writes:

This patch adds the libpthread backend bits for sh64. As noted previously,
we can't inline things like the testandset() in pt-machine.h as we need to
use a completely different ISA / CFLAGS in order for this to work.

As a result, this patch is somewhat of a RFC as well to see what people think
of the libpthread/linuxthreads/sysdeps Makefile approach, etc. The approach
I've taken currently has been to provide a sysdeps/Makefile with a note that
TARGET_ARCHs that want build rules can simply add themselves into the list of
matching architectures to add to the subdir rule for. This probably isn't
the cleanest solution, but it's quite transparent and works quite well.

5 files changed, 196 insertions, 2 deletions

diff --git a/libpthread/linuxthreads/Makefile b/libpthread/linuxthreads/Makefile
index 7d62879eb..e43f05ea5 100644
--- a/libpthread/linuxthreads/Makefile
+++ b/libpthread/linuxthreads/Makefile
@@ -1,6 +1,7 @@
 # Makefile for uClibc's pthread library
 #
 # Copyright (C) 2002 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2003 Paul Mundt <lethal@linux-sh.org>
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU Library General Public License as published by the Free
@@ -20,6 +21,8 @@
 TOPDIR=../../
 include $(TOPDIR)Rules.mak
 
+DIRS = sysdeps
+
 #Adjust the soname version to avoid namespace collisions with glibc's libpthread
 LIBPTHREAD:=../libpthread.a
 ifeq ($(strip $(TARGET_ARCH)),sparc)
@@ -56,7 +59,7 @@ OBJS=$(COBJS)
 
 all: $(OBJS) $(LIBPTHREAD)
 
-$(LIBPTHREAD): ar-target
+$(LIBPTHREAD): ar-target subdirs
 
 ar-target: $(OBJS)
 	$(AR) $(ARFLAGS) $(LIBPTHREAD) $(OBJS)
@@ -69,7 +72,17 @@ else
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 endif
 
-clean:
+clean: subdirs_clean
 	$(RM) *.[oa] *~ core
 
+subdirs: $(patsubst %, _dir_%, $(DIRS))
+subdirs_clean: $(patsubst %, _dirclean_%, $(DIRS))
+
+$(patsubst %, _dir_%, $(DIRS)) : dummy
+	$(MAKE) -C $(patsubst _dir_%, %, $@)
+
+$(patsubst %, _dirclean_%, $(DIRS)) : dummy
+	$(MAKE) -C $(patsubst _dirclean_%, %, $@) clean
+
+.PHONY: dummy subdirs
 
diff --git a/libpthread/linuxthreads/sysdeps/Makefile b/libpthread/linuxthreads/sysdeps/Makefile
new file mode 100644
index 000000000..dff461543
--- /dev/null
+++ b/libpthread/linuxthreads/sysdeps/Makefile
@@ -0,0 +1,49 @@
+# Makefile for uClibc's pthread library
+#
+# Copyright (C) 2003 Paul Mundt <lethal@linux-sh.org>
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Library General Public License as published by the Free
+# Software Foundation; either version 2 of the License, or (at your option) any
+# later version.
+#
+# This program 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 Library General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Makefile for uClibc
+
+TOPDIR=../../../
+include $(TOPDIR)Rules.mak
+
+# Generally most TARGET_ARCHs aren't going to want a make rule here as they
+# can generally just inline directly into the upper-level pt-machine.c. As
+# such, we offer this capability for platforms that either can't get away
+# with the inlining, or need to be able to do builds here for other reasons. 
+
+DIRS =
+
+ifeq ($(TARGET_ARCH),sh64)
+	DIRS += $(TARGET_ARCH)
+endif
+
+all: subdirs
+
+clean: subdirs_clean
+	$(RM) *~ core
+
+subdirs: $(patsubst %, _dir_%, $(DIRS))
+subdirs_clean: $(patsubst %, _dirclean_%, $(DIRS))
+
+$(patsubst %, _dir_%, $(DIRS)) : dummy
+	$(MAKE) -C $(patsubst _dir_%, %, $@)
+
+$(patsubst %, _dirclean_%, $(DIRS)) : dummy
+	$(MAKE) -C $(patsubst _dirclean_%, %, $@) clean
+
+.PHONY: dummy subdirs
+
diff --git a/libpthread/linuxthreads/sysdeps/sh64/Makefile b/libpthread/linuxthreads/sysdeps/sh64/Makefile
new file mode 100644
index 000000000..375946b8d
--- /dev/null
+++ b/libpthread/linuxthreads/sysdeps/sh64/Makefile
@@ -0,0 +1,49 @@
+# Makefile for uClibc's sh64 pthread backend
+#
+# Copyright (C) 2003 Paul Mundt <lethal@linux-sh.org>
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Library General Public License as published by the Free
+# Software Foundation; either version 2 of the License, or (at your option) any
+# later version.
+#
+# This program 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 Library General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+TOPDIR=../../../../
+include $(TOPDIR)Rules.mak
+
+LIBPTHREAD=../../../libpthread.a
+SOBJS = $(patsubst %.S,%.o, $(SSRC))
+CSRC = pt-machine.c
+COBJS = $(patsubst %.c,%.o, $(CSRC))
+
+# We need to build as SHcompact for tas..
+CFLAGS := $(subst 32media,compact,$(CFLAGS))
+
+OBJS = $(SOBJS) $(COBJS)
+
+all: $(OBJS) $(LIBC)
+
+$(LIBC): ar-target 
+
+ar-target: $(OBJS)
+	$(AR) $(ARFLAGS) $(LIBPTHREAD) $(OBJS)
+
+$(SOBJS): %.o : %.S
+	$(CC) $(SFLAGS) -c $< -o $@
+	$(STRIPTOOL) -x -R .note -R .comment $*.o
+
+$(COBJS): %.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+	$(STRIPTOOL) -x -R .note -R .comment $*.o
+
+clean:
+	$(RM) *.[oa] *~ core
+
diff --git a/libpthread/linuxthreads/sysdeps/sh64/pt-machine.c b/libpthread/linuxthreads/sysdeps/sh64/pt-machine.c
new file mode 100644
index 000000000..ea4881322
--- /dev/null
+++ b/libpthread/linuxthreads/sysdeps/sh64/pt-machine.c
@@ -0,0 +1,47 @@
+/* Cloned for uClibc by Paul Mundt, December 2003 */
+/* Modified by SuperH, Inc. September 2003 */
+
+/* Machine-dependent pthreads configuration and inline functions.
+   SH5 version.
+   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Niibe Yutaka <gniibe@m17n.org>.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include "pt-machine.h"
+
+/* Spinlock implementation; required.  */
+
+/* The SH5 does not have a suitable test-and-set instruction (SWAP only 
+   operates on an aligned quad word). So we use the SH4 version instead.
+   This must be seperately compiled in SHcompact mode, so it cannot be
+   inline. */
+
+long int testandset (int *spinlock)
+{
+  int ret;
+
+  __asm__ __volatile__(
+       "tas.b	@%1\n\t"
+       "movt	%0"
+       : "=r" (ret)
+       : "r" (spinlock)
+       : "memory", "cc");
+
+  return (ret == 0);
+}
+
diff --git a/libpthread/linuxthreads/sysdeps/sh64/pt-machine.h b/libpthread/linuxthreads/sysdeps/sh64/pt-machine.h
new file mode 100644
index 000000000..8269a4cb3
--- /dev/null
+++ b/libpthread/linuxthreads/sysdeps/sh64/pt-machine.h
@@ -0,0 +1,36 @@
+/* Cloned for uClibc by Paul Mundt, December 2003 */
+/* Modified by SuperH, Inc. September 2003 */
+
+/* Machine-dependent pthreads configuration and inline functions.
+   SuperH version.
+   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Niibe Yutaka <gniibe@m17n.org>.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifndef PT_EI
+# define PT_EI extern inline
+#endif
+
+/* Spinlock implementation; required.  */
+extern long int testandset (int *spinlock);
+
+
+/* Get some notion of the current stack.  Need not be exactly the top
+   of the stack, just something somewhere in the current frame.  */
+#define CURRENT_STACK_FRAME  stack_pointer
+register char * stack_pointer __asm__ ("r15");