This is an archive of the discontinued LLVM Phabricator instance.

Differential D42972

Look for 32-bit libraries in /usr/lib32 for MIPS O32 on FreeBSD.
ClosedPublic

Authored by bsdjhb on Feb 6 2018, 8:48 AM.

Details

Reviewers
dim
Commits
rGf7854b669a3c: Look for 32-bit libraries in /usr/lib32 for MIPS O32 on FreeBSD.
rL324948: Look for 32-bit libraries in /usr/lib32 for MIPS O32 on FreeBSD.
rC324948: Look for 32-bit libraries in /usr/lib32 for MIPS O32 on FreeBSD.
Summary

FreeBSD N64 MIPS systems can include 32-bit libraries for O32 in
/usr/lib32 similar to the 32-bit compatibility libraries provided
for FreeBSD/amd64 and FreeBSD/powerpc64.

Diff Detail

Event Timeline

bsdjhb created this revision.Feb 6 2018, 8:48 AM
Herald added subscribers: krytarowski, arichardson, sdardis, emaste. · View Herald TranscriptFeb 6 2018, 8:48 AM
Harbormaster completed remote builds in B14664: Diff 133020.Feb 6 2018, 8:48 AM
dim accepted this revision.Feb 6 2018, 8:57 AM

LGTM, though a test case would be nice (could be added to tools/clang/test/Driver/freebsd.c)

This revision is now accepted and ready to land.Feb 6 2018, 8:57 AM
bsdjhb updated this revision to Diff 133330.Feb 7 2018, 4:15 PM
  • Add a test case.
Harbormaster completed remote builds in B14744: Diff 133330.Feb 7 2018, 4:16 PM
Closed by commit rC324948: Look for 32-bit libraries in /usr/lib32 for MIPS O32 on FreeBSD. (authored by jhb). · Explain WhyFeb 12 2018, 2:26 PM
Closed by commit rL324948: Look for 32-bit libraries in /usr/lib32 for MIPS O32 on FreeBSD. (authored by jhb). · Explain Why
This revision was automatically updated to reflect the committed changes.
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: llvm-commits. · View Herald TranscriptFeb 12 2018, 2:26 PM

Revision Contents

PathSize
lib/
Driver/
ToolChains/
2 lines
test/
Driver/
6 lines

Diff 133330

lib/Driver/ToolChains/FreeBSD.cpp

Show First 20 Lines • Show All 311 Lines • ▼ Show 20 Lines
FreeBSD::FreeBSD(const Driver &D, const llvm::Triple &Triple, FreeBSD::FreeBSD(const Driver &D, const llvm::Triple &Triple,
const ArgList &Args) const ArgList &Args)
: Generic_ELF(D, Triple, Args) { : Generic_ELF(D, Triple, Args) {
// 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 || if ((Triple.getArch() == llvm::Triple::x86 ||
Triple.getArch() == llvm::Triple::mips ||
Triple.getArch() == llvm::Triple::mipsel ||
Triple.getArch() == llvm::Triple::ppc) && Triple.getArch() == llvm::Triple::ppc) &&
D.getVFS().exists(getDriver().SysRoot + "/usr/lib32/crt1.o")) D.getVFS().exists(getDriver().SysRoot + "/usr/lib32/crt1.o"))
getFilePaths().push_back(getDriver().SysRoot + "/usr/lib32"); getFilePaths().push_back(getDriver().SysRoot + "/usr/lib32");
else else
getFilePaths().push_back(getDriver().SysRoot + "/usr/lib"); getFilePaths().push_back(getDriver().SysRoot + "/usr/lib");
} }
ToolChain::CXXStdlibType FreeBSD::GetDefaultCXXStdlibType() const { ToolChain::CXXStdlibType FreeBSD::GetDefaultCXXStdlibType() const {
▲ Show 20 Lines • Show All 72 Lines • Show Last 20 Lines

test/Driver/freebsd.c

Show All 30 Lines
// CHECK-LIB32: "-cc1" "-triple" "i386-pc-freebsd8" // CHECK-LIB32: "-cc1" "-triple" "i386-pc-freebsd8"
// CHECK-LIB32: ld{{.*}}" {{.*}} "-m" "elf_i386_fbsd" // CHECK-LIB32: ld{{.*}}" {{.*}} "-m" "elf_i386_fbsd"
// //
// RUN: %clang -target x86_64-pc-freebsd8 -m32 %s 2>&1 \ // RUN: %clang -target x86_64-pc-freebsd8 -m32 %s 2>&1 \
// RUN: --sysroot=%S/Inputs/multiarch_freebsd64_tree -print-search-dirs 2>&1 \ // RUN: --sysroot=%S/Inputs/multiarch_freebsd64_tree -print-search-dirs 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-LIB32PATHS %s // RUN: | FileCheck --check-prefix=CHECK-LIB32PATHS %s
// CHECK-LIB32PATHS: libraries: ={{.*:?}}/usr/lib32 // CHECK-LIB32PATHS: libraries: ={{.*:?}}/usr/lib32
// //
// Check that O32 MIPS uses /usr/lib32 on a 64-bit tree.
//
// RUN: %clang -target mips-freebsd12 %s \
// RUN: --sysroot=%S/Inputs/multiarch_freebsd64_tree -print-search-dirs 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-LIB32PATHS %s
//
// Check that the new linker flags are passed to FreeBSD // Check that the new linker flags are passed to FreeBSD
// RUN: %clang -no-canonical-prefixes -target x86_64-pc-freebsd8 -m32 %s \ // RUN: %clang -no-canonical-prefixes -target x86_64-pc-freebsd8 -m32 %s \
// RUN: --sysroot=%S/Inputs/multiarch_freebsd64_tree -### 2>&1 \ // RUN: --sysroot=%S/Inputs/multiarch_freebsd64_tree -### 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-LDFLAGS8 %s // RUN: | FileCheck --check-prefix=CHECK-LDFLAGS8 %s
// RUN: %clang -no-canonical-prefixes -target x86_64-pc-freebsd9 -m32 %s \ // RUN: %clang -no-canonical-prefixes -target x86_64-pc-freebsd9 -m32 %s \
// RUN: --sysroot=%S/Inputs/multiarch_freebsd64_tree -### 2>&1 \ // RUN: --sysroot=%S/Inputs/multiarch_freebsd64_tree -### 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-LDFLAGS9 %s // RUN: | FileCheck --check-prefix=CHECK-LDFLAGS9 %s
// RUN: %clang -no-canonical-prefixes -target x86_64-pc-freebsd10.0 -m32 %s \ // RUN: %clang -no-canonical-prefixes -target x86_64-pc-freebsd10.0 -m32 %s \
▲ Show 20 Lines • Show All 98 Lines • Show Last 20 Lines