am 1adc7c03: Merge "linker: Fix the computation of si->base"

* commit '1adc7c03898ee1f6a4c7f8cffa3c07507b9da5a9':
  linker: Fix the computation of si->base