Fix PR20773 which I introduced with a silly edit mistake in r216531.

Trivial fix, and I've made the gentoo tests more representative. With
the changes, they would have caught this failure.

llvm-svn: 216572