am 9dfaa63a: Merge "Allow linker to compile with -DLINKER_DEBUG=1"

* commit '9dfaa63a1c0d1b8e75dd9d7077a8103a19821fa9':
  Allow linker to compile with -DLINKER_DEBUG=1