diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/config.gcc | 1 | ||||
| -rw-r--r-- | gcc/gthr-tpf.h | 157 | ||||
| -rw-r--r-- | gcc/gthr.h | 4 | ||||
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/Makefile.am | 9 | ||||
| -rw-r--r-- | libstdc++-v3/include/Makefile.in | 9 |
7 files changed, 191 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index eff1ec82e05..cabb154ca00 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2004-09-23 P.J. Darcy <darcypj@us.ibm.com> + + * gthr-tpf.h: New file. + * config.gcc (s390x-ibm-tpf*): Add thread_file='tpf'. + * gthr.h: Use gthr-tpf.h on TPF OS. + 2004-09-23 Jeff Law <law@redhat.com> * tree-ssa-ccp.c (get_default_value): Use SSA_NAME_VALUE rather diff --git a/gcc/config.gcc b/gcc/config.gcc index 3cc6cdd1f8f..747bcac9577 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -1675,6 +1675,7 @@ s390x-ibm-tpf*) extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o" out_file=s390/s390.c tmake_file="t-slibgcc-elf-ver s390/t-crtstuff s390/t-tpf" + thread_file='tpf' ;; sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \ diff --git a/gcc/gthr-tpf.h b/gcc/gthr-tpf.h new file mode 100644 index 00000000000..9831c666dc4 --- /dev/null +++ b/gcc/gthr-tpf.h @@ -0,0 +1,157 @@ +/* Threads compatibility routines for libgcc2 and libobjc. + Compile this one with gcc. + Copyright (C) 2004 Free Software Foundation, Inc. + +This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +GCC 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 General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with GCC; see the file COPYING. If not, write to the Free +Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. */ + +/* As a special exception, if you link this library with other files, + some of which are compiled with GCC, to produce an executable, + this library does not by itself cause the resulting executable + to be covered by the GNU General Public License. + This exception does not however invalidate any other reasons why + the executable file might be covered by the GNU General Public License. */ + + +/* TPF needs its own version of gthr-*.h because TPF always links to + the thread library. However, for performance reasons we still do not + want to issue thread api calls unless a check is made to see that we + are running as a thread. */ + +#ifndef GCC_GTHR_TPF_H +#define GCC_GTHR_TPF_H + +/* POSIX threads specific definitions. + Easy, since the interface is just one-to-one mapping. */ + +#define __GTHREADS 1 + +/* Some implementations of <pthread.h> require this to be defined. */ +#ifndef _REENTRANT +#define _REENTRANT 1 +#endif + +#include <pthread.h> +#include <unistd.h> + +typedef pthread_key_t __gthread_key_t; +typedef pthread_once_t __gthread_once_t; +typedef pthread_mutex_t __gthread_mutex_t; + +#define __GTHREAD_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER +#define __GTHREAD_ONCE_INIT PTHREAD_ONCE_INIT + +#define NOTATHREAD 00 +#define ECBBASEPTR (unsigned long int) *(unsigned int *)0x00000514u +#define ECBPG2PTR ECBBASEPTR + 0x1000 +#define CE2THRCPTR *((unsigned char *)(ECBPG2PTR + 208)) +#define __tpf_pthread_active() (CE2THRCPTR != NOTATHREAD) + +#if SUPPORTS_WEAK && GTHREAD_USE_WEAK + +#pragma weak pthread_once +#pragma weak pthread_key_create +#pragma weak pthread_key_delete +#pragma weak pthread_getspecific +#pragma weak pthread_setspecific +#pragma weak pthread_create + +#pragma weak pthread_mutex_lock +#pragma weak pthread_mutex_trylock +#pragma weak pthread_mutex_unlock + +#endif /* SUPPORTS_WEAK */ + +static inline int +__gthread_active_p (void) +{ + return 1; +} + +static inline int +__gthread_once (__gthread_once_t *once, void (*func) (void)) +{ + if (__tpf_pthread_active ()) + return pthread_once (once, func); + else + return -1; +} + +static inline int +__gthread_key_create (__gthread_key_t *key, void (*dtor) (void *)) +{ + if (__tpf_pthread_active ()) + return pthread_key_create (key, dtor); + else + return -1; +} + +static inline int +__gthread_key_delete (__gthread_key_t key) +{ + if (__tpf_pthread_active ()) + return pthread_key_delete (key); + else + return -1; +} + +static inline void * +__gthread_getspecific (__gthread_key_t key) +{ + if (__tpf_pthread_active ()) + return pthread_getspecific (key); + else + return NULL; +} + +static inline int +__gthread_setspecific (__gthread_key_t key, const void *ptr) +{ + if (__tpf_pthread_active ()) + return pthread_setspecific (key, ptr); + else + return -1; +} + +static inline int +__gthread_mutex_lock (__gthread_mutex_t *mutex) +{ + if (__tpf_pthread_active ()) + return pthread_mutex_lock (mutex); + else + return 0; +} + +static inline int +__gthread_mutex_trylock (__gthread_mutex_t *mutex) +{ + if (__tpf_pthread_active ()) + return pthread_mutex_trylock (mutex); + else + return 0; +} + +static inline int +__gthread_mutex_unlock (__gthread_mutex_t *mutex) +{ + if (__tpf_pthread_active ()) + return pthread_mutex_unlock (mutex); + else + return 0; +} + +#endif /* ! GCC_GTHR_TPF_H */ diff --git a/gcc/gthr.h b/gcc/gthr.h index 42f4d1a4d3a..dc43b6d50e3 100644 --- a/gcc/gthr.h +++ b/gcc/gthr.h @@ -89,7 +89,9 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA */ /* Check first for thread specific defines. */ -#if _PTHREADS +#if defined (__tpf__) +#include "gthr-tpf.h" +#elif _PTHREADS #include "gthr-posix.h" #elif _DCE_THREADS #include "gthr-dce.h" diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e1f15152a0c..711157815e6 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2004-09-23 P.J. Darcy <darcypj@us.ibm.com> + + * include/Makefile.am (thread_host_headers): Add gthr-tpf.h. + Add rule to build ${host_builddir}/gthr-tpf.h. + * include/Makefile.in: Regenerate. + 2004-09-23 Paolo Carlini <pcarlini@suse.de> Magnus Fromreide <magfr@lysator.liu.se> diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index 3e99d3329f2..2ab53ee59d3 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -361,6 +361,7 @@ thread_host_headers = \ ${host_builddir}/gthr.h \ ${host_builddir}/gthr-single.h \ ${host_builddir}/gthr-posix.h \ + ${host_builddir}/gthr-tpf.h \ ${host_builddir}/gthr-default.h pch_input = ${host_builddir}/stdc++.h @@ -526,6 +527,14 @@ ${host_builddir}/gthr-posix.h: ${toplevel_srcdir}/gcc/gthr-posix.h \ -e 's/\(${uppercase}*USE_WEAK\)/_GLIBCXX_\1/g' \ < ${toplevel_srcdir}/gcc/gthr-posix.h > $@ +${host_builddir}/gthr-tpf.h: ${toplevel_srcdir}/gcc/gthr-tpf.h \ + stamp-${host_alias} + sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \ + -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \ + -e 's/SUPPORTS_WEAK/__GXX_WEAK__/g' \ + -e 's/\(${uppercase}*USE_WEAK\)/_GLIBCXX_\1/g' \ + < ${toplevel_srcdir}/gcc/gthr-tpf.h > $@ + ${host_builddir}/gthr-default.h: ${toplevel_srcdir}/gcc/${glibcxx_thread_h} \ stamp-${host_alias} sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \ diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 6f78ffac412..b6f4be72c69 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -575,6 +575,7 @@ thread_host_headers = \ ${host_builddir}/gthr.h \ ${host_builddir}/gthr-single.h \ ${host_builddir}/gthr-posix.h \ + ${host_builddir}/gthr-tpf.h \ ${host_builddir}/gthr-default.h pch_input = ${host_builddir}/stdc++.h @@ -903,6 +904,14 @@ ${host_builddir}/gthr-posix.h: ${toplevel_srcdir}/gcc/gthr-posix.h \ -e 's/\(${uppercase}*USE_WEAK\)/_GLIBCXX_\1/g' \ < ${toplevel_srcdir}/gcc/gthr-posix.h > $@ +${host_builddir}/gthr-tpf.h: ${toplevel_srcdir}/gcc/gthr-tpf.h \ + stamp-${host_alias} + sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \ + -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \ + -e 's/SUPPORTS_WEAK/__GXX_WEAK__/g' \ + -e 's/\(${uppercase}*USE_WEAK\)/_GLIBCXX_\1/g' \ + < ${toplevel_srcdir}/gcc/gthr-tpf.h > $@ + ${host_builddir}/gthr-default.h: ${toplevel_srcdir}/gcc/${glibcxx_thread_h} \ stamp-${host_alias} sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \ |