am d795dcc5: am 12fa5191: Merge "Remove _(GNU|XOPEN)_SORUCE makefile cruft."

* commit 'd795dcc5ead7328c1b3fcb14e279c4bec6a38b50':
  Remove _(GNU|XOPEN)_SORUCE makefile cruft.