am 5d7181a7: am 68fc85ff: am 177a7706: linker: fix x86 build

* commit '5d7181a71c0b066fe6c19b9c5906bd694a399a59':
  linker: fix x86 build