From aec4be476c43ed546c2feba5559002b114daf65c Mon Sep 17 00:00:00 2001 From: Pavel Kosov Date: Fri, 15 Mar 2024 10:18:37 +0300 Subject: [PATCH] Revert "[X86] Set --mrelax-relocation to true by default" This reverts commit a736d51ec275ac8ec1321c8d8cae1797db486a0f. Signed-off-by: Pavel Kosov --- clang/lib/Driver/ToolChains/OHOS.h | 2 +- clang/test/Driver/ohos.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clang/lib/Driver/ToolChains/OHOS.h b/clang/lib/Driver/ToolChains/OHOS.h index b1f4c07d25ae..ff7346983285 100644 --- a/clang/lib/Driver/ToolChains/OHOS.h +++ b/clang/lib/Driver/ToolChains/OHOS.h @@ -38,7 +38,7 @@ public: bool isPICDefault() const override { return false; } bool isPIEDefault(const llvm::opt::ArgList &Args) const override { return true; } bool isPICDefaultForced() const override { return false; } - bool useRelaxRelocations() const override { return true; } + bool useRelaxRelocations() const override { return false; } UnwindLibType GetUnwindLibType(const llvm::opt::ArgList &Args) const override; UnwindLibType GetDefaultUnwindLibType() const override { return UNW_CompilerRT; } diff --git a/clang/test/Driver/ohos.c b/clang/test/Driver/ohos.c index e0bd86b6ccca..480519c54112 100644 --- a/clang/test/Driver/ohos.c +++ b/clang/test/Driver/ohos.c @@ -7,7 +7,7 @@ // RUN: --sysroot=%S/Inputs/ohos_native_tree/sysroot -fuse-ld=lld -march=armv7-a -mcpu=cortex-a7 -mfloat-abi=soft 2>&1 \ // RUN: | FileCheck -check-prefixes=CHECK,CHECK-ARM-A7-SOFT %s // CHECK: {{.*}}clang{{.*}}" "-cc1" -// CHECK: "--mrelax-relocations" +// CHECK-NOT: "--mrelax-relocations" // CHECK-NOT: "-munwind-tables" // CHECK: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]" // CHECK: "-isysroot" "[[SYSROOT:[^"]+]]" -- Gitee