1 From 5f1f68870f05c5afce14cc044ccedeea7c11e654 Mon Sep 17 00:00:00 2001 2 From: Evgeniy Stepanov <eugeni.stepanov (a] gmail.com> 3 Date: Thu, 16 Aug 2012 15:56:50 +0800 4 Subject: [PATCH 1/2] Fix default cpu for -march=armv5e. 5 6 --- 7 llvm-3.1/tools/clang/lib/Driver/Tools.cpp | 2 +- 8 .../tools/clang/test/Driver/clang-translation.c | 7 +++++++ 9 2 files changed, 8 insertions(+), 1 deletions(-) 10 11 diff --git a/llvm-3.1/tools/clang/lib/Driver/Tools.cpp b/llvm-3.1/tools/clang/lib/Driver/Tools.cpp 12 index 47b5294..4931f8c 100644 13 --- a/llvm-3.1/tools/clang/lib/Driver/Tools.cpp 14 +++ b/llvm-3.1/tools/clang/lib/Driver/Tools.cpp 15 @@ -448,7 +448,7 @@ static const char *getARMTargetCPU(const ArgList &Args, 16 .Case("armv3m", "arm7m") 17 .Cases("armv4", "armv4t", "arm7tdmi") 18 .Cases("armv5", "armv5t", "arm10tdmi") 19 - .Cases("armv5e", "armv5te", "arm1026ejs") 20 + .Cases("armv5e", "armv5te", "arm1022e") 21 .Case("armv5tej", "arm926ej-s") 22 .Cases("armv6", "armv6k", "arm1136jf-s") 23 .Case("armv6j", "arm1136j-s") 24 diff --git a/llvm-3.1/tools/clang/test/Driver/clang-translation.c b/llvm-3.1/tools/clang/test/Driver/clang-translation.c 25 index 0e82de4..3ab6f5b 100644 26 --- a/llvm-3.1/tools/clang/test/Driver/clang-translation.c 27 +++ b/llvm-3.1/tools/clang/test/Driver/clang-translation.c 28 @@ -44,3 +44,10 @@ 29 // ARMV7_HARDFLOAT: "-mfloat-abi" "hard" 30 // ARMV7_HARDFLOAT-NOT: "-msoft-float" 31 // ARMV7_HARDFLOAT: "-x" "c" 32 + 33 +// RUN: %clang -target arm-linux -### -S %s 2> %t.log \ 34 +// RUN: -march=armv5e 35 +// RUN: FileCheck -check-prefix=ARMV5E %s < %t.log 36 +// ARMV5E: clang 37 +// ARMV5E: "-cc1" 38 +// ARMV5E: "-target-cpu" "arm1022e" 39 -- 40 1.7.7.3 41 42
