Upstream lithium-gap-resolver-s390.cc