diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-05-15 21:43:59 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-05-15 21:43:59 +0200 |
| commit | b2e3c7da703d4c3dda41d4f1e18cd976e6c4381a (patch) | |
| tree | 7462cd2988228ae24c40b37a9382d35874bbf099 /lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp | |
| parent | 23d8d191eff180ba312a4d1b4fec8597e5a988d5 (diff) | |
| parent | 4ef61f2ad4ff509ee05c7051d359009511f81226 (diff) | |
| download | llvm-embtk-support-master.tar.gz llvm-embtk-support-master.tar.bz2 llvm-embtk-support-master.tar.xz | |
Merge branch 'master' into embtk-support-masterembtk-support-master
Diffstat (limited to 'lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp')
| -rw-r--r-- | lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp b/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp index 57239f8011..b858fff546 100644 --- a/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp +++ b/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp @@ -159,7 +159,7 @@ static MCRegisterInfo *createARMMCRegisterInfo(StringRef Triple) { return X; } -static MCAsmInfo *createARMMCAsmInfo(StringRef TT) { +static MCAsmInfo *createARMMCAsmInfo(const MCRegisterInfo &MRI, StringRef TT) { Triple TheTriple(TT); if (TheTriple.isOSDarwin()) |