am 95fd067c: Merge "Fix linkage when building with clang, Intel CC or gcc -O0"

* commit '95fd067cc8dc8cd10bd14dba5bc2000600c75449':
  Fix linkage when building with clang, Intel CC or gcc -O0