diff options
| -rw-r--r-- | include/llvm/LinkTimeOptimizer.h | 1 | ||||
| -rw-r--r-- | lib/Linker/LinkModules.cpp | 7 | ||||
| -rw-r--r-- | tools/llvm-db/Commands.cpp | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/include/llvm/LinkTimeOptimizer.h b/include/llvm/LinkTimeOptimizer.h index de33871..de48aa7 100644 --- a/include/llvm/LinkTimeOptimizer.h +++ b/include/llvm/LinkTimeOptimizer.h @@ -19,6 +19,7 @@ #include <vector> #include <set> #include <llvm/ADT/hash_map> +#include <cstring> #define LLVM_LTO_VERSION 2 diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index a8995d6..1ae609d 100644 --- a/lib/Linker/LinkModules.cpp +++ b/lib/Linker/LinkModules.cpp @@ -951,16 +951,19 @@ Linker::LinkModules(Module *Dest, Module *Src, std::string *ErrorMsg) { } else { std::string DataLayout; - if (Dest->getEndianness() == Module::AnyEndianness) + if (Dest->getEndianness() == Module::AnyEndianness) { if (Src->getEndianness() == Module::BigEndian) DataLayout.append("E"); else if (Src->getEndianness() == Module::LittleEndian) DataLayout.append("e"); - if (Dest->getPointerSize() == Module::AnyPointerSize) + } + + if (Dest->getPointerSize() == Module::AnyPointerSize) { if (Src->getPointerSize() == Module::Pointer64) DataLayout.append(DataLayout.length() == 0 ? "p:64:64" : "-p:64:64"); else if (Src->getPointerSize() == Module::Pointer32) DataLayout.append(DataLayout.length() == 0 ? "p:32:32" : "-p:32:32"); + } Dest->setDataLayout(DataLayout); } } diff --git a/tools/llvm-db/Commands.cpp b/tools/llvm-db/Commands.cpp index ae6d97a..ffebdd5 100644 --- a/tools/llvm-db/Commands.cpp +++ b/tools/llvm-db/Commands.cpp @@ -21,6 +21,7 @@ #include "llvm/Support/FileUtilities.h" #include "llvm/ADT/StringExtras.h" #include <iostream> +#include <cstdlib> using namespace llvm; /// getCurrentLanguage - Return the current source language that the user is @@ -448,11 +449,12 @@ void CLIDebugger::downCommand(std::string &Options) { unsigned CurFrame = RI.getCurrentFrameIdx(); // Check to see if we can go up the specified number of frames. - if (CurFrame < Num) + if (CurFrame < Num) { if (Num == 1) throw "Bottom (i.e., innermost) frame selected; you cannot go down."; else throw "Cannot go down " + utostr(Num) + " frames!"; + } RI.setCurrentFrameIdx(CurFrame-Num); printProgramLocation(); |