Partially revert cdd703f's revert of c163410, as linking with clang with --param=ssp-buffer-size=4 still fails with: "argument unused during compilation".