From: Laurent Guerby Date: Thu, 30 Jan 2003 00:46:22 +0000 (+0000) Subject: re PR ada/8344 (mips-rtems build problem) X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c1cc6a51a1521171a37c0d248ee063db13317174;p=gcc.git re PR ada/8344 (mips-rtems build problem) 2003-01-29 Laurent Guerby PR ada/8344 * final.c: rename to adafinal.c to avoid file name conflicts with gcc file. * Makefile.in: match previous change. * Make-lang.in: match previous change. From-SVN: r62122 --- diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 5efe3bbf317..328296bae5f 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,10 @@ +2003-01-29 Laurent Guerby + + PR ada/8344 + * final.c: rename to adafinal.c to avoid file name conflicts with gcc file. + * Makefile.in: match previous change. + * Make-lang.in: match previous change. + 2003-01-29 Joel Sherrill * 5rosinte.ads: Add SIGXCPU. diff --git a/gcc/ada/Make-lang.in b/gcc/ada/Make-lang.in index 76431a7002b..3e1770b9999 100644 --- a/gcc/ada/Make-lang.in +++ b/gcc/ada/Make-lang.in @@ -173,7 +173,7 @@ GNATBIND_OBJS = \ ada/s-stoele.o ada/s-imgenu.o ada/s-strops.o ada/s-soflin.o ada/s-wchcon.o \ ada/s-wchjis.o ada/sdefault.o ada/switch.o ada/switch-b.o ada/stylesw.o \ ada/validsw.o ada/system.o ada/table.o ada/tree_io.o ada/types.o \ - ada/widechar.o ada/raise.o ada/exit.o ada/argv.o ada/init.o ada/final.o \ + ada/widechar.o ada/raise.o ada/exit.o ada/argv.o ada/init.o ada/adafinal.o \ ada/s-wchcnv.o ada/s-exctab.o ada/a-except.o ada/s-memory.o ada/s-traceb.o \ ada/tracebak.o ada/s-mastop.o ada/s-except.o ada/s-secsta.o ada/atree.o \ ada/scans.o ada/einfo.o ada/sinfo.o ada/scn.o ada/sinput.o ada/sinput-l.o \ @@ -980,7 +980,7 @@ ada/adaint.o : ada/adaint.c $(CONFIG_H) $(SYSTEM_H) ada/adaint.h ada/argv.o : ada/argv.c $(CONFIG_H) $(SYSTEM_H) ada/adaint.h ada/cstreams.o : ada/cstreams.c $(CONFIG_H) $(SYSTEM_H) ada/adaint.h ada/exit.o : ada/exit.c $(CONFIG_H) $(SYSTEM_H) ada/adaint.h -ada/final.o : ada/final.c $(CONFIG_H) $(SYSTEM_H) ada/raise.h +ada/adafinal.o : ada/adafinal.c $(CONFIG_H) $(SYSTEM_H) ada/raise.h ada/link.o : ada/link.c ada/cio.o : ada/cio.c $(CONFIG_H) $(SYSTEM_H) ada/adaint.h diff --git a/gcc/ada/Makefile.in b/gcc/ada/Makefile.in index 664da56bd29..dfae32c9672 100644 --- a/gcc/ada/Makefile.in +++ b/gcc/ada/Makefile.in @@ -1021,10 +1021,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 aux-io.c init.c \ - final.c tracebak.c expect.c mkdir.c $(EXTRA_LIBGNAT_SRCS) + adafinal.c tracebak.c expect.c mkdir.c $(EXTRA_LIBGNAT_SRCS) LIBGNAT_OBJS = adaint.o argv.o cio.o cstreams.o errno.o exit.o \ - raise.o sysdep.o aux-io.o init.o cal.o final.o \ + raise.o sysdep.o aux-io.o init.o cal.o adafinal.o \ tracebak.o expect.o mkdir.o $(EXTRA_LIBGNAT_OBJS) # NOTE ??? - when the -I option for compiling Ada code is made to work, @@ -2088,7 +2088,7 @@ deftarg.o : deftarg.c errno.o : errno.c exit.o : raise.h exit.c expect.o : expect.c -final.o : raise.h final.c +adafinal.o : raise.h adafinal.c gmem.o : gmem.c link.o : link.c mkdir.o : mkdir.c @@ -2131,7 +2131,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 00000000000..06e1f462a46 --- /dev/null +++ b/gcc/ada/adafinal.c @@ -0,0 +1,56 @@ +/**************************************************************************** + * * + * GNAT COMPILER COMPONENTS * + * * + * A D A F I N A L * + * * + * * + * 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 () +{ +} diff --git a/gcc/ada/final.c b/gcc/ada/final.c deleted file mode 100644 index 2074b6f4c8b..00000000000 --- a/gcc/ada/final.c +++ /dev/null @@ -1,56 +0,0 @@ -/**************************************************************************** - * * - * GNAT COMPILER COMPONENTS * - * * - * F I N A L * - * * - * * - * 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 () -{ -}