diff mbox

[build,ada,doc] Remove --enable-threads=gnat support

Message ID yddtyclwx1q.fsf@manam.CeBiTec.Uni-Bielefeld.DE
State New
Headers show

Commit Message

Rainer Orth May 23, 2011, 10:06 a.m. UTC 
As Arnaud suggested with one of my --enable-threads cleanup patches,
--enable-threads=gnat is unused and can go.  The following patch
implements this.

Bootstrapped without regressions on i386-pc-solaris2.11.

While I didn't test the other affected configurations, I hope the
changes are sufficiently obvious that this is isn't necessary.  There
are no references to gthr-gnat left in the tree (outside of ChangeLog
files).

Ok for mainline?

	Rainer


2011-05-20  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	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.

Comments

Arnaud Charlet May 23, 2011, 10:09 a.m. UTC | #1 
> As Arnaud suggested with one of my --enable-threads cleanup patches,
> --enable-threads=gnat is unused and can go.  The following patch
> implements this.
> 
> Bootstrapped without regressions on i386-pc-solaris2.11.
> 
> While I didn't test the other affected configurations, I hope the
> changes are sufficiently obvious that this is isn't necessary.  There
> are no references to gthr-gnat left in the tree (outside of ChangeLog
> files).
> 
> Ok for mainline?

Certainly looks good to me, although I probably can't officially approve it.

Thanks for working on that!

Arno
Tristan Gingold May 23, 2011, 10:26 a.m. UTC | #2 
On May 23, 2011, at 12:06 PM, Rainer Orth wrote:

> As Arnaud suggested with one of my --enable-threads cleanup patches,
> --enable-threads=gnat is unused and can go.  The following patch
> implements this.
> 
> Bootstrapped without regressions on i386-pc-solaris2.11.
> 
> While I didn't test the other affected configurations, I hope the
> changes are sufficiently obvious that this is isn't necessary.  There
> are no references to gthr-gnat left in the tree (outside of ChangeLog
> files).
> 
> Ok for mainline?

VMS part is (obviously) correct.

Tristan.
Rainer Orth May 23, 2011, 10:33 a.m. UTC | #3 
Arnaud Charlet <charlet@adacore.com> writes:

> Certainly looks good to me, although I probably can't officially approve it.

I think you can since this only affects Ada.  I'll wait a day or two if
anyone objects, then install the patch.

Thanks.
	Rainer
Paolo Bonzini May 23, 2011, 10:53 a.m. UTC | #4 
On 05/23/2011 12:33 PM, Rainer Orth wrote:
>> >  Certainly looks good to me, although I probably can't officially approve it.
> I think you can since this only affects Ada.  I'll wait a day or two if
> anyone objects, then install the patch.

It's okay for me too.

Paolo
Rainer Orth May 23, 2011, 11:55 a.m. UTC | #5 
Paolo Bonzini <bonzini@gnu.org> writes:

> On 05/23/2011 12:33 PM, Rainer Orth wrote:
>>> >  Certainly looks good to me, although I probably can't officially approve it.
>> I think you can since this only affects Ada.  I'll wait a day or two if
>> anyone objects, then install the patch.
>
> It's okay for me too.

Fine, I've installed the patch now.

Thanks.
	Rainer
diff mbox

Patch

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -741,7 +741,7 @@  CRTSTUFF_CFLAGS = -O2 $(GCC_CFLAGS) $(IN
 
 # 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
--- 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 @@  CRTSTUFF_T_CFLAGS_S = -O0
 	$(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
--- 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
--- 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/libgc
 
 # 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
--- a/gcc/config/t-sol2
+++ b/gcc/config/t-sol2
@@ -32,5 +32,5 @@  sol2.o: $(srcdir)/config/sol2.c $(CONFIG
 # 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.ac b/gcc/configure.ac
--- 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
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
@@ -1106,12 +1106,6 @@  like C++ and Java.  The possibilities fo
 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
diff --git a/gcc/gthr-gnat.h b/gcc/gthr-gnat.h
deleted file mode 100644
diff --git a/gcc/po/EXCLUDES b/gcc/po/EXCLUDES
--- 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/config/s390/t-tpf b/libgcc/config/s390/t-tpf
--- 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