From: Laurent Guerby <guerby@acm.org>
Date: Tue, 28 Jan 2003 22:28:24 +0000 (+0000)
Subject: re PR ada/8344 (mips-rtems build problem)
X-Git-Tag: releases/gcc-3.2.2~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d315017cfa3d6b7a9a8e6777aa182553f4f12951;p=thirdparty%2Fgcc.git

re PR ada/8344 (mips-rtems build problem)

2003-01-28  Laurent Guerby <guerby@acm.org>

	PR ada/8344
	* final.c: rename to adafinal.c to avoid file name conflicts with gcc file.
        * Makefile.in: match previous change.

From-SVN: r62037
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index b0b30323526b..454d5e2cf4d6 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-28  Laurent Guerby <guerby@acm.org>
+
+	PR ada/8344
+	* final.c: rename to adafinal.c to avoid file name conflicts with gcc file.
+        * Makefile.in: match previous change. 
+	
 2003-01-28  Christian Cornelssen <ccorn@cs.tu-berlin.de>
 
 	* Make-lang.in (ada.install-common): Let $(DESTDIR)$(bindir)
diff --git a/gcc/ada/Makefile.in b/gcc/ada/Makefile.in
index 1f25d2ede92d..a3df9baff92c 100644
--- a/gcc/ada/Makefile.in
+++ b/gcc/ada/Makefile.in
@@ -338,12 +338,12 @@ GNATBIND_OBJS = \
  s-stoele.o s-imgenu.o s-strops.o s-soflin.o s-wchcon.o s-wchjis.o \
  sdefault.o switch.o stylesw.o validsw.o \
  system.o table.o tree_io.o types.o widechar.o \
- raise.o exit.o argv.o init.o final.o s-wchcnv.o s-exctab.o \
+ raise.o exit.o argv.o init.o adafinal.o s-wchcnv.o s-exctab.o \
  a-except.o s-memory.o s-traceb.o tracebak.o s-mastop.o s-except.o \
  s-secsta.o $(EXTRA_GNATBIND_OBJS)
 
 GNATCHOP_RTL_OBJS = adaint.o argv.o cio.o cstreams.o exit.o \
- final.o init.o raise.o sysdep.o ada.o a-comlin.o gnat.o a-string.o \
+ adafinal.o init.o raise.o sysdep.o ada.o a-comlin.o gnat.o a-string.o \
  a-stmaco.o a-strsea.o a-charac.o a-chlat1.o g-except.o s-io.o \
  a-chahan.o a-strunb.o a-strfix.o a-strmap.o g-casuti.o g-comlin.o hostparm.o \
  g-dirope.o g-hesora.o g-htable.o g-regexp.o interfac.o system.o s-assert.o \
@@ -357,7 +357,7 @@ GNATCHOP_RTL_OBJS = adaint.o argv.o cio.o cstreams.o exit.o \
 GNATCHOP_OBJS = gnatchop.o gnatvsn.o \
    $(GNATCHOP_RTL_OBJS) $(EXTRA_GNATTOOLS_OBJS)
 
-GNATCMD_RTL_OBJS = adaint.o argv.o raise.o exit.o final.o init.o \
+GNATCMD_RTL_OBJS = adaint.o argv.o raise.o exit.o adafinal.o init.o \
    ada.o a-charac.o a-chahan.o a-comlin.o cstreams.o cio.o \
    a-except.o tracebak.o s-memory.o s-traceb.o s-mastop.o s-except.o \
    a-finali.o a-filico.o a-ioexce.o a-stream.o \
@@ -381,7 +381,7 @@ GNATKR_RTL_OBJS = ada.o a-charac.o a-chahan.o a-chlat1.o a-comlin.o \
   system.o s-bitops.o g-except.o s-finimp.o s-io.o s-parame.o s-secsta.o \
   s-stopoo.o s-sopco3.o s-sopco4.o s-sopco5.o s-stache.o \
   s-stoele.o s-soflin.o s-stalib.o s-unstyp.o adaint.o \
-  raise.o exit.o argv.o cio.o init.o final.o s-finroo.o \
+  raise.o exit.o argv.o cio.o init.o adafinal.o s-finroo.o \
   a-except.o tracebak.o s-memory.o s-traceb.o s-mastop.o s-except.o \
   a-filico.o  s-strops.o  s-stratt.o s-imgenu.o a-ioexce.o s-exctab.o
 GNATKR_OBJS = gnatkr.o gnatvsn.o \
@@ -389,7 +389,7 @@ GNATKR_OBJS = gnatkr.o gnatvsn.o \
 
 GNATLINK_RTL_OBJS = \
    adaint.o argv.o cio.o cstreams.o \
