Join GitHub today
GitHub is home to over 31 million developers working together to host and review code, manage projects, and build software together.
Sign upExtend preprocessor LLVM version checks to support LLVM 4.x #36742
Conversation
rust-highfive
assigned
aturon
Sep 26, 2016
This comment has been minimized.
This comment has been minimized.
|
r? @aturon (rust_highfive has picked a reviewer for you, use r? to override) |
This comment has been minimized.
This comment has been minimized.
|
cc #36295 |
src/rustllvm/rustllvm.h
Outdated
| @@ -45,7 +45,16 @@ | |||
| #include "llvm-c/ExecutionEngine.h" | |||
| #include "llvm-c/Object.h" | |||
|
|
|||
| #if LLVM_VERSION_MINOR >= 7 | |||
| #define LLVM_VERSION_GT_OR_EQ(major, minor) \ | |||
| LLVM_VERSION_MAJOR > (major) || LLVM_VERSION_MAJOR == (major) && LLVM_VERSION_MINOR >= (minor) | |||
This comment has been minimized.
This comment has been minimized.
alexcrichton
Sep 26, 2016
Member
Could this entire clause also be wrapped in parens? (yay C macros)
same below as well
This comment has been minimized.
This comment has been minimized.
shepmaster
Sep 26, 2016
Author
Member
Done!
Someone should really work on creating a replacement for this C language thing.
src/rustllvm/rustllvm.h
Outdated
| @@ -45,7 +45,16 @@ | |||
| #include "llvm-c/ExecutionEngine.h" | |||
| #include "llvm-c/Object.h" | |||
|
|
|||
| #if LLVM_VERSION_MINOR >= 7 | |||
| #define LLVM_VERSION_GT_OR_EQ(major, minor) \ | |||
This comment has been minimized.
This comment has been minimized.
alexcrichton
Sep 26, 2016
Member
Perhaps this could be LLVM_VERSION_GE?
Similar to ParialOrd::ge naming at least
This comment has been minimized.
This comment has been minimized.
shepmaster
force-pushed the
shepmaster:llvm-4-preamble
branch
from
c7341e5
to
e6e117c
Sep 26, 2016
This comment has been minimized.
This comment has been minimized.
|
@bors: r+ |
This comment has been minimized.
This comment has been minimized.
|
|
jonathandturner
added a commit
to jonathandturner/rust
that referenced
this pull request
Sep 26, 2016
jonathandturner
added a commit
to jonathandturner/rust
that referenced
this pull request
Sep 27, 2016
bors
added a commit
that referenced
this pull request
Sep 27, 2016
bors
added a commit
that referenced
this pull request
Sep 27, 2016
bors
merged commit e6e117c
into
rust-lang:master
Sep 27, 2016
1 check passed
continuous-integration/travis-ci/pr
The Travis CI build passed
Details
sanxiyn
referenced this pull request
Sep 28, 2016
Closed
LLVM_VERSION_MINOR is 0 in LLVM trunk now #36295
shepmaster
deleted the
shepmaster:llvm-4-preamble
branch
Nov 18, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
shepmaster commentedSep 26, 2016
This doesn't actually do anything for LLVM 4.x yet, but sets the stage.