am f21aa3b6: Merge "Use more types than just \'unsigned\' in the linker."

* commit 'f21aa3b61ebc6b1a7c34265699f40bd9b5af7952':
  Use more types than just 'unsigned' in the linker.