-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Apply a forgotten patch to LLVM >3.9 #25537
Conversation
good to backport the LLVM 4 part? |
@@ -0,0 +1,2 @@ | |||
# treat patches as files that should not be modified | |||
*.patch -text |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can we just do * -text
to prevent git from ever munging files? (similar to what we suggest at https://github.com/JuliaLang/julia/blob/master/README.windows.md#line-endings)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
isn't that different? we suggest eol=lf
and autocrlf=input
, while -text
implies no autocrlf
at all (potentially introducing crlf line endings)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think there's going to be another 0.6 release. |
I'll just do the conservative thing and merge this as is, with the git attribute only set for patches. We can widen its scope later if we want. |
More specifically, #23611 for making the NVPTX back-end ignore Julia's address spaces.
Tested with LLVM 4.0.1 and 5.0.0
This also adds a
.gitattributes
file to fully preserve patch contents, because apparently the target file contains CRLF line endings that otherwise get stripped from the patch by git.cc @iblis17