[Bug ld/22696] Wrong order of SHLIB_RODATA_ADDR in elf.sc?

[cvs-commit at gcc dot gnu.org]

https://sourceware.org/bugzilla/show_bug.cgi?id=22696

--- Comment #2 from cvs-commit at gcc dot gnu.org <cvs-commit at gcc dot 
gnu.org> ---
The master branch has been updated by H.J. Lu <address@hidden>:

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=6bd0a312a4cb6803b9d6aa2f5646b610d213a1fe

commit 6bd0a312a4cb6803b9d6aa2f5646b610d213a1fe
Author: H.J. Lu <address@hidden>
Date:   Thu Jan 11 05:05:25 2018 -0800

    Fix the order of SHLIB_RODATA_ADDR in elf.sc

    elf.sc has

      if test -n "${RODATA_ADDR}"; then
        RODATA_ADDR="\
    SEGMENT_START(\"rodata-segment\", ${RODATA_ADDR}) + SIZEOF_HEADERS"
      else
        RODATA_ADDR="ALIGN(${SEGMENT_SIZE}) + (. & (${MAXPAGESIZE} - 1))"
        ^^^^^^^^^^ Set RODATA_ADDR
        RODATA_ADDR="SEGMENT_START(\"rodata-segment\", ${RODATA_ADDR})"
        ^^^^^^^^^^ Set RODATA_ADDR with ${RODATA_ADDR}
      fi
      if test -n "${SHLIB_RODATA_ADDR}"; then
        SHLIB_RODATA_ADDR="\
    SEGMENT_START(\"rodata-segment\", ${SHLIB_RODATA_ADDR}) + SIZEOF_HEADERS"
      else
        SHLIB_RODATA_ADDR="SEGMENT_START(\"rodata-segment\",
${SHLIB_RODATA_ADDR})"
        ^^^^^^^^^^ Set SHLIB_RODATA_ADDR
        SHLIB_RODATA_ADDR="ALIGN(${SEGMENT_SIZE}) + (. & (${MAXPAGESIZE} - 1))"
        ^^^^^^^^^^ Override SHLIB_RODATA_ADDR
      fi

    The order should be:

      if test -n "${SHLIB_RODATA_ADDR}"; then
        SHLIB_RODATA_ADDR="\
    SEGMENT_START(\"rodata-segment\", ${SHLIB_RODATA_ADDR}) + SIZEOF_HEADERS"
      else
        SHLIB_RODATA_ADDR="ALIGN(${SEGMENT_SIZE}) + (. & (${MAXPAGESIZE} - 1))"
        SHLIB_RODATA_ADDR="SEGMENT_START(\"rodata-segment\",
${SHLIB_RODATA_ADDR})"
      fi

        PR ld/22696
        * scripttempl/elf.sc: Fix the order of SHLIB_RODATA_ADDR.

-- 
You are receiving this mail because:
You are on the CC list for the bug.