From c1cc6a51a1521171a37c0d248ee063db13317174 Mon Sep 17 00:00:00 2001 From: Laurent Guerby Date: Thu, 30 Jan 2003 00:46:22 +0000 Subject: [PATCH] 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 --- gcc/ada/ChangeLog | 7 +++++++ gcc/ada/Make-lang.in | 4 ++-- gcc/ada/Makefile.in | 8 ++++---- gcc/ada/{final.c => adafinal.c} | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) rename gcc/ada/{final.c => adafinal.c} (97%) 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/final.c b/gcc/ada/adafinal.c similarity index 97% rename from gcc/ada/final.c rename to gcc/ada/adafinal.c index 2074b6f4c8b..06e1f462a46 100644 --- a/gcc/ada/final.c +++ b/gcc/ada/adafinal.c @@ -2,7 +2,7 @@ * * * GNAT COMPILER COMPONENTS * * * - * F I N A L * + * A D A F I N A L * * * * * * C Implementation File * -- 2.30.2