x64-upstream: Use -f option as needed