diff options
| author | Alan Modra <amodra@gmail.com> | 2019-04-10 11:35:48 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2019-04-10 13:30:32 +0930 |
| commit | c55b17b8098abde4ae7dfe0ec1f3b22a7fb0a34d (patch) | |
| tree | 5e31dbb3f0480cf49ae3084f3d3ff4dbd6357afd /ld/Makefile.in | |
| parent | 6feda62721cd6e288f79b0ee5f1489fee8e570ab (diff) | |
| download | binutils-c55b17b8098abde4ae7dfe0ec1f3b22a7fb0a34d.zip binutils-c55b17b8098abde4ae7dfe0ec1f3b22a7fb0a34d.tar.gz binutils-c55b17b8098abde4ae7dfe0ec1f3b22a7fb0a34d.tar.bz2 | |
Fix some ld dependencies
In looking at the csky-elf vs. csky-linux differences, the first thing
I compared was csky_elf.sh and cskyelf_linux.sh. Those files are
mostly the same but besides the real differences, annoyingly have some
lines ordered differently. It's better in such cases to have one file
source the other, making differences plain. This patch does that for
csky and microblaze, removes an unused variable defined in a few
places, and fixes ld makefile dependencies.
* Makefile.am (eskyelf.c, eskyelf_linux.c): Depend on cskyelf.em.
(ecskyelf_linux.c): Depend on cskyelf.sh.
(eelf32microblazeel.c): Depend on elf32microblaze.sh.
* Makefile.in: Regenerate.
* emulparams/cskyelf.sh: Comment regarding cskelf_linux.sh.
(PAGE_SIZE): Don't define.
* emulparams/cskyelf_linux.sh: Source sckyelf.sh, leaving just
the differing variable defs/undefs.
* emulparams/elf32mcore.sh (PAGE_SIZE): Don't define.
* emulparams/elf32microblaze.sh: Comment re. elf32microblazeel.sh.
(OUTPUT_FORMAT): Use BIG_OUTPUT_FORMAT.
(PAGE_SIZE): Don't define.
* emulparams/elf32microblazeel.sh: Source elf32microblaze.sh,
leaving just the differing OUTPUT_FORMAT.
Diffstat (limited to 'ld/Makefile.in')
| -rw-r--r-- | ld/Makefile.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ld/Makefile.in b/ld/Makefile.in index edaf530..3aede6e 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -2482,9 +2482,11 @@ ecrislinux.c: $(srcdir)/emulparams/crislinux.sh \ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ecskyelf.c: $(srcdir)/emulparams/cskyelf.sh \ + $(srcdir)/emultempl/cskyelf.em \ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ecskyelf_linux.c: $(srcdir)/emulparams/cskyelf_linux.sh \ + $(srcdir)/emulparams/cskyelf.sh $(srcdir)/emultempl/cskyelf.em \ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ed10velf.c: $(srcdir)/emulparams/d10velf.sh \ @@ -2781,6 +2783,7 @@ eelf32metag.c: $(srcdir)/emulparams/elf32metag.sh \ $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf32microblazeel.c: $(srcdir)/emulparams/elf32microblazeel.sh \ + $(srcdir)/emulparams/elf32microblaze.sh \ $(ELF_DEPS) $(srcdir)/scripttempl/elfmicroblaze.sc ${GEN_DEPENDS} eelf32microblaze.c: $(srcdir)/emulparams/elf32microblaze.sh \ |