]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
Revert Ada .cc renaming renaming.
authorMartin Liska <mliska@suse.cz>
Tue, 18 Jan 2022 08:54:35 +0000 (09:54 +0100)
committerMartin Liska <mliska@suse.cz>
Tue, 18 Jan 2022 09:18:51 +0000 (10:18 +0100)
gcc/ada/ChangeLog:

* Make-generated.in: Revert renaming changes.
* Makefile.rtl: Likewise.
* adadecode.cc: Moved to...
* adadecode.c: ...here.
* affinity.cc: Moved to...
* affinity.c: ...here.
* argv-lynxos178-raven-cert.cc: Moved to...
* argv-lynxos178-raven-cert.c: ...here.
* argv.cc: Moved to...
* argv.c: ...here.
* aux-io.cc: Moved to...
* aux-io.c: ...here.
* cio.cc: Moved to...
* cio.c: ...here.
* cstreams.cc: Moved to...
* cstreams.c: ...here.
* env.cc: Moved to...
* env.c: ...here.
* exit.cc: Moved to...
* exit.c: ...here.
* expect.cc: Moved to...
* expect.c: ...here.
* final.cc: Moved to...
* final.c: ...here.
* gcc-interface/Makefile.in:
* init.cc: Moved to...
* init.c: ...here.
* initialize.cc: Moved to...
* initialize.c: ...here.
* libgnarl/thread.cc: Moved to...
* libgnarl/thread.c: ...here.
* link.cc: Moved to...
* link.c: ...here.
* locales.cc: Moved to...
* locales.c: ...here.
* mkdir.cc: Moved to...
* mkdir.c: ...here.
* raise.cc: Moved to...
* raise.c: ...here.
* rtfinal.cc: Moved to...
* rtfinal.c: ...here.
* rtinit.cc: Moved to...
* rtinit.c: ...here.
* s-oscons-tmplt.c (CND): Revert renaming changes.
* seh_init.cc: Moved to...
* seh_init.c: ...here.
* sigtramp-armdroid.cc: Moved to...
* sigtramp-armdroid.c: ...here.
* sigtramp-ios.cc: Moved to...
* sigtramp-ios.c: ...here.
* sigtramp-qnx.cc: Moved to...
* sigtramp-qnx.c: ...here.
* sigtramp-vxworks.cc: Moved to...
* sigtramp-vxworks.c: ...here.
* socket.cc: Moved to...
* socket.c: ...here.
* tracebak.cc: Moved to...
* tracebak.c: ...here.
* version.cc: Moved to...
* version.c: ...here.
* vx_stack_info.cc: Moved to...
* vx_stack_info.c: ...here.

