diff options
author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2011-11-02 15:28:43 +0000 |
---|---|---|
committer | Rainer Orth <ro@gcc.gnu.org> | 2011-11-02 15:28:43 +0000 |
commit | 5d1c8e77cfcc007c21bfdf2077afffcb720a48b2 (patch) | |
tree | cf3984b6d1138277f5083eed6653ca512143e59c /gcc/gthr-tpf.h | |
parent | 852b75ed97493f2742b9747d08129eb5f255735c (diff) | |
download | gcc-5d1c8e77cfcc007c21bfdf2077afffcb720a48b2.zip gcc-5d1c8e77cfcc007c21bfdf2077afffcb720a48b2.tar.gz gcc-5d1c8e77cfcc007c21bfdf2077afffcb720a48b2.tar.bz2 |
Move gthr to toplevel libgcc
gcc:
* gthr-single.h, gthr.h: Move to ../libgcc.
* gthr-aix.h: Move to ../libgcc/config/rs6000.
* gthr-dce.h: Move to ../libgcc/config/pa.
* gthr-lynx.h: Move to ../libgcc/config.
* gthr-mipssde.h: Move to ../libgcc/config/mips.
* gthr-posix.h: Move to ../libgcc/config.
* gthr-rtems.h: Likewise.
* gthr-tpf.h: Move to ../libgcc/config/s390.
* gthr-vxworks.h: Move to ../libgcc/config.
* gthr-win32.h: Move to ../libgcc/config/i386.
* configure.ac (gthread_flags): Remove
(gthr-default.h): Don't create.
(thread_file): Don't substitute.
* configure: Regenerate.
* Makefile.in (GCC_THREAD_FILE): Remove.
(GTHREAD_FLAGS): Remove.
(libgcc.mvars): Remove GTHREAD_FLAGS.
* config/t-vxworks (EXTRA_HEADERS): Remove.
gcc/po:
* EXCLUDES (gthr-aix.h, gthr-dce.h, gthr-posix.c, gthr-posix.h)
(gthr-rtems.h, gthr-single.h, gthr-solaris.h, gthr-vxworks.h)
(gthr-win32.h, gthr.h): Remove.
libgcc:
* gthr-single.h, gthr.h: New files.
* config/gthr-lynx.h, config/gthr-posix.h., config/gthr-rtems.h,
config/gthr-vxworks.h, config/i386/gthr-win32.h,
config/mips/gthr-mipssde.h, config/pa/gthr-dce.h,
config/rs6000/gthr-aix.h, config/s390/gthr-tpf.h: New files.
* config/i386/gthr-win32.c: Include "gthr-win32.h".
* configure.ac (thread_header): New variable.
Set it depending on target_thread_file.
(gthr-default.h): Link from $thread_header.
* configure: Regenerate.
* Makefile.in (LIBGCC2_CFLAGS): Remove $(GTHREAD_FLAGS).
libgfortran:
* Makefile.am (AM_CPPFLAGS): Add
-I$(srcdir)/$(MULTISRCTOP)../libgcc, -I$(MULTIBUILDTOP)../libgcc.
* Makefile.in: Regenerate.
* acinclude.m4 (LIBGFOR_CHECK_GTHR_DEFAULT): Remove.
* configure.ac (LIBGFOR_CHECK_GTHR_DEFAULT): Likewise.
* configure: Regenerate.
* config.h.in: Regenerate.
libobjc:
* Makefile.in (INCLUDES): Add -I$(MULTIBUILDTOP)../libgcc.
* configure.ac (target_thread_file, HAVE_GTHR_DEFAULT): Remove.
* configure: Regenerate.
* config.h.in: Regenerate.
libstdc++-v3:
* acinclude.m4 (GLIBCXX_CONFIGURE): Determine and substitute
toplevel_builddir.
(GLIBCXX_ENABLE_THREADS): Remove glibcxx_thread_h,
HAVE_GTHR_DEFAULT, enable_thread.
(GLIBCXX_CHECK_GTHREADS): Reflect gthr move to libgcc.
* include/Makefile.am (thread_host_headers): Remove
${host_builddir}/gthr-tpf.h.
(${host_builddir}/gthr.h): Reflect gthr move to libgcc.
Use $<.
(${host_builddir}/gthr-single.h): Likewise.
(${host_builddir}/gthr-posix.h): Likewise.
(${host_builddir}/gthr-tpf.h): Remove.
(${host_builddir}/gthr-default.h): Likewise.
* configure, config.h.in: Regenerate.
* Makefile.in, doc/Makefile.in, include/Makefile.in,
libsupc++/Makefile.in, po/Makefile.in, python/Makefile.in,
src/Makefile.intestsuite/Makefile.in: Regenerate.
From-SVN: r180776
Diffstat (limited to 'gcc/gthr-tpf.h')
-rw-r--r-- | gcc/gthr-tpf.h | 229 |
1 files changed, 0 insertions, 229 deletions
diff --git a/gcc/gthr-tpf.h b/gcc/gthr-tpf.h deleted file mode 100644 index fb23e91..0000000 --- a/gcc/gthr-tpf.h +++ /dev/null @@ -1,229 +0,0 @@ -/* Threads compatibility routines for libgcc2 and libobjc. - Compile this one with gcc. - Copyright (C) 2004, 2005, 2008, 2009 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 3, 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. - -Under Section 7 of GPL version 3, you are granted additional -permissions described in the GCC Runtime Library Exception, version -3.1, as published by the Free Software Foundation. - -You should have received a copy of the GNU General Public License and -a copy of the GCC Runtime Library Exception along with this program; -see the files COPYING3 and COPYING.RUNTIME respectively. If not, see -<http://www.gnu.org/licenses/>. */ - -/* 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; -typedef pthread_mutex_t __gthread_recursive_mutex_t; - -#if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER) -#define __GTHREAD_RECURSIVE_MUTEX_INIT PTHREAD_RECURSIVE_MUTEX_INITIALIZER -#elif defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP) -#define __GTHREAD_RECURSIVE_MUTEX_INIT PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP -#endif - -#define __GTHREAD_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER -#define __GTHREAD_ONCE_INIT PTHREAD_ONCE_INIT -#define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function - -#define NOTATHREAD 00 -#define ECBBASEPTR (unsigned long int) *(unsigned int *)0x00000514u -#define ECBPG2PTR ECBBASEPTR + 0x1000 -#define CE2THRCPTR *((unsigned char *)(ECBPG2PTR + 16)) -#define __tpf_pthread_active() (CE2THRCPTR != NOTATHREAD) - -#if SUPPORTS_WEAK && GTHREAD_USE_WEAK -# define __gthrw(name) \ - static __typeof(name) __gthrw_ ## name __attribute__ ((__weakref__(#name))); -# define __gthrw_(name) __gthrw_ ## name -#else -# define __gthrw(name) -# define __gthrw_(name) name -#endif - -__gthrw(pthread_once) -__gthrw(pthread_key_create) -__gthrw(pthread_key_delete) -__gthrw(pthread_getspecific) -__gthrw(pthread_setspecific) -__gthrw(pthread_create) - -__gthrw(pthread_mutex_lock) -__gthrw(pthread_mutex_trylock) -__gthrw(pthread_mutex_unlock) -__gthrw(pthread_mutexattr_init) -__gthrw(pthread_mutexattr_settype) -__gthrw(pthread_mutexattr_destroy) -__gthrw(pthread_mutex_init) -__gthrw(pthread_mutex_destroy) - -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 __gthrw_(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 __gthrw_(pthread_key_create) (__key, __dtor); - else - return -1; -} - -static inline int -__gthread_key_delete (__gthread_key_t __key) -{ - if (__tpf_pthread_active ()) - return __gthrw_(pthread_key_delete) (__key); - else - return -1; -} - -static inline void * -__gthread_getspecific (__gthread_key_t __key) -{ - if (__tpf_pthread_active ()) - return __gthrw_(pthread_getspecific) (__key); - else - return NULL; -} - -static inline int -__gthread_setspecific (__gthread_key_t __key, const void *__ptr) -{ - if (__tpf_pthread_active ()) - return __gthrw_(pthread_setspecific) (__key, __ptr); - else - return -1; -} - -static inline int -__gthread_mutex_destroy (__gthread_mutex_t *__mutex) -{ - if (__tpf_pthread_active ()) - return __gthrw_(pthread_mutex_destroy) (__mutex); - else - return 0; -} - -static inline int -__gthread_mutex_lock (__gthread_mutex_t *__mutex) -{ - if (__tpf_pthread_active ()) - return __gthrw_(pthread_mutex_lock) (__mutex); - else - return 0; -} - -static inline int -__gthread_mutex_trylock (__gthread_mutex_t *__mutex) -{ - if (__tpf_pthread_active ()) - return __gthrw_(pthread_mutex_trylock) (__mutex); - else - return 0; -} - -static inline int -__gthread_mutex_unlock (__gthread_mutex_t *__mutex) -{ - if (__tpf_pthread_active ()) - return __gthrw_(pthread_mutex_unlock) (__mutex); - else - return 0; -} - -static inline int -__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex) -{ - if (__tpf_pthread_active ()) - return __gthread_mutex_lock (__mutex); - else - return 0; -} - -static inline int -__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *__mutex) -{ - if (__tpf_pthread_active ()) - return __gthread_mutex_trylock (__mutex); - else - return 0; -} - -static inline int -__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex) -{ - if (__tpf_pthread_active ()) - return __gthread_mutex_unlock (__mutex); - else - return 0; -} - -static inline int -__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *__mutex) -{ - if (__tpf_pthread_active ()) - { - pthread_mutexattr_t __attr; - int __r; - - __r = __gthrw_(pthread_mutexattr_init) (&__attr); - if (!__r) - __r = __gthrw_(pthread_mutexattr_settype) (&__attr, - PTHREAD_MUTEX_RECURSIVE); - if (!__r) - __r = __gthrw_(pthread_mutex_init) (__mutex, &__attr); - if (!__r) - __r = __gthrw_(pthread_mutexattr_destroy) (&__attr); - return __r; - } - return 0; -} - - -#endif /* ! GCC_GTHR_TPF_H */ |