Merge pull request #235 from linux-on-ibm-z/fix_compiler_error_swift31

Fix compile error on s390x in shims/lock.h