33 files changed:
gcc/ada/Make-generated.in
gcc/ada/Makefile.rtl
gcc/ada/adadecode.c [moved from gcc/ada/adadecode.cc with 100% similarity]
gcc/ada/affinity.c [moved from gcc/ada/affinity.cc with 100% similarity]
gcc/ada/argv-lynxos178-raven-cert.c [moved from gcc/ada/argv-lynxos178-raven-cert.cc with 100% similarity]
gcc/ada/argv.c [moved from gcc/ada/argv.cc with 100% similarity]
gcc/ada/aux-io.c [moved from gcc/ada/aux-io.cc with 100% similarity]
gcc/ada/cio.c [moved from gcc/ada/cio.cc with 100% similarity]
gcc/ada/cstreams.c [moved from gcc/ada/cstreams.cc with 100% similarity]
gcc/ada/env.c [moved from gcc/ada/env.cc with 100% similarity]
gcc/ada/exit.c [moved from gcc/ada/exit.cc with 100% similarity]
gcc/ada/expect.c [moved from gcc/ada/expect.cc with 100% similarity]
gcc/ada/final.c [moved from gcc/ada/final.cc with 100% similarity]
gcc/ada/gcc-interface/Makefile.in
gcc/ada/init.c [moved from gcc/ada/init.cc with 100% similarity]
gcc/ada/initialize.c [moved from gcc/ada/initialize.cc with 100% similarity]
gcc/ada/libgnarl/thread.c [moved from gcc/ada/libgnarl/thread.cc with 100% similarity]
gcc/ada/link.c [moved from gcc/ada/link.cc with 100% similarity]
gcc/ada/locales.c [moved from gcc/ada/locales.cc with 100% similarity]
gcc/ada/mkdir.c [moved from gcc/ada/mkdir.cc with 100% similarity]
gcc/ada/raise.c [moved from gcc/ada/raise.cc with 100% similarity]
gcc/ada/rtfinal.c [moved from gcc/ada/rtfinal.cc with 100% similarity]
gcc/ada/rtinit.c [moved from gcc/ada/rtinit.cc with 100% similarity]
gcc/ada/s-oscons-tmplt.c
gcc/ada/seh_init.c [moved from gcc/ada/seh_init.cc with 100% similarity]
gcc/ada/sigtramp-armdroid.c [moved from gcc/ada/sigtramp-armdroid.cc with 100% similarity]
gcc/ada/sigtramp-ios.c [moved from gcc/ada/sigtramp-ios.cc with 100% similarity]
gcc/ada/sigtramp-qnx.c [moved from gcc/ada/sigtramp-qnx.cc with 100% similarity]
gcc/ada/sigtramp-vxworks.c [moved from gcc/ada/sigtramp-vxworks.cc with 100% similarity]
gcc/ada/socket.c [moved from gcc/ada/socket.cc with 100% similarity]
gcc/ada/tracebak.c [moved from gcc/ada/tracebak.cc with 100% similarity]
gcc/ada/version.c [moved from gcc/ada/version.cc with 100% similarity]
gcc/ada/vx_stack_info.c [moved from gcc/ada/vx_stack_info.cc with 100% similarity]

index 6cdc6b4605ee2f18458724496d01d0d25fc48814..948fc508a56a133f39795502672256b4760979be 100644 (file)
@@ -53,7 +53,7 @@ ada/stamp-snames : ada/snames.ads-tmpl ada/snames.adb-tmpl ada/snames.h-tmpl ada
        touch ada/stamp-snames
 
 ada/sdefault.adb: ada/stamp-sdefault ; @true
-ada/stamp-sdefault : $(srcdir)/ada/version.cc Makefile
+ada/stamp-sdefault : $(srcdir)/ada/version.c Makefile
        $(ECHO) "pragma Style_Checks (Off);" >tmp-sdefault.adb
        $(ECHO) "with Osint; use Osint;" >>tmp-sdefault.adb
        $(ECHO) "package body Sdefault is" >>tmp-sdefault.adb
index 59db72834dc893ac057a46383f0c6df749195970..1b066ad6b1448e2ebcb179d4d115eadb1127a0b4 100644 (file)
@@ -2856,7 +2856,7 @@ LIBGNAT_TARGET_PAIRS += \
 
 # LIBGNAT_SRCS is the list of all C files (including headers) of the runtime
 # library.  LIBGNAT_OBJS is the list of object files for libgnat.
-# thread.cc is special as put into GNATRTL_TASKING_OBJS
+# thread.c is special as put into GNATRTL_TASKING_OBJS
 LIBGNAT_OBJS = adadecode.o adaint.o argv.o aux-io.o                    \
   cal.o cio.o cstreams.o ctrl_c.o                                      \
   env.o errno.o exit.o expect.o final.o rtfinal.o rtinit.o             \
@@ -2870,7 +2870,7 @@ LIBGNAT_OBJS = adadecode.o adaint.o argv.o aux-io.o                       \
 #  GNAT_RTL_SRCS.  Right now we count on being able to build GNATRTL_OBJS
 #  from ADA_INCLUDE_SRCS.
 
-LIBGNAT_SRCS = $(patsubst %.o,%.cc,$(LIBGNAT_OBJS))                    \
+LIBGNAT_SRCS = $(patsubst %.o,%.c,$(LIBGNAT_OBJS))                     \
   adadecode.h adaint.h env.h gsocket.h raise.h standard.ads.h          \
   runtime.h $(EXTRA_LIBGNAT_SRCS)
 
@@ -2920,7 +2920,7 @@ setup-rts: force
        $(MKDIR) $(RTSDIR)
        $(CHMOD) u+w $(RTSDIR)
 # Copy target independent sources
-       $(foreach f,$(ADA_INCLUDE_SRCS) $(LIBGNAT_SRCS) libgnarl/thread.cc, \
+       $(foreach f,$(ADA_INCLUDE_SRCS) $(LIBGNAT_SRCS) libgnarl/thread.c, \
          $(LN_S) $(GNAT_SRC)/$(f) $(RTSDIR) ;) true
 # Remove files not used
        $(RM) $(patsubst %,$(RTSDIR)/%,$(ADA_EXCLUDE_FILES))
@@ -2941,7 +2941,7 @@ setup-rts: force
        do \
          if [ -f $(RTSDIR)/$$f ]; then echo $$f >> $(RTSDIR)/libgnarl.lst; fi \
        done
-       @echo thread.cc >> $(RTSDIR)/libgnarl.lst
+       @echo thread.c >> $(RTSDIR)/libgnarl.lst
        @for f in \
          $(foreach F,$(GNATRTL_NONTASKING_OBJS),$(subst $(objext),.ads,$(F))) \
          $(foreach F,$(GNATRTL_NONTASKING_OBJS),$(subst $(objext),.adb,$(F))); \
similarity index 100%
rename from gcc/ada/adadecode.cc
rename to gcc/ada/adadecode.c
similarity index 100%
rename from gcc/ada/affinity.cc
rename to gcc/ada/affinity.c
similarity index 100%
rename from gcc/ada/argv.cc
rename to gcc/ada/argv.c
similarity index 100%
rename from gcc/ada/aux-io.cc
rename to gcc/ada/aux-io.c
similarity index 100%
rename from gcc/ada/cio.cc
rename to gcc/ada/cio.c
similarity index 100%
rename from gcc/ada/cstreams.cc
rename to gcc/ada/cstreams.c
similarity index 100%
rename from gcc/ada/env.cc
rename to gcc/ada/env.c
similarity index 100%
rename from gcc/ada/exit.cc
rename to gcc/ada/exit.c
similarity index 100%
rename from gcc/ada/expect.cc
rename to gcc/ada/expect.c
similarity index 100%
rename from gcc/ada/final.cc
rename to gcc/ada/final.c
index 54cf182a8c3152b609d73ca33311de24589dd8b5..53d0739470abf920f10336efdc193e0669eff738 100644 (file)
@@ -147,8 +147,8 @@ host_os=@host_os@
 target_cpu_default = @target_cpu_default@
 xmake_file = @xmake_file@
 tmake_file = @tmake_file@
-#version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < $(srcdir)/version.cc`
-#mainversion=`sed -e 's/.*\"\([0-9]*\.[0-9]*\).*/\1/' < $(srcdir)/version.cc`
+#version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < $(srcdir)/version.c`
+#mainversion=`sed -e 's/.*\"\([0-9]*\.[0-9]*\).*/\1/' < $(srcdir)/version.c`
 
 # Directory where sources are, from where we are.
 VPATH = $(srcdir)/ada
@@ -222,7 +222,7 @@ endif
 all.indirect: Makefile ../gnat1$(exeext)
 
 # IN_GCC is meant to distinguish between code compiled into GCC itself, i.e.
-# for the host, and the rest.  But we also use it for the tools (link.cc) and
+# for the host, and the rest.  But we also use it for the tools (link.c) and
 # even break the host/target wall by using it for the library (targext.c).
 # autoconf inserts -DCROSS_DIRECTORY_STRUCTURE if we are building a cross
 # compiler which does not use the native libraries and headers.
@@ -240,7 +240,7 @@ ALL_COMPILERFLAGS = $(ALL_CFLAGS)
 # This is where we get libiberty.a from.
 LIBIBERTY = ../../libiberty/libiberty.a
 
-# We need to link against libbacktrace because diagnostic.cc in
+# We need to link against libbacktrace because diagnostic.c in
 # libcommon.a uses it.
 LIBBACKTRACE = ../../libbacktrace/.libs/libbacktrace.a
 
@@ -296,10 +296,6 @@ ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)/ada
        $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ADA_CFLAGS) $(ALL_CPPFLAGS) \
          $(INCLUDES) $< $(OUTPUT_OPTION)
 
