Page MenuHomeFreeBSD
Differential D40943

arm64 lib32: change clang to allow -m32 on arm64
ClosedPublic
Actions

Authored by • karels on Jul 8 2023, 10:18 PM.
Tags
None
Referenced Files
F112211375: D40943.diff
Fri, Mar 14, 9:51 AM
F112200335: D40943.id124511.diff
Fri, Mar 14, 5:51 AM
Unknown Object (File)
Mon, Feb 24, 1:42 AM
Unknown Object (File)
Jan 18 2025, 4:26 AM
Unknown Object (File)
Jan 17 2025, 2:24 PM
Unknown Object (File)
Jan 16 2025, 8:06 AM
Unknown Object (File)
Jan 15 2025, 3:03 PM
Unknown Object (File)
Dec 5 2024, 11:59 PM
View All 93 Files
Subscribers
None

Details

Reviewers
jhb
brooks
jrtc27
imp
dim
Commits
rGa2e0c77f941d: arm64 lib32: change clang to allow -m32 on arm64
rGf1d5183124d3: arm64 lib32: change clang to allow -m32 on arm64
Summary

The FreeBSD driver support for clang tested explicitly for 32-bit
Intel, MIPS, or PowerPC targets where /usr/lib32/libcrt1.o was
present to decide whether -m32 should use /usr/lib32. At jrtc27's
suggestion, simply test for a 32-bit platform rather than adding
arm to the list. This is one step in adding support for -m32 on
arm64.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

• karels requested review of this revision.Jul 8 2023, 10:18 PM
• karels created this revision.
Harbormaster completed remote builds in B52515: Diff 124365.Jul 8 2023, 10:18 PM
• karels added a child revision: D40944: arm64 lib32: prepare arm64 headers to redirect to arm.Jul 8 2023, 10:19 PM
• karels added a reviewer: dim.Jul 8 2023, 10:25 PM
• karels added a comment.Jul 9 2023, 7:23 PM

@dim, we need a way to force the make system to bootstrap a compiler with this change, or the lib32 build breaks. Can we change the version string, etc?

jrtc27 added a comment.Jul 9 2023, 8:55 PM

Bump lib/clang/freebsd_cc_version.h

dim accepted this revision.Jul 9 2023, 10:03 PM

Indeed, bumping lib/clang/freebsd_cc_version.h is the way to force a bootstrap clang rebuild. The change to clang/lib/Driver/ToolChains/FreeBSD.cpp should also be upstreamed.

This revision is now accepted and ready to land.Jul 9 2023, 10:03 PM
• karels added a comment.Jul 9 2023, 11:32 PM
In D40943#932160, @dim wrote:

Indeed, bumping lib/clang/freebsd_cc_version.h is the way to force a bootstrap clang rebuild. The change to clang/lib/Driver/ToolChains/FreeBSD.cpp should also be upstreamed.

Thanks, I didn't realize that there is a FreeBSD-specific version; that helps.

How do we go about upstreaming?

jrtc27 added a comment.Jul 10 2023, 12:47 AM
In D40943#932172, @karels wrote:
In D40943#932160, @dim wrote:

Indeed, bumping lib/clang/freebsd_cc_version.h is the way to force a bootstrap clang rebuild. The change to clang/lib/Driver/ToolChains/FreeBSD.cpp should also be upstreamed.

Thanks, I didn't realize that there is a FreeBSD-specific version; that helps.

How do we go about upstreaming?

It's trivial enough I just committed it directly: https://github.com/llvm/llvm-project/commit/3450272fc281979388bb845a9fffb59b42cc2e7e

• karels updated this revision to Diff 124511.Jul 11 2023, 7:51 PM

Bump freebsd version number.

This revision now requires review to proceed.Jul 11 2023, 7:51 PM
Harbormaster completed remote builds in B52568: Diff 124511.Jul 11 2023, 7:51 PM
jrtc27 accepted this revision.Jul 11 2023, 7:53 PM
This revision is now accepted and ready to land.Jul 11 2023, 7:53 PM
brooks mentioned this in R11:b38875aa6cf5: devel/llvm-devel: new snapshot.Jul 11 2023, 11:13 PM
brooks mentioned this in R11:3509504bd820: devel/llvm16: change clang to allow -m32 on arm64.
brooks mentioned this in R11:c4e3653e713b: devel/llvm15: change clang to allow -m32 on arm64.Jul 12 2023, 7:01 PM
brooks mentioned this in R11:391873c7b9a0: devel/llvm13: arm and aarch64 improvements.
brooks mentioned this in R11:3dcb15dfa456: devel/llvm14: arm and aarch64 improvements.
brooks accepted this revision.Jul 12 2023, 7:03 PM

I've merged this back through llvm13. I'll let the changes settle for a day and then merge to quarterly so CI can use them.

brooks mentioned this in R11:152091d38ced: devel/llvm-devel: new snapshot.Jul 20 2023, 7:56 PM
brooks mentioned this in R11:e160923e2435: devel/llvm16: change clang to allow -m32 on arm64.
brooks mentioned this in R11:ad2ac7868943: devel/llvm15: change clang to allow -m32 on arm64.
brooks mentioned this in R11:e086c6a53f34: devel/llvm13: arm and aarch64 improvements.
brooks mentioned this in R11:3d5ad388afdb: devel/llvm14: arm and aarch64 improvements.
jrtc27 added a comment.Jul 25 2023, 10:32 PM

Please add a pointer to the upstream commit when committing this so it's clear this isn't a downstream diff

• karels added a comment.Jul 25 2023, 11:40 PM
In D40943#937935, @jrtc27 wrote:

Please add a pointer to the upstream commit when committing this so it's clear this isn't a downstream diff

Already done in my copy.

Closed by commit rGf1d5183124d3: arm64 lib32: change clang to allow -m32 on arm64 (authored by • karels). · Explain WhyJul 26 2023, 12:01 AM
This revision was automatically updated to reflect the committed changes.
• karels added a commit: rGf1d5183124d3: arm64 lib32: change clang to allow -m32 on arm64.
dim added a commit: rGa2e0c77f941d: arm64 lib32: change clang to allow -m32 on arm64.Jan 7 2024, 11:10 PM

Revision Contents
Changeset List

PathSize
contrib/
llvm-project/
clang/
lib/
Driver/
ToolChains/
3 lines
lib/
clang/
2 lines

Diff 125162

View Options

contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.cpp

Loading...
View Options

lib/clang/freebsd_cc_version.h

Loading...