[uClibc] [PATCH] sh64: libpthread bits
Paul Mundt
lethal at linux-sh.org
Fri Dec 5 03:24:36 UTC 2003
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.
extra/Configs/Config.sh | 1
libc/sysdeps/linux/sh64/bits/mman.h | 96 ++++++++++++++++++++++
libpthread/linuxthreads/Makefile | 17 +++
libpthread/linuxthreads/sysdeps/Makefile | 49 +++++++++++
libpthread/linuxthreads/sysdeps/sh64/Makefile | 49 +++++++++++
libpthread/linuxthreads/sysdeps/sh64/pt-machine.c | 47 ++++++++++
libpthread/linuxthreads/sysdeps/sh64/pt-machine.h | 36 ++++++++
7 files changed, 292 insertions(+), 3 deletions(-)
Index: extra/Configs/Config.sh
===================================================================
RCS file: /var/cvs/uClibc/extra/Configs/Config.sh,v
retrieving revision 1.44
diff -u -r1.44 Config.sh
--- extra/Configs/Config.sh 3 Dec 2003 23:03:59 -0000 1.44
+++ extra/Configs/Config.sh 4 Dec 2003 20:13:41 -0000
@@ -59,7 +59,6 @@
config CONFIG_SH5
select UCLIBC_HAS_MMU
- select HAS_NO_THREADS
select ARCH_HAS_NO_LDSO
bool "SH5"
--- /dev/null Fri Aug 30 19:31:37 2002
+++ libc/sysdeps/linux/sh64/bits/mman.h Thu Dec 4 21:28:54 2003
@@ -0,0 +1,96 @@
+/* Cloned for uClibc by Paul Mundt, December 2003 */
+/* Modified by SuperH, Inc. September 2003 */
+
+/* Definitions for POSIX memory map interface. Linux/SH version.
+ Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ 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 _SYS_MMAN_H
+# error "Never include this file directly. Use <sys/mman.h> instead"
+#endif
+
+/* The following definitions basically come from the kernel headers.
+ But the kernel header is not namespace clean. */
+
+
+/* Protections are chosen from these bits, OR'd together. The
+ implementation does not necessarily support PROT_EXEC or PROT_WRITE
+ without PROT_READ. The only guarantees are that no writing will be
+ allowed without PROT_WRITE and no access will be allowed for PROT_NONE. */
+
+#define PROT_READ 0x1 /* Page can be read. */
+#define PROT_WRITE 0x2 /* Page can be written. */
+#define PROT_EXEC 0x4 /* Page can be executed. */
+#define PROT_NONE 0x0 /* Page can not be accessed. */
+
+/* Sharing types (must choose one and only one of these). */
+#define MAP_SHARED 0x01 /* Share changes. */
+#define MAP_PRIVATE 0x02 /* Changes are private. */
+#ifdef __USE_MISC
+# define MAP_TYPE 0x0f /* Mask for type of mapping. */
+#endif
+
+/* Other flags. */
+#define MAP_FIXED 0x10 /* Interpret addr exactly. */
+#ifdef __USE_MISC
+# define MAP_FILE 0
+# define MAP_ANONYMOUS 0x20 /* Don't use a file. */
+# define MAP_ANON MAP_ANONYMOUS
+#endif
+
+/* These are Linux-specific. */
+#ifdef __USE_MISC
+# define MAP_GROWSDOWN 0x0100 /* Stack-like segment. */
+# define MAP_DENYWRITE 0x0800 /* ETXTBSY */
+# define MAP_EXECUTABLE 0x1000 /* Mark it as an executable. */
+# define MAP_LOCKED 0x2000 /* Lock the mapping. */
+# define MAP_NORESERVE 0x4000 /* Don't check for reservations. */
+#endif
+
+/* Flags to `msync'. */
+#define MS_ASYNC 1 /* Sync memory asynchronously. */
+#define MS_SYNC 4 /* Synchronous memory sync. */
+#define MS_INVALIDATE 2 /* Invalidate the caches. */
+
+/* Flags for `mlockall'. */
+#define MCL_CURRENT 1 /* Lock all currently mapped pages. */
+#define MCL_FUTURE 2 /* Lock all additions to address
+ space. */
+
+/* Flags for `mremap'. */
+#ifdef __USE_GNU
+# define MREMAP_MAYMOVE 1
+#endif
+
+/* Advice to `madvise'. */
+#ifdef __USE_BSD
+# define MADV_NORMAL 0 /* No further special treatment. */
+# define MADV_RANDOM 1 /* Expect random page references. */
+# define MADV_SEQUENTIAL 2 /* Expect sequential page references. */
+# define MADV_WILLNEED 3 /* Will need these pages. */
+# define MADV_DONTNEED 4 /* Don't need these pages. */
+#endif
+
+/* The POSIX people had to invent similar names for the same things. */
+#ifdef __USE_XOPEN2K
+# define POSIX_MADV_NORMAL 0 /* No further special treatment. */
+# define POSIX_MADV_RANDOM 1 /* Expect random page references. */
+# define POSIX_MADV_SEQUENTIAL 2 /* Expect sequential page references. */
+# define POSIX_MADV_WILLNEED 3 /* Will need these pages. */
+# define POSIX_MADV_DONTNEED 4 /* Don't need these pages. */
+#endif
Index: libpthread/linuxthreads/Makefile
===================================================================
RCS file: /var/cvs/uClibc/libpthread/linuxthreads/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- libpthread/linuxthreads/Makefile 18 Oct 2003 10:20:19 -0000 1.11
+++ libpthread/linuxthreads/Makefile 4 Dec 2003 20:14:22 -0000
@@ -1,6 +1,7 @@
# Makefile for uClibc's pthread library
#
# Copyright (C) 2002 Erik Andersen <andersen at uclibc.org>
+# Copyright (C) 2003 Paul Mundt <lethal at 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 @@
all: $(OBJS) $(LIBPTHREAD)
-$(LIBPTHREAD): ar-target
+$(LIBPTHREAD): ar-target subdirs
ar-target: $(OBJS)
$(AR) $(ARFLAGS) $(LIBPTHREAD) $(OBJS)
@@ -69,7 +72,17 @@
$(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
--- /dev/null Fri Aug 30 19:31:37 2002
+++ libpthread/linuxthreads/sysdeps/Makefile Thu Dec 4 22:09:54 2003
@@ -0,0 +1,49 @@
+# Makefile for uClibc's pthread library
+#
+# Copyright (C) 2003 Paul Mundt <lethal at 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
+
--- /dev/null Fri Aug 30 19:31:37 2002
+++ libpthread/linuxthreads/sysdeps/sh64/Makefile Thu Dec 4 22:11:27 2003
@@ -0,0 +1,49 @@
+# Makefile for uClibc's sh64 pthread backend
+#
+# Copyright (C) 2003 Paul Mundt <lethal at 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
+
--- /dev/null Fri Aug 30 19:31:37 2002
+++ libpthread/linuxthreads/sysdeps/sh64/pt-machine.c Thu Dec 4 21:53:41 2003
@@ -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 at 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);
+}
+
--- /dev/null Fri Aug 30 19:31:37 2002
+++ libpthread/linuxthreads/sysdeps/sh64/pt-machine.h Thu Dec 4 21:24:22 2003
@@ -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 at 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");
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.busybox.net/pipermail/uclibc/attachments/20031204/77f2489b/attachment-0002.pgp
More information about the uClibc
mailing list