hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-22 03:04:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

arm64 lib32: change clang to allow -m32 on arm64

Browse Source 
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.  Upstreamed as
3450272fc2
Bump the freebsd version to force a bootstrap build.  This is one
step in adding support for -m32 on arm64.

Reviewed by:	jrtc27, brooks, dim
Differential Revision:	https://reviews.freebsd.org/D40943
This commit is contained in:
Mike Karels 2023-07-25 18:58:51 -05:00
parent 81250b9cc7
commit f1d5183124
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -377,8 +377,7 @@ FreeBSD::FreeBSD(const Driver &D, const llvm::Triple &Triple,
// When targeting 32-bit platforms, look for '/usr/lib32/crt1.o' and fall // When targeting 32-bit platforms, look for '/usr/lib32/crt1.o' and fall
// back to '/usr/lib' if it doesn't exist. // back to '/usr/lib' if it doesn't exist.
if ((Triple.getArch() == llvm::Triple::x86 || Triple.isMIPS32() || if (Triple.isArch32Bit() &&
Triple.isPPC32()) &&
D.getVFS().exists(concat(getDriver().SysRoot, "/usr/lib32/crt1.o"))) D.getVFS().exists(concat(getDriver().SysRoot, "/usr/lib32/crt1.o")))
getFilePaths().push_back(concat(getDriver().SysRoot, "/usr/lib32")); getFilePaths().push_back(concat(getDriver().SysRoot, "/usr/lib32"));
else else

2
lib/clang/freebsd_cc_version.h
View File

@ -1 +1 @@
#define FREEBSD_CC_VERSION 1400005 #define FREEBSD_CC_VERSION 1400006