mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-12-13 22:58:50 +00:00
And final pack of warnings silencing
llvm-svn: 47372
This commit is contained in:
parent
fd6b669c80
commit
b2dfae5fed
@ -19,6 +19,7 @@
|
||||
#include <vector>
|
||||
#include <set>
|
||||
#include <llvm/ADT/hash_map>
|
||||
#include <cstring>
|
||||
|
||||
#define LLVM_LTO_VERSION 2
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
@ -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();
|
||||
|
Loading…
Reference in New Issue
Block a user