-.cc.o:
-       $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ADA_CFLAGS) $(ALL_CPPFLAGS) \
-         $(INCLUDES) $< $(OUTPUT_OPTION)
-
 .adb.o:
        $(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(OUTPUT_OPTION)
 
@@ -307,7 +303,7 @@ ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)/ada
        $(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(OUTPUT_OPTION)
 
 # how to regenerate this file
-Makefile: ../config.status $(srcdir)/ada/gcc-interface/Makefile.in $(srcdir)/ada/Makefile.in $(srcdir)/ada/version.cc
+Makefile: ../config.status $(srcdir)/ada/gcc-interface/Makefile.in $(srcdir)/ada/Makefile.in $(srcdir)/ada/version.c
        cd ..; \
        LANGUAGES="$(CONFIG_LANGUAGES)" \
        CONFIG_HEADERS= \
@@ -415,7 +411,6 @@ ifeq ($(TOOLSCASE),native)
   vpath %.ads ../$(RTSDIR) ../
   vpath %.adb ../$(RTSDIR) ../
   vpath %.c   ../$(RTSDIR) ../
-  vpath %.cc  ../$(RTSDIR) ../
   vpath %.h   ../$(RTSDIR) ../
 endif
 
@@ -425,7 +420,6 @@ ifeq ($(TOOLSCASE),cross)
   vpath %.ads ../
   vpath %.adb ../
   vpath %.c   ../
-  vpath %.cc  ../
   vpath %.h   ../
 endif
 
@@ -909,44 +903,44 @@ ADA_RTL_DSO_DIR = $(toolexeclibdir)
 # need to keep the frame pointer in tracebak.o to pop the stack properly on
 # some targets.
 
-tracebak.o  : tracebak.cc
+tracebak.o  : tracebak.c
        $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ADA_CFLAGS) $(ALL_CPPFLAGS) \
              $(INCLUDES) $(NO_OMIT_ADAFLAGS) $< $(OUTPUT_OPTION)
 
-adadecode.o : adadecode.cc adadecode.h
-aux-io.o  : aux-io.cc
-argv.o    : argv.cc
+adadecode.o : adadecode.c adadecode.h
+aux-io.o  : aux-io.c
+argv.o    : argv.c
 cal.o     : cal.c
 deftarg.o : deftarg.c
 errno.o   : errno.c
-exit.o    : adaint.h exit.cc
-expect.o  : expect.cc
-final.o   : final.cc
-rtfinal.o : rtfinal.cc
-rtinit.o  : rtinit.cc
-locales.o : locales.cc
-mkdir.o   : mkdir.cc
-socket.o  : socket.cc gsocket.h
+exit.o    : adaint.h exit.c
+expect.o  : expect.c
+final.o   : final.c
+rtfinal.o : rtfinal.c
+rtinit.o  : rtinit.c
+locales.o : locales.c
+mkdir.o   : mkdir.c
+socket.o  : socket.c gsocket.h
 sysdep.o  : sysdep.c
