projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Remove spurious conflict indicators.
[deliverable/binutils-gdb.git]
/
ld
/
scripttempl
/
sh.sc
diff --git
a/ld/scripttempl/sh.sc
b/ld/scripttempl/sh.sc
index 036dd216db2f3cb837c39b880d17c22a4c5d04c2..e7f049fb0ec9a06b9d9fe93b58faf149c7bdeb8a 100644
(file)
--- a/
ld/scripttempl/sh.sc
+++ b/
ld/scripttempl/sh.sc
@@
-29,6
+29,11
@@
SECTIONS
.data :
{
*(.data)
+ ${RELOCATING+*(.gcc_exc*)}
+ ${RELOCATING+___EH_FRAME_BEGIN__ = . ;}
+ ${RELOCATING+*(.eh_fram*)}
+ ${RELOCATING+___EH_FRAME_END__ = . ;}
+ ${RELOCATING+LONG(0);}
${RELOCATING+ _edata = . ; }
} ${RELOCATING+ > ram}
.bss :
This page took
0.02343 seconds
and
4
git commands to generate.