diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-10-23 11:45:20 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-10-23 11:45:34 -0700 |
| commit | 4ce160aa277821da7b43fb457672a625facbad12 (patch) | |
| tree | 9bf076476a3a8f6cca98264333e98001b9c64a95 /lib/MC/SubtargetFeature.cpp | |
| parent | f31db0fd81a8fdfb5c0c6792be6682074a66fe6b (diff) | |
| parent | 92b0d8cf2c51debc7f4fb30a417ae839077a8ed0 (diff) | |
Merge commit '92b0d8cf2c51debc7f4fb30a417ae839077a8ed0'
Conflicts:
lib/Target/ARM/ARMISelLowering.cpp
lib/Target/Mips/MipsISelLowering.h
lib/Target/X86/X86ISelLowering.h
lib/Target/X86/X86TargetMachine.h
tools/llc/llc.cpp
The only interesting conflict was ARMISelLowering, caused by
http://llvm.org/viewvc/llvm-project?view=rev&revision=166273
which actually removes a LOCALMOD for ARM byval lowering.
Diffstat (limited to 'lib/MC/SubtargetFeature.cpp')
| -rw-r--r-- | lib/MC/SubtargetFeature.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/MC/SubtargetFeature.cpp b/lib/MC/SubtargetFeature.cpp index e24514835b..7f902f1dd7 100644 --- a/lib/MC/SubtargetFeature.cpp +++ b/lib/MC/SubtargetFeature.cpp @@ -119,8 +119,8 @@ void SubtargetFeatures::AddFeature(const StringRef String, } /// Find KV in array using binary search. -const SubtargetFeatureKV *Find(const StringRef S, const SubtargetFeatureKV *A, - size_t L) { +static const SubtargetFeatureKV *Find(StringRef S, const SubtargetFeatureKV *A, + size_t L) { // Make the lower bound element we're looking for SubtargetFeatureKV KV; KV.Key = S.data(); |