Fix (hopefully) some errors when building on OS X.

Signed-off-by: Evan Nemerson <evan@coeus-group.com>
sharc: update to e6ec177f

Signed-off-by: Evan Nemerson <evan@coeus-group.com>