Skip to content

Conversation

@hiraditya
Copy link
Collaborator

No description provided.

@llvmbot llvmbot added clang Clang issues not falling into any other category backend:ARM clang:driver 'clang' and 'clang++' user-facing binaries. Not 'clang-cl' labels Jan 22, 2025
@llvmbot
Copy link
Member

llvmbot commented Jan 22, 2025

@llvm/pr-subscribers-clang-driver

Author: AdityaK (hiraditya)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/123952.diff

1 Files Affected:

  • (modified) clang/lib/Driver/ToolChains/Arch/ARM.cpp (+1-1)
diff --git a/clang/lib/Driver/ToolChains/Arch/ARM.cpp b/clang/lib/Driver/ToolChains/Arch/ARM.cpp
index c648fb66085c7f..1c000ceaeb6302 100644
--- a/clang/lib/Driver/ToolChains/Arch/ARM.cpp
+++ b/clang/lib/Driver/ToolChains/Arch/ARM.cpp
@@ -450,7 +450,7 @@ arm::FloatABI arm::getDefaultFloatABI(const llvm::Triple &Triple) {
       // EABI is always AAPCS, and if it was not marked 'hard', it's softfp
       return FloatABI::SoftFP;
     case llvm::Triple::Android:
-      return (SubArch >= 7) ? FloatABI::SoftFP : FloatABI::Soft;
+      return FloatABI::SoftFP;
     default:
       return FloatABI::Invalid;
     }

@llvmbot
Copy link
Member

llvmbot commented Jan 22, 2025

@llvm/pr-subscribers-backend-arm

Author: AdityaK (hiraditya)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/123952.diff

1 Files Affected:

  • (modified) clang/lib/Driver/ToolChains/Arch/ARM.cpp (+1-1)
diff --git a/clang/lib/Driver/ToolChains/Arch/ARM.cpp b/clang/lib/Driver/ToolChains/Arch/ARM.cpp
index c648fb66085c7f..1c000ceaeb6302 100644
--- a/clang/lib/Driver/ToolChains/Arch/ARM.cpp
+++ b/clang/lib/Driver/ToolChains/Arch/ARM.cpp
@@ -450,7 +450,7 @@ arm::FloatABI arm::getDefaultFloatABI(const llvm::Triple &Triple) {
       // EABI is always AAPCS, and if it was not marked 'hard', it's softfp
       return FloatABI::SoftFP;
     case llvm::Triple::Android:
-      return (SubArch >= 7) ? FloatABI::SoftFP : FloatABI::Soft;
+      return FloatABI::SoftFP;
     default:
       return FloatABI::Invalid;
     }

@llvmbot
Copy link
Member

llvmbot commented Jan 22, 2025

@llvm/pr-subscribers-clang

Author: AdityaK (hiraditya)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/123952.diff

1 Files Affected:

  • (modified) clang/lib/Driver/ToolChains/Arch/ARM.cpp (+1-1)
diff --git a/clang/lib/Driver/ToolChains/Arch/ARM.cpp b/clang/lib/Driver/ToolChains/Arch/ARM.cpp
index c648fb66085c7f..1c000ceaeb6302 100644
--- a/clang/lib/Driver/ToolChains/Arch/ARM.cpp
+++ b/clang/lib/Driver/ToolChains/Arch/ARM.cpp
@@ -450,7 +450,7 @@ arm::FloatABI arm::getDefaultFloatABI(const llvm::Triple &Triple) {
       // EABI is always AAPCS, and if it was not marked 'hard', it's softfp
       return FloatABI::SoftFP;
     case llvm::Triple::Android:
-      return (SubArch >= 7) ? FloatABI::SoftFP : FloatABI::Soft;
+      return FloatABI::SoftFP;
     default:
       return FloatABI::Invalid;
     }

Copy link
Contributor

@enh-google enh-google left a comment

Choose a reason for hiding this comment

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

or just move Android up with the other gnu/musl SoftFP cases?

@hiraditya hiraditya merged commit 2b67ece into llvm:main Jan 23, 2025
8 checks passed
@hiraditya hiraditya deleted the armv7 branch January 23, 2025 07:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backend:ARM clang:driver 'clang' and 'clang++' user-facing binaries. Not 'clang-cl' clang Clang issues not falling into any other category

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants