Skip to content

R
riscv-gcc-1
Commit 2c7f9cc0 by Andreas Schwab
Options

Remove conflict marker 

From-SVN: r177507
parent e2852612
Showing with 1 additions and 2 deletions
gcc/ada/ChangeLog
...@@ -246,7 +246,6 @@ ...@@ -246,7 +246,6 @@
necessary. necessary.
* put_scos.adb: Code simplification based on above change. * put_scos.adb: Code simplification based on above change.
>>>>>>> .r177446
2011-08-05 Robert Dewar <dewar@adacore.com> 2011-08-05 Robert Dewar <dewar@adacore.com>
* sem_ch3.adb, gnatcmd.adb, switch-c.adb, exp_attr.adb, make.adb, * sem_ch3.adb, gnatcmd.adb, switch-c.adb, exp_attr.adb, make.adb,
...@@ -2197,7 +2196,7 @@ ...@@ -2197,7 +2196,7 @@
Gen_Adafinal_Ada. Gen_Adafinal_Ada.
(Gen_Output_File_C): Generate __attribute__((destructor)) for Ada_Final (Gen_Output_File_C): Generate __attribute__((destructor)) for Ada_Final
if -a is specified. Call Gen_Elab_Externals_C. Remove useless couple if -a is specified. Call Gen_Elab_Externals_C. Remove useless couple
of external declarations. Call Gen_Finalize_Library_C. of external declarations. Call Gen_Finalize_Library_C.
2011-08-04 Emmanuel Briot <briot@adacore.com> 2011-08-04 Emmanuel Briot <briot@adacore.com>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment