From 5d1c8e77cfcc007c21bfdf2077afffcb720a48b2 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Wed, 2 Nov 2011 15:28:43 +0000 Subject: 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 --- gcc/gthr-vxworks.h | 169 ----------------------------------------------------- 1 file changed, 169 deletions(-) delete mode 100644 gcc/gthr-vxworks.h (limited to 'gcc/gthr-vxworks.h') diff --git a/gcc/gthr-vxworks.h b/gcc/gthr-vxworks.h deleted file mode 100644 index d4da14e..0000000 --- a/gcc/gthr-vxworks.h +++ /dev/null @@ -1,169 +0,0 @@ -/* Threads compatibility routines for libgcc2 and libobjc for VxWorks. */ -/* Compile this one with gcc. */ -/* Copyright (C) 1997, 1999, 2000, 2008, 2009 Free Software Foundation, Inc. - Contributed by Mike Stump . - -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 -. */ - -#ifndef GCC_GTHR_VXWORKS_H -#define GCC_GTHR_VXWORKS_H - -#ifdef _LIBOBJC - -/* libobjc requires the optional pthreads component. */ -#include "gthr-posix.h" - -#else -#ifdef __cplusplus -#define UNUSED(x) -#else -#define UNUSED(x) x __attribute__((unused)) -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -#define __GTHREADS 1 -#define __gthread_active_p() 1 - -/* Mutexes are easy, except that they need to be initialized at runtime. */ - -#include - -typedef SEM_ID __gthread_mutex_t; -/* All VxWorks mutexes are recursive. */ -typedef SEM_ID __gthread_recursive_mutex_t; -#define __GTHREAD_MUTEX_INIT_FUNCTION __gthread_mutex_init_function -#define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function - -static inline void -__gthread_mutex_init_function (__gthread_mutex_t *mutex) -{ - *mutex = semMCreate (SEM_Q_PRIORITY | SEM_INVERSION_SAFE | SEM_DELETE_SAFE); -} - -static inline int -__gthread_mutex_destroy (__gthread_mutex_t * UNUSED(mutex)) -{ - return 0; -} - -static inline int -__gthread_mutex_lock (__gthread_mutex_t *mutex) -{ - return semTake (*mutex, WAIT_FOREVER); -} - -static inline int -__gthread_mutex_trylock (__gthread_mutex_t *mutex) -{ - return semTake (*mutex, NO_WAIT); -} - -static inline int -__gthread_mutex_unlock (__gthread_mutex_t *mutex) -{ - return semGive (*mutex); -} - -static inline void -__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *mutex) -{ - __gthread_mutex_init_function (mutex); -} - -static inline int -__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *mutex) -{ - return __gthread_mutex_lock (mutex); -} - -static inline int -__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *mutex) -{ - return __gthread_mutex_trylock (mutex); -} - -static inline int -__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *mutex) -{ - return __gthread_mutex_unlock (mutex); -} - -/* pthread_once is complicated enough that it's implemented - out-of-line. See config/vxlib.c. */ - -typedef struct -{ -#if !defined(__RTP__) -#if defined(__PPC__) - __attribute ((aligned (__alignof (unsigned)))) -#endif - volatile unsigned char busy; -#endif - volatile unsigned char done; -#if !defined(__RTP__) && defined(__PPC__) - /* PPC's test-and-set implementation requires a 4 byte aligned - object, of which it only sets the first byte. We use padding - here, in order to maintain some amount of backwards - compatibility. Without this padding, gthread_once objects worked - by accident because they happen to be static objects and the ppc - port automatically increased their alignment to 4 bytes. */ - unsigned char pad1; - unsigned char pad2; -#endif -} -__gthread_once_t; - -#if defined (__RTP__) -# define __GTHREAD_ONCE_INIT { 0 } -#elif defined (__PPC__) -# define __GTHREAD_ONCE_INIT { 0, 0, 0, 0 } -#else -# define __GTHREAD_ONCE_INIT { 0, 0 } -#endif - -extern int __gthread_once (__gthread_once_t *__once, void (*__func)(void)); - -/* Thread-specific data requires a great deal of effort, since VxWorks - is not really set up for it. See config/vxlib.c for the gory - details. All the TSD routines are sufficiently complex that they - need to be implemented out of line. */ - -typedef unsigned int __gthread_key_t; - -extern int __gthread_key_create (__gthread_key_t *__keyp, void (*__dtor)(void *)); -extern int __gthread_key_delete (__gthread_key_t __key); - -extern void *__gthread_getspecific (__gthread_key_t __key); -extern int __gthread_setspecific (__gthread_key_t __key, void *__ptr); - -#undef UNUSED - -#ifdef __cplusplus -} -#endif - -#endif /* not _LIBOBJC */ - -#endif /* gthr-vxworks.h */ -- cgit v1.1