aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>2011-05-23 11:12:25 +0000
committerRainer Orth <ro@gcc.gnu.org>2011-05-23 11:12:25 +0000
commitc80286502f7db28d9ef38bdb613209751667834a (patch)
treeb02e8e2376ff96e760951f15d4ddc6a1bb02d371
parent15882fe97cb65d99dd117330ccc05c5c86404a85 (diff)
downloadgcc-c80286502f7db28d9ef38bdb613209751667834a.zip
gcc-c80286502f7db28d9ef38bdb613209751667834a.tar.gz
gcc-c80286502f7db28d9ef38bdb613209751667834a.tar.bz2
gthr-gnat.c: Remove.
gcc: * gthr-gnat.c: Remove. * gthr-gnat.h: Remove. * Makefile.in (LIB2ADDEH): Remove $(srcdir)/gthr-gnat.c. * config/t-freebsd (LIB2ADDEH): Likewise. * config/t-linux (LIB2ADDEH): Likewise. * config/t-sol2 (LIB2ADDEH): Likewise. * config/ia64/t-vms (LIB2ADDEH): Likewise. * configure.ac (target_thread_file): Remove gnat handling. * configure: Regenerate. * doc/install.texi (Configuration, --enable-threads): Remove gnat. gcc/po: * EXCLUDES: Remove gthr-gnat.c, gthr-gnat.h. libgcc: * config/s390/t-tpf (LIB2ADDEH): Remove $(gcc_srcdir)/gthr-gnat.c. From-SVN: r174064
-rw-r--r--gcc/ChangeLog13
-rw-r--r--gcc/Makefile.in2
-rw-r--r--gcc/config/ia64/t-vms4
-rw-r--r--gcc/config/t-freebsd2
-rw-r--r--gcc/config/t-linux4
-rw-r--r--gcc/config/t-sol22
-rwxr-xr-xgcc/configure2
-rw-r--r--gcc/configure.ac2
-rw-r--r--gcc/doc/install.texi6
-rw-r--r--gcc/gthr-gnat.c85
-rw-r--r--gcc/gthr-gnat.h48
-rw-r--r--gcc/po/ChangeLog4
-rw-r--r--gcc/po/EXCLUDES4
-rw-r--r--libgcc/ChangeLog4
-rw-r--r--libgcc/config/s390/t-tpf2
15 files changed, 32 insertions, 152 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 70c97e0..253ce2a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,16 @@
+2011-05-23 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ * gthr-gnat.c: Remove.
+ * gthr-gnat.h: Remove.
+ * Makefile.in (LIB2ADDEH): Remove $(srcdir)/gthr-gnat.c.
+ * config/t-freebsd (LIB2ADDEH): Likewise.
+ * config/t-linux (LIB2ADDEH): Likewise.
+ * config/t-sol2 (LIB2ADDEH): Likewise.
+ * config/ia64/t-vms (LIB2ADDEH): Likewise.
+ * configure.ac (target_thread_file): Remove gnat handling.
+ * configure: Regenerate.
+ * doc/install.texi (Configuration, --enable-threads): Remove gnat.
+
2011-05-23 Tristan Gingold <gingold@adacore.com>
Eric Botcazou <ebotcazou@adacore.com>
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index a9d20c5..1c65a5b 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -680,7 +680,7 @@ CRTSTUFF_CFLAGS = -O2 $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -g0 \
# Additional sources to handle exceptions; overridden by targets as needed.
LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde.c \
- $(srcdir)/unwind-sjlj.c $(srcdir)/gthr-gnat.c $(srcdir)/unwind-c.c
+ $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
LIB2ADDEHSTATIC = $(LIB2ADDEH)
LIB2ADDEHSHARED = $(LIB2ADDEH)
LIB2ADDEHDEP = $(UNWIND_H) unwind-pe.h unwind.inc unwind-dw2-fde.h unwind-dw2.h
diff --git a/gcc/config/ia64/t-vms b/gcc/config/ia64/t-vms
index d77a2cf3..bcd7534 100644
--- a/gcc/config/ia64/t-vms
+++ b/gcc/config/ia64/t-vms
@@ -1,4 +1,4 @@
-# Copyright (C) 2009
+# Copyright (C) 2009, 2011
# Free Software Foundation, Inc.
#
# This file is part of GCC.
@@ -32,7 +32,7 @@ $(T)crtinitS.o: $(srcdir)/config/ia64/vms-crtinit.asm $(GCC_PASSES)
$(GCC_FOR_TARGET) -I. -c -o $(T)crtinitS.o -x assembler-with-cpp \
$(srcdir)/config/ia64/vms-crtinit.asm
-LIB2ADDEH += $(srcdir)/config/ia64/fde-vms.c $(srcdir)/gthr-gnat.c
+LIB2ADDEH += $(srcdir)/config/ia64/fde-vms.c
# Shared library macros
shlib_version:=$(shell echo $(BASEVER_c) | sed -e 's/\./,/' -e 's/\.//g')
diff --git a/gcc/config/t-freebsd b/gcc/config/t-freebsd
index c1b086e..276e2d7 100644
--- a/gcc/config/t-freebsd
+++ b/gcc/config/t-freebsd
@@ -6,5 +6,5 @@ TARGET_LIBGCC2_CFLAGS += -fPIC
# Use unwind-dw2-fde-glibc
LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde-glibc.c \
- $(srcdir)/unwind-sjlj.c $(srcdir)/gthr-gnat.c $(srcdir)/unwind-c.c
+ $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h unwind-dw2-fde.c
diff --git a/gcc/config/t-linux b/gcc/config/t-linux
index 1a7d79e..38b3b58 100644
--- a/gcc/config/t-linux
+++ b/gcc/config/t-linux
@@ -1,5 +1,5 @@
# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003,
-# 2004 Free Software Foundation, Inc.
+# 2004, 2011 Free Software Foundation, Inc.
#
# This file is part of GCC.
#
@@ -28,5 +28,5 @@ SHLIB_MAPFILES += $(srcdir)/config/libgcc-glibc.ver
# Use unwind-dw2-fde-glibc
LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde-glibc.c \
- $(srcdir)/unwind-sjlj.c $(srcdir)/gthr-gnat.c $(srcdir)/unwind-c.c
+ $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h unwind-dw2-fde.c
diff --git a/gcc/config/t-sol2 b/gcc/config/t-sol2
index 1604b9e4..9e06665 100644
--- a/gcc/config/t-sol2
+++ b/gcc/config/t-sol2
@@ -32,5 +32,5 @@ sol2.o: $(srcdir)/config/sol2.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
# Use unwind-dw2-fde-glibc.c. Unless linker support and dl_iterate_phdr
# are present, automatically falls back to unwind-dw2-fde.c.
LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde-glibc.c \
- $(srcdir)/unwind-sjlj.c $(srcdir)/gthr-gnat.c $(srcdir)/unwind-c.c
+ $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h unwind-dw2-fde.c
diff --git a/gcc/configure b/gcc/configure
index 4672f49..274af3e 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -10794,7 +10794,7 @@ case ${enable_threads} in
# default
target_thread_file='single'
;;
- aix | dce | gnat | lynx | mipssde | nks | posix | posix95 | rtems | \
+ aix | dce | lynx | mipssde | nks | posix | posix95 | rtems | \
single | tpf | vxworks | win32)
target_thread_file=${enable_threads}
;;
diff --git a/gcc/configure.ac b/gcc/configure.ac
index fefee49..9ace66d 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -1340,7 +1340,7 @@ case ${enable_threads} in
# default
target_thread_file='single'
;;
- aix | dce | gnat | lynx | mipssde | nks | posix | posix95 | rtems | \
+ aix | dce | lynx | mipssde | nks | posix | posix95 | rtems | \
single | tpf | vxworks | win32)
target_thread_file=${enable_threads}
;;
diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
index 904b805..418fa48 100644
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
@@ -1106,12 +1106,6 @@ like C++ and Java. The possibilities for @var{lib} are:
AIX thread support.
@item dce
DCE thread support.
-@item gnat
-Ada tasking support. For non-Ada programs, this setting is equivalent
-to @samp{single}. When used in conjunction with the Ada run time, it
-causes GCC to use the same thread primitives as Ada uses. This option
-is necessary when using both Ada and the back end exception handling,
-which is the default for most Ada targets.
@item lynx
LynxOS thread support.
@item mipssde
diff --git a/gcc/gthr-gnat.c b/gcc/gthr-gnat.c
deleted file mode 100644
index 4730bd3..0000000
--- a/gcc/gthr-gnat.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Threads compatibility routines for libgcc2. */
-/* Compile this one with gcc. */
-/* Copyright (C) 2003, 2004, 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/>. */
-
-#include "gthr-gnat.h"
-
-#ifndef HIDE_EXPORTS
-#pragma GCC visibility push(default)
-#endif
-
-#ifdef __cplusplus
-#define UNUSED(x)
-#else
-#define UNUSED(x) x __attribute__((unused))
-#endif
-
-void __gnat_default_lock (void);
-void __gnat_default_unlock (void);
-
-void
-__gnat_default_lock (void)
-{
- return;
-}
-
-void
-__gnat_default_unlock (void)
-{
- return;
-}
-
-static void (*__gnat_task_lock) (void) = *__gnat_default_lock;
-static void (*__gnat_task_unlock) (void) = *__gnat_default_unlock;
-
- void
-__gnat_install_locks (void (*lock) (void), void (*unlock) (void))
-{
- __gnat_task_lock = lock;
- __gnat_task_unlock = unlock;
-}
-
-int
-__gthread_active_p (void)
-{
- return 0;
-}
-
-int
-__gthread_mutex_lock (__gthread_mutex_t * UNUSED (mutex))
-{
- __gnat_task_lock ();
- return 0;
-}
-
-int
-__gthread_mutex_unlock (__gthread_mutex_t * UNUSED (mutex))
-{
- __gnat_task_unlock ();
- return 0;
-}
-
-#ifndef HIDE_EXPORTS
-#pragma GCC visibility pop
-#endif
diff --git a/gcc/gthr-gnat.h b/gcc/gthr-gnat.h
deleted file mode 100644
index a10aa80..0000000
--- a/gcc/gthr-gnat.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Threads compatibility routines for libgcc2. */
-/* Compile this one with gcc. */
-/* Copyright (C) 2003, 2004, 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/>. */
-
-#ifndef GCC_GTHR_GNAT_H
-#define GCC_GTHR_GNAT_H
-
-#ifndef HIDE_EXPORTS
-#pragma GCC visibility push(default)
-#endif
-
-/* Just provide compatibility for mutex handling. */
-
-typedef int __gthread_mutex_t;
-
-#define __GTHREAD_MUTEX_INIT 0
-
-extern void __gnat_install_locks (void (*) (void), void (*) (void));
-extern int __gthread_active_p (void);
-extern int __gthread_mutex_lock (__gthread_mutex_t *);
-extern int __gthread_mutex_unlock (__gthread_mutex_t *);
-
-#ifndef HIDE_EXPORTS
-#pragma GCC visibility pop
-#endif
-
-#endif /* ! GCC_GTHR_GNAT_H */
-
diff --git a/gcc/po/ChangeLog b/gcc/po/ChangeLog
index 7ebc82a..cb258af 100644
--- a/gcc/po/ChangeLog
+++ b/gcc/po/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-23 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ * EXCLUDES: Remove gthr-gnat.c, gthr-gnat.h.
+
2011-05-19 Joseph Myers <joseph@codesourcery.com>
* zh_CN.po: Update.
diff --git a/gcc/po/EXCLUDES b/gcc/po/EXCLUDES
index f53f845..7eb38b58 100644
--- a/gcc/po/EXCLUDES
+++ b/gcc/po/EXCLUDES
@@ -1,4 +1,4 @@
-# Copyright (C) 2001, 2004, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2004, 2009, 2010, 2011 Free Software Foundation, Inc.
#
# This file is part of GCC.
#
@@ -32,8 +32,6 @@ gcov-io.h
gcov-iov.c
gthr-aix.h
gthr-dce.h
-gthr-gnat.c
-gthr-gnat.h
gthr-posix.c
gthr-posix.h
gthr-rtems.h
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index eb7e46c6..c0bf955 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-23 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ * config/s390/t-tpf (LIB2ADDEH): Remove $(gcc_srcdir)/gthr-gnat.c.
+
2011-05-10 Joseph Myers <joseph@codesourcery.com>
* config/i386/darwin-lib.h: New file.
diff --git a/libgcc/config/s390/t-tpf b/libgcc/config/s390/t-tpf
index b1e8f69..7890d27 100644
--- a/libgcc/config/s390/t-tpf
+++ b/libgcc/config/s390/t-tpf
@@ -3,6 +3,6 @@ HOST_LIBGCC2_CFLAGS += -fPIC
# Use unwind-dw2-fde-glibc.
LIB2ADDEH = $(gcc_srcdir)/unwind-dw2.c $(gcc_srcdir)/unwind-dw2-fde-glibc.c \
- $(gcc_srcdir)/unwind-sjlj.c $(gcc_srcdir)/gthr-gnat.c $(gcc_srcdir)/unwind-c.c \
+ $(gcc_srcdir)/unwind-sjlj.c $(gcc_srcdir)/unwind-c.c \
$(gcc_srcdir)/emutls.c
LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h