diff options
| author | Cameron Hall <cameronghall@cox.net> | 2018-01-21 13:53:32 -0600 |
|---|---|---|
| committer | Cameron Hall <cameronghall@cox.net> | 2018-01-21 13:53:32 -0600 |
| commit | 11a9371349e1743a18dce28cc60b69dd6a29b665 (patch) | |
| tree | e696d1fda7556af8b5234eae833ea2fd146fc75d /ld_script.sed | |
| parent | 7383117626ebb2b3d993e5ad8855da5752c9cce8 (diff) | |
| parent | 68a402883f780a61f54c2f0c8740429d0b2b3a81 (diff) | |
resolve merge conflicts and make it compile
Diffstat (limited to 'ld_script.sed')
| -rw-r--r-- | ld_script.sed | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/ld_script.sed b/ld_script.sed deleted file mode 100644 index b91542b6f..000000000 --- a/ld_script.sed +++ /dev/null @@ -1,14 +0,0 @@ -/<EWRAM>/ { - r sym_ewram.ld - d -} - -/<BSS>/ { - r sym_bss.ld - d -} - -/<COMMON>/ { - r sym_common.ld - d -} |