Skip to content

R
riscv-gcc-1
Commit 7d612b1e by Martin v. Löwis
Options

Remove conflict marker 

From-SVN: r32096
parent 2a1ed9c1
Showing with 0 additions and 1 deletions
gcc/ChangeLog
......@@ -145,7 +145,6 @@ Fri Feb 18 20:08:57 2000 Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
* config/alpha/alpha.h (INITIAL_ELIMINATION_OFFSET): Add abort
in unhandled case.
>>>>>>> 1.5739
2000-02-18 Nick Clifton <nickc@cygnus.com>
* config/arm/elf.h (ASM_OUTPUT_ALIGN): Do not generate
......
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