Skip to content
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

Merged
merged 1 commit into from
Jan 20, 2018
Merged

Apply a forgotten patch to LLVM >3.9 #25537

merged 1 commit into from
Jan 20, 2018

Conversation

maleadt
Copy link
Member

@maleadt maleadt commented Jan 13, 2018

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

@maleadt maleadt added building Build system, or building Julia or its dependencies gpu Affects running Julia on a GPU labels Jan 13, 2018
@maleadt maleadt requested a review from Keno January 13, 2018 08:34
@maleadt maleadt changed the title Apply a forgotten LLVM patch to >3.9 Apply a forgotten patch to LLVM >3.9 Jan 13, 2018
@iblislin
Copy link
Member

good to backport the LLVM 4 part?

@@ -0,0 +1,2 @@
# treat patches as files that should not be modified
*.patch -text
Copy link
Member

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)?

Copy link
Member Author

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)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think @maleadt is right here. I have another attempt at this in #27291 that might achieve the intended thing, though.

@maleadt
Copy link
Member Author

maleadt commented Jan 15, 2018

I don't think there's going to be another 0.6 release.

@maleadt
Copy link
Member Author

maleadt commented Jan 20, 2018

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.
As per @iblis17 request above, I'll add the backport label even though there probably won't be a new 0.6 release anymore.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
building Build system, or building Julia or its dependencies gpu Affects running Julia on a GPU
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants