diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2017-11-09 14:36:51 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2017-11-09 14:38:37 -0800 |
| commit | fb24d531e9ef7ad7831ca62298d21684717cbe38 (patch) | |
| tree | 16a34b54b6548666f720fcb712b44ff828e073dc /ld | |
| parent | 31432a672fd40058a714eb2791ea1c3168ccc4f1 (diff) | |
| download | fsf-binutils-gdb-fb24d531e9ef7ad7831ca62298d21684717cbe38.zip fsf-binutils-gdb-fb24d531e9ef7ad7831ca62298d21684717cbe38.tar.gz fsf-binutils-gdb-fb24d531e9ef7ad7831ca62298d21684717cbe38.tar.bz2 | |
ld: Reformat emultempl/elf32.em
Reformat emultempl/elf32.em to generate consistent codes.
* emultempl/elf32.em (gld${EMULATION_NAME}_get_script): Reformat
to generate consistent codes.
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 5 | ||||
| -rw-r--r-- | ld/emultempl/elf32.em | 11 |
2 files changed, 12 insertions, 4 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 9248841..2b6a334 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2017-11-09 H.J. Lu <hongjiu.lu@intel.com> + + * emultempl/elf32.em (gld${EMULATION_NAME}_get_script): Reformat + to generate consistent codes. + 2017-11-07 Alan Modra <amodra@gmail.com> * testsuite/ld-aarch64/ifunc-13.d, diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em index ff4d565..edd8944 100644 --- a/ld/emultempl/elf32.em +++ b/ld/emultempl/elf32.em @@ -2379,18 +2379,21 @@ sed $sc ldscripts/${EMULATION_NAME}.xd >> e${EMULATION_NAME}.c fi if test -n "$GENERATE_SHLIB_SCRIPT" ; then if test -n "$GENERATE_COMBRELOC_SCRIPT" ; then -echo ' ; else if (bfd_link_dll (&link_info) && link_info.combreloc' >> e${EMULATION_NAME}.c -echo ' && link_info.relro' >> e${EMULATION_NAME}.c +echo ' ; else if (bfd_link_dll (&link_info)' >> e${EMULATION_NAME}.c +echo ' && link_info.combreloc' >> e${EMULATION_NAME}.c +echo ' && link_info.relro' >> e${EMULATION_NAME}.c echo ' && (link_info.flags & DF_BIND_NOW)) return' >> e${EMULATION_NAME}.c sed $sc ldscripts/${EMULATION_NAME}.xsw >> e${EMULATION_NAME}.c -echo ' ; else if (bfd_link_dll (&link_info) && link_info.combreloc) return' >> e${EMULATION_NAME}.c +echo ' ; else if (bfd_link_dll (&link_info)' >> e${EMULATION_NAME}.c +echo ' && link_info.combreloc) return' >> e${EMULATION_NAME}.c sed $sc ldscripts/${EMULATION_NAME}.xsc >> e${EMULATION_NAME}.c fi echo ' ; else if (bfd_link_dll (&link_info)) return' >> e${EMULATION_NAME}.c sed $sc ldscripts/${EMULATION_NAME}.xs >> e${EMULATION_NAME}.c fi if test -n "$GENERATE_COMBRELOC_SCRIPT" ; then -echo ' ; else if (link_info.combreloc && link_info.relro' >> e${EMULATION_NAME}.c +echo ' ; else if (link_info.combreloc' >> e${EMULATION_NAME}.c +echo ' && link_info.relro' >> e${EMULATION_NAME}.c echo ' && (link_info.flags & DF_BIND_NOW)) return' >> e${EMULATION_NAME}.c sed $sc ldscripts/${EMULATION_NAME}.xw >> e${EMULATION_NAME}.c echo ' ; else if (link_info.combreloc) return' >> e${EMULATION_NAME}.c |