trapasm tweaks for clang compatibility
trapasm tweaks for clang compatibility

bowlofstew/sv6,aclements/sv6,bowlofstew/sv6,bowlofstew/sv6,aclements/sv6,aclements/sv6,bowlofstew/sv6,bowlofstew/sv6,aclements/sv6,aclements/sv6