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.

Sign up for GitHub

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

Jump to bottom

llvm: fix target triple #30554

Merged
merged 1 commit into from
Jan 3, 2019
Merged

llvm: fix target triple #30554

merged 1 commit into from
Jan 3, 2019

Conversation

vtjnash
Copy link
Member

@vtjnash vtjnash commented Jan 2, 2019

fix #28046

@vtjnash
llvm: fix target triple
5ff177c 
broken by their move to cmake causing a switch away from the standard --host/--build autoconf

fix #28046
@vtjnash vtjnash added bugfix This change fixes an existing bug backport pending 1.0 labels Jan 2, 2019
@ararslan
Copy link
Member

ararslan commented Jan 2, 2019

If this is a sufficiently critical fix, it could go into 1.1.0 instead of 1.1.1.

@vtjnash
Copy link
Member Author

vtjnash commented Jan 2, 2019

No, it’s not a new regression, although it’s certainly good to have it fixed soon

@vtjnash vtjnash merged commit 041c214 into master Jan 3, 2019
@vtjnash vtjnash deleted the jn/28046 branch January 3, 2019 18:12
@KristofferC KristofferC mentioned this pull request Jan 11, 2019
Closed
53 tasks
KristofferC pushed a commit that referenced this pull request Jan 11, 2019
@vtjnash @KristofferC
llvm: fix target triple (#30554)
f487cf3 
broken by their move to cmake causing a switch away from the standard --host/--build autoconf

fix #28046

(cherry picked from commit 041c214)
@StefanKarpinski StefanKarpinski added triage This should be discussed on a triage call backport 1.1 and removed backport 1.0 triage This should be discussed on a triage call labels Jan 31, 2019
@JeffBezanson JeffBezanson removed triage This should be discussed on a triage call triage backport pending 1.0 labels Jan 31, 2019
@KristofferC KristofferC mentioned this pull request Feb 4, 2019
Merged
39 tasks
KristofferC pushed a commit that referenced this pull request Feb 4, 2019
@vtjnash @KristofferC
llvm: fix target triple (#30554)
843adcf 
broken by their move to cmake causing a switch away from the standard --host/--build autoconf

fix #28046
KristofferC pushed a commit that referenced this pull request Feb 4, 2019
@vtjnash @KristofferC
llvm: fix target triple (#30554)
640c24a 
broken by their move to cmake causing a switch away from the standard --host/--build autoconf

fix #28046
KristofferC pushed a commit that referenced this pull request Feb 11, 2019
@vtjnash @KristofferC
llvm: fix target triple (#30554)
6637014 
broken by their move to cmake causing a switch away from the standard --host/--build autoconf

fix #28046
KristofferC pushed a commit that referenced this pull request Feb 11, 2019
@vtjnash @KristofferC
llvm: fix target triple (#30554)
cfc91ed 
broken by their move to cmake causing a switch away from the standard --host/--build autoconf

fix #28046
KristofferC pushed a commit that referenced this pull request Feb 11, 2019
@vtjnash @KristofferC
llvm: fix target triple (#30554)
ccc4dde 
broken by their move to cmake causing a switch away from the standard --host/--build autoconf

fix #28046

(cherry picked from commit 041c214)
@KristofferC KristofferC mentioned this pull request Feb 11, 2019
Merged
39 tasks
KristofferC pushed a commit that referenced this pull request Apr 20, 2019
@vtjnash @KristofferC
llvm: fix target triple (#30554)
af03147 
broken by their move to cmake causing a switch away from the standard --host/--build autoconf

fix #28046
nalimilan
nalimilan reviewed May 22, 2019
View reviewed changes
deps/llvm.mk
@@ -66,7 +66,7 @@ LLVM_CXXFLAGS += $(CXXFLAGS)
LLVM_CPPFLAGS += $(CPPFLAGS)
LLVM_LDFLAGS += $(LDFLAGS)
LLVM_CMAKE += -DLLVM_TARGETS_TO_BUILD:STRING="$(LLVM_TARGETS)" -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="$(LLVM_EXPERIMENTAL_TARGETS)" -DCMAKE_BUILD_TYPE="$(LLVM_CMAKE_BUILDTYPE)"
LLVM_CMAKE += -DLLVM_ENABLE_ZLIB=OFF -DLLVM_ENABLE_LIBXML2=OFF
LLVM_CMAKE += -DLLVM_ENABLE_ZLIB=OFF -DLLVM_ENABLE_LIBXML2=OFF -DLLVM_HOST_TRIPLE="$(or $(XC_HOST),$(BUILD_MACHINE))"
Copy link
Member

@nalimilan nalimilan May 22, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

This creates problems on Fedora armv7hl. Indeed, there BUILD_MACHINE=armv7hl-redhat-linux-gnueabi by default since that's what gcc -dumpmachine returns. Before this PR, LLVM used armv7l-unknown-linux-gnueabihf by default instead (as computed by deps/srccache/llvm-6.0.1/cmake/config.guess).

I don't really understand why Fedora arm uses gnueabi instead of gnueabihf, since it uses hard float (which is specified e.g. in CFLAGS via -mfloat-abi=hard), but it seems to be a conscious choice. I couldn't find official GCC/LLVM docs about what these mean. What I can see at least is that LLVM's config.guess script branches on __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null | grep -q __ARM_PCS_VFP to decide whether to return gnueabi or gnueabihf. I guess we should do the same to make this more reliable? EDIT: or just avoid passing -DLLVM_HOST_TRIPLE when XC_HOST is unset.

@non-Jedi non-Jedi mentioned this pull request Aug 14, 2019
Closed
@KristofferC KristofferC mentioned this pull request Aug 26, 2019
Merged
55 tasks
KristofferC pushed a commit that referenced this pull request Feb 20, 2020
@vtjnash @KristofferC
llvm: fix target triple (#30554)
8028db7 
broken by their move to cmake causing a switch away from the standard --host/--build autoconf

fix #28046
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nalimilan nalimilan nalimilan left review comments

Assignees
No one assigned
Labels
bugfix This change fixes an existing bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

code_native broken on official macOS binaries
6 participants
@vtjnash @ararslan @nalimilan @StefanKarpinski @JeffBezanson @KristofferC