-   exit.o init.o final.o raise.o tracebak.o \
+   exit.o init.o adafinal.o raise.o tracebak.o \
    ada.o a-comlin.o a-except.o \
    gnat.o g-hesora.o g-htable.o g-os_lib.o \
    interfac.o i-cstrea.o \
@@ -416,7 +416,7 @@ GNATLS_RTL_OBJS = \
  a-except.o \
  exit.o   \
  a-filico.o \
- final.o  \
+ adafinal.o  \
  a-finali.o \
  init.o   \
  a-ioexce.o \
@@ -541,7 +541,7 @@ GNATLS_OBJS = \
  widechar.o $(GNATLS_RTL_OBJS) $(EXTRA_GNATTOOLS_OBJS)
 
 GNATMAKE_RTL_OBJS = adaint.o argv.o raise.o exit.o a-comlin.o \
- cio.o cstreams.o a-except.o s-mastop.o s-except.o final.o init.o \
+ cio.o cstreams.o a-except.o s-mastop.o s-except.o adafinal.o init.o \
  a-finali.o a-filico.o s-finroo.o s-finimp.o s-ficobl.o\
  a-charac.o a-chahan.o a-string.o a-strfix.o a-strmap.o a-strunb.o \
  a-stmaco.o a-strsea.o a-textio.o s-bitops.o sysdep.o \
@@ -578,7 +578,7 @@ argv.o \
 cio.o \
 cstreams.o \
 exit.o \
-final.o \
+adafinal.o \
 init.o \
 raise.o \
 sysdep.o \
@@ -652,7 +652,7 @@ s-valuti.o
 GNATMEM_OBJS = gnatmem.o memroot.o gmem.o \
    $(GNATMEM_RTL_OBJS) $(EXTRA_GNATTOOLS_OBJS)
 
-GNATPREP_RTL_OBJS = adaint.o argv.o raise.o exit.o final.o init.o \
+GNATPREP_RTL_OBJS = adaint.o argv.o raise.o exit.o adafinal.o init.o \
    ada.o a-charac.o a-chahan.o a-comlin.o cstreams.o cio.o \
    a-except.o tracebak.o s-memory.o s-traceb.o s-mastop.o s-except.o \
    a-finali.o a-filico.o a-ioexce.o a-stream.o a-string.o a-strmap.o \
@@ -669,7 +669,7 @@ GNATPREP_OBJS = gnatprep.o gnatvsn.o \
 
 GNATPSTA_RTL_OBJS = adaint.o argv.o cstreams.o cio.o \
    deftarg.o a-except.o targtyps.o tracebak.o s-memory.o s-traceb.o \
-   s-mastop.o s-except.o exit.o a-filico.o final.o a-finali.o init.o \
+   s-mastop.o s-except.o exit.o a-filico.o adafinal.o a-finali.o init.o \
    a-ioexce.o raise.o a-stream.o get_targ.o gnat.o g-hesora.o \
    sysdep.o a-tags.o a-textio.o i-cstrea.o system.o s-assert.o \
    s-exctab.o s-fatllf.o s-ficobl.o s-fileio.o s-finimp.o s-finroo.o \
@@ -683,7 +683,7 @@ GNATPSTA_OBJS = gnatpsta.o types.o ttypes.o \
 
 GNATPSYS_RTL_OBJS = adaint.o argv.o cstreams.o cio.o \
    a-except.o tracebak.o s-memory.o s-traceb.o s-mastop.o s-except.o exit.o \
-   a-filico.o final.o a-finali.o  init.o a-ioexce.o \
+   a-filico.o adafinal.o a-finali.o  init.o a-ioexce.o \
    raise.o a-stream.o \
    sysdep.o a-tags.o a-textio.o i-cstrea.o system.o s-assert.o \
    gnat.o g-hesora.o g-htable.o s-imgenu.o \
@@ -697,7 +697,7 @@ GNATPSYS_OBJS = gnatpsys.o \
 
 GNATXREF_RTL_OBJS =  \
    adaint.o argv.o cio.o cstreams.o \
-   exit.o init.o final.o raise.o sysdep.o tracebak.o \
+   exit.o init.o adafinal.o raise.o sysdep.o tracebak.o \
    ada.o a-charac.o a-chlat1.o gnat.o g-casuti.o g-hesora.o \
    g-htable.o interfac.o system.o i-cstrea.o s-parame.o s-exctab.o \
    a-ioexce.o a-string.o s-assert.o s-except.o \
@@ -719,7 +719,7 @@ GNATXREF_OBJS = gnatxref.o xr_tabls.o xref_lib.o \
 
 GNATFIND_RTL_OBJS = \
    adaint.o argv.o cio.o cstreams.o \
-   exit.o init.o final.o raise.o sysdep.o tracebak.o \
+   exit.o init.o adafinal.o raise.o sysdep.o tracebak.o \
    ada.o a-chahan.o a-charac.o a-chlat1.o a-comlin.o a-except.o \
    a-filico.o a-finali.o a-ioexce.o a-stmaco.o a-stream.o \
    a-strfix.o a-string.o a-strmap.o a-strsea.o a-strunb.o \
@@ -742,7 +742,7 @@ GNATFIND_OBJS = gnatfind.o xr_tabls.o xref_lib.o \
 
 GNATDLL_RTL_OBJS = \
    adaint.o argv.o cio.o cstreams.o \
-   exit.o init.o final.o raise.o sysdep.o tracebak.o \
+   exit.o init.o adafinal.o raise.o sysdep.o tracebak.o \
    a-charac.o a-chlat1.o a-chahan.o a-comlin.o a-except.o a-filico.o \
    a-finali.o a-ioexce.o a-stream.o a-strfix.o a-string.o a-strmap.o \
    a-strsea.o a-stmaco.o a-strunb.o a-tags.o a-textio.o ada.o \
@@ -1510,10 +1510,10 @@ endif
 LIBGNAT_SRCS = ada.h adaint.c adaint.h argv.c cio.c cstreams.c \
   errno.c exit.c cal.c \
   raise.h raise.c sysdep.c types.h io-aux.c init.c \
-  final.c tracebak.c expect.c $(EXTRA_LIBGNAT_SRCS)
+  adafinal.c tracebak.c expect.c $(EXTRA_LIBGNAT_SRCS)
 
 LIBGNAT_OBJS = adaint.o argv.o cio.o cstreams.o errno.o exit.o \
-  raise.o sysdep.o io-aux.o init.o cal.o final.o \
+  raise.o sysdep.o io-aux.o init.o cal.o adafinal.o \
   tracebak.o expect.o ../../prefix.o $(EXTRA_LIBGNAT_OBJS)
 
 # NOTE ??? - when the -I option for compiling Ada code is made to work,
@@ -2589,7 +2589,7 @@ cio.o     : cio.c
 deftarg.o  : deftarg.c
 errno.o   : errno.c
 exit.o    : raise.h exit.c
-final.o   : raise.h final.c
+adafinal.o   : raise.h adafinal.c
 gmem.o    : gmem.c
 
 raise.o   : raise.c raise.h
@@ -4339,7 +4339,7 @@ force:
 
 # Gnatlbr is only used on VMS
 
-GNATLBR_RTL_C_OBJS = adaint.o argv.o cio.o cstreams.o exit.o final.o init.o \
+GNATLBR_RTL_C_OBJS = adaint.o argv.o cio.o cstreams.o exit.o adafinal.o init.o \
   raise.o sysdep.o tracebak.o
 GNATLBR_C_OBJS = $(GNATLBR_RTL_C_OBJS)
 
diff --git a/gcc/ada/adafinal.c b/gcc/ada/adafinal.c
new file mode 100644
index 000000000000..cd06dfd9a166
--- /dev/null
+++ b/gcc/ada/adafinal.c
@@ -0,0 +1,57 @@
+/****************************************************************************
+ *                                                                          *
+ *                         GNAT COMPILER COMPONENTS                         *
+ *                                                                          *
+ *                            A D A F I N A L                               *
+ *                                                                          *
+ *                            $Revision: 1.1.16.1 $
+ *                                                                          *
+ *                          C Implementation File                           *
+ *                                                                          *
+ *          Copyright (C) 1992-2001 Free Software Foundation, Inc.          *
+ *                                                                          *
+ * GNAT is free software;  you can  redistribute it  and/or modify it under *
+ * terms of the  GNU General Public License as published  by the Free Soft- *
+ * ware  Foundation;  either version 2,  or (at your option) any later ver- *
+ * sion.  GNAT is distributed in the hope that it will be useful, but WITH- *
+ * OUT 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  distributed with GNAT;  see 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 file  with other  files to *
+ * produce an executable,  this file does not by itself cause the resulting *
+ * executable to be covered by the GNU General Public License. This except- *
+ * ion does not  however invalidate  any other reasons  why the  executable *
+ * file might be covered by the  GNU Public License.                        *
+ *                                                                          *
+ * GNAT was originally developed  by the GNAT team at  New York University. *
+ * Extensive contributions were provided by Ada Core Technologies Inc.      *
+ *                                                                          *
+ ****************************************************************************/
+
+#ifdef __alpha_vxworks
+#include "vxWorks.h"
+#endif
+
+#ifdef IN_RTS
+#include "tconfig.h"
+#include "tsystem.h"
+#else
+#include "config.h"
+#include "system.h"
+#endif
+
+#include "raise.h"
+
+/* This routine is called at the extreme end of execution of an Ada program
+   (the call is generated by the binder). The standard routine does nothing
+   at all, the intention is that this be replaced by system specific code
+   where finalization is required. */
+
+void
+__gnat_finalize ()
+{
+}