-raise.o   : raise.cc raise.h
-sigtramp-armdroid.o      : sigtramp-armdroid.cc sigtramp.h
+raise.o   : raise.c raise.h
+sigtramp-armdroid.o      : sigtramp-armdroid.c sigtramp.h
 sigtramp-armvxworks.o    : sigtramp-armvxworks.c sigtramp.h
-sigtramp-ios.o           : sigtramp-ios.cc sigtramp.h
-sigtramp-vxworks.o       : sigtramp-vxworks.cc $(VX_SIGTRAMP_EXTRA_SRCS)
+sigtramp-ios.o           : sigtramp-ios.c sigtramp.h
+sigtramp-vxworks.o       : sigtramp-vxworks.c $(VX_SIGTRAMP_EXTRA_SRCS)
 sigtramp-vxworks-vxsim.o : sigtramp-vxworks-vxsim.c $(VX_SIGTRAMP_EXTRA_SRCS)
 terminals.o : terminals.c
-vx_stack_info.o : vx_stack_info.cc
+vx_stack_info.o : vx_stack_info.c
 
 raise-gcc.o : raise-gcc.c raise.h
        $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ADA_CFLAGS) \
                -iquote $(srcdir) -iquote $(ftop_srcdir)/libgcc \
                $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
 
-cio.o     : cio.cc
+cio.o     : cio.c
        $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ADA_CFLAGS) \
                 $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
 
-init.o    : init.cc adaint.h raise.h
+init.o    : init.c adaint.h raise.h
        $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ADA_CFLAGS) \
                 $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
 
@@ -954,11 +948,11 @@ init-vxsim.o : init-vxsim.c
        $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ADA_CFLAGS) \
                 $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
 
-initialize.o : initialize.cc raise.h
+initialize.o : initialize.c raise.h
        $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ADA_CFLAGS) \
                 $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
 
-link.o : link.cc
+link.o : link.c
        $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ADA_CFLAGS) \
                $(ALL_CPPFLAGS) $(INCLUDES_FOR_SUBDIR) \
                $< $(OUTPUT_OPTION)
similarity index 100%
rename from gcc/ada/init.cc
rename to gcc/ada/init.c
similarity index 100%
rename from gcc/ada/initialize.cc
rename to gcc/ada/initialize.c
similarity index 100%
rename from gcc/ada/link.cc
rename to gcc/ada/link.c
similarity index 100%
rename from gcc/ada/locales.cc
rename to gcc/ada/locales.c
similarity index 100%
rename from gcc/ada/mkdir.cc
rename to gcc/ada/mkdir.c
similarity index 100%
rename from gcc/ada/raise.cc
rename to gcc/ada/raise.c
similarity index 100%
rename from gcc/ada/rtfinal.cc
rename to gcc/ada/rtfinal.c
similarity index 100%
rename from gcc/ada/rtinit.cc
rename to gcc/ada/rtinit.c
index ea7d256ed43c24b1151e387ccbb10b14a0719253..af6919092d58d5cce89130c4da62da3844b1d252 100644 (file)
@@ -1976,7 +1976,7 @@ CND(CLOCK_THREAD_CPUTIME_ID, "Thread CPU clock")
  || defined(__DragonFly__) || defined(__QNX__)
 /** On these platforms use system provided monotonic clock instead of
  ** the default CLOCK_REALTIME. We then need to set up cond var attributes
- ** appropriately (see thread.cc).
+ ** appropriately (see thread.c).
  **
  ** Note that AIX 5.2 does not support CLOCK_MONOTONIC timestamps for
  ** pthread_cond_timedwait (and does not have pthread_condattr_setclock),
similarity index 100%
rename from gcc/ada/seh_init.cc
rename to gcc/ada/seh_init.c
similarity index 100%
rename from gcc/ada/socket.cc
rename to gcc/ada/socket.c
similarity index 100%
rename from gcc/ada/tracebak.cc
rename to gcc/ada/tracebak.c
similarity index 100%
rename from gcc/ada/version.cc
rename to gcc/ada/version.c