From 63aaa11506f1edcd6e6073b1dbdbe02d678c8cfa Mon Sep 17 00:00:00 2001 From: Anand Shukla Date: Tue, 25 Jun 2002 21:43:28 +0000 Subject: [PATCH] Changes for 64bit gcc git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@2797 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/as/as.cpp | 12 +++++++----- tools/llvm-as/as.cpp | 12 +++++++----- tools/llvm-as/llvm-as.cpp | 12 +++++++----- tools/opt/Makefile | 10 +++++++++- tools/opt/opt.cpp | 4 +++- 5 files changed, 33 insertions(+), 17 deletions(-) diff --git a/tools/as/as.cpp b/tools/as/as.cpp index 594feb8dd83..4ee329661ff 100644 --- a/tools/as/as.cpp +++ b/tools/as/as.cpp @@ -6,7 +6,7 @@ // as [options] - Read LLVM assembly from stdin, write bytecode to stdout // as [options] x.ll - Read LLVM assembly from the x.ll file, write bytecode // to the x.bc file. -// +// //===------------------------------------------------------------------------=== #include "llvm/Module.h" @@ -16,6 +16,8 @@ #include "Support/Signals.h" #include #include +#include +using std::cerr; cl::String InputFilename ("", "Parse file, compile to bytecode", 0, "-"); cl::String OutputFilename("o", "Override output filename", cl::NoFlags, ""); @@ -25,7 +27,7 @@ cl::Flag DumpAsm ("d", "Print assembly as parsed", cl::Hidden, false); int main(int argc, char **argv) { cl::ParseCommandLineOptions(argc, argv, " llvm .ll -> .bc assembler\n"); - ostream *Out = 0; + std::ostream *Out = 0; try { // Parse the file now... std::auto_ptr M(ParseAssemblyFile(InputFilename)); @@ -47,7 +49,7 @@ int main(int argc, char **argv) { } else { if (InputFilename == "-") { OutputFilename = "-"; - Out = &cout; + Out = &std::cout; } else { std::string IFN = InputFilename; int Len = IFN.length(); @@ -80,11 +82,11 @@ int main(int argc, char **argv) { WriteBytecodeToFile(M.get(), *Out); } catch (const ParseException &E) { - cerr << E.getMessage() << endl; + cerr << E.getMessage() << std::endl; return 1; } - if (Out != &cout) delete Out; + if (Out != &std::cout) delete Out; return 0; } diff --git a/tools/llvm-as/as.cpp b/tools/llvm-as/as.cpp index 594feb8dd83..4ee329661ff 100644 --- a/tools/llvm-as/as.cpp +++ b/tools/llvm-as/as.cpp @@ -6,7 +6,7 @@ // as [options] - Read LLVM assembly from stdin, write bytecode to stdout // as [options] x.ll - Read LLVM assembly from the x.ll file, write bytecode // to the x.bc file. -// +// //===------------------------------------------------------------------------=== #include "llvm/Module.h" @@ -16,6 +16,8 @@ #include "Support/Signals.h" #include #include +#include +using std::cerr; cl::String InputFilename ("", "Parse file, compile to bytecode", 0, "-"); cl::String OutputFilename("o", "Override output filename", cl::NoFlags, ""); @@ -25,7 +27,7 @@ cl::Flag DumpAsm ("d", "Print assembly as parsed", cl::Hidden, false); int main(int argc, char **argv) { cl::ParseCommandLineOptions(argc, argv, " llvm .ll -> .bc assembler\n"); - ostream *Out = 0; + std::ostream *Out = 0; try { // Parse the file now... std::auto_ptr M(ParseAssemblyFile(InputFilename)); @@ -47,7 +49,7 @@ int main(int argc, char **argv) { } else { if (InputFilename == "-") { OutputFilename = "-"; - Out = &cout; + Out = &std::cout; } else { std::string IFN = InputFilename; int Len = IFN.length(); @@ -80,11 +82,11 @@ int main(int argc, char **argv) { WriteBytecodeToFile(M.get(), *Out); } catch (const ParseException &E) { - cerr << E.getMessage() << endl; + cerr << E.getMessage() << std::endl; return 1; } - if (Out != &cout) delete Out; + if (Out != &std::cout) delete Out; return 0; } diff --git a/tools/llvm-as/llvm-as.cpp b/tools/llvm-as/llvm-as.cpp index 594feb8dd83..4ee329661ff 100644 --- a/tools/llvm-as/llvm-as.cpp +++ b/tools/llvm-as/llvm-as.cpp @@ -6,7 +6,7 @@ // as [options] - Read LLVM assembly from stdin, write bytecode to stdout // as [options] x.ll - Read LLVM assembly from the x.ll file, write bytecode // to the x.bc file. -// +// //===------------------------------------------------------------------------=== #include "llvm/Module.h" @@ -16,6 +16,8 @@ #include "Support/Signals.h" #include #include +#include +using std::cerr; cl::String InputFilename ("", "Parse file, compile to bytecode", 0, "-"); cl::String OutputFilename("o", "Override output filename", cl::NoFlags, ""); @@ -25,7 +27,7 @@ cl::Flag DumpAsm ("d", "Print assembly as parsed", cl::Hidden, false); int main(int argc, char **argv) { cl::ParseCommandLineOptions(argc, argv, " llvm .ll -> .bc assembler\n"); - ostream *Out = 0; + std::ostream *Out = 0; try { // Parse the file now... std::auto_ptr M(ParseAssemblyFile(InputFilename)); @@ -47,7 +49,7 @@ int main(int argc, char **argv) { } else { if (InputFilename == "-") { OutputFilename = "-"; - Out = &cout; + Out = &std::cout; } else { std::string IFN = InputFilename; int Len = IFN.length(); @@ -80,11 +82,11 @@ int main(int argc, char **argv) { WriteBytecodeToFile(M.get(), *Out); } catch (const ParseException &E) { - cerr << E.getMessage() << endl; + cerr << E.getMessage() << std::endl; return 1; } - if (Out != &cout) delete Out; + if (Out != &std::cout) delete Out; return 0; } diff --git a/tools/opt/Makefile b/tools/opt/Makefile index cfe97d77cd7..989bc642bd6 100644 --- a/tools/opt/Makefile +++ b/tools/opt/Makefile @@ -1,7 +1,15 @@ LEVEL = ../.. TOOLNAME = opt -USEDLIBS = bcreader bcwriter instrument profpaths scalaropts \ + +#USEDLIBS = bcreader bcwriter profpaths \ +# analysis transforms vmcore support + + +USEDLIBS = bcreader bcwriter instrument profpaths \ ipo ipa datastructure transforms target analysis transformutils vmcore support +#USEDLIBS = bcreader bcwriter instrument profpaths scalaropts \ +# ipo ipa datastructure transforms target analysis transformutils vmcore support + include $(LEVEL)/Makefile.common diff --git a/tools/opt/opt.cpp b/tools/opt/opt.cpp index 228e545e5eb..ce2db65dd08 100644 --- a/tools/opt/opt.cpp +++ b/tools/opt/opt.cpp @@ -30,6 +30,9 @@ #include "Support/Signals.h" #include #include +#include + +using std::cerr; // FIXME: This should be parameterizable eventually for different target // types... @@ -100,7 +103,6 @@ struct { { trace , createTraceValuesPassForBasicBlocks }, { tracem , createTraceValuesPassForFunction }, { paths , createProfilePathsPass }, - { print , createPrintFunctionPass }, { printm , createPrintModulePass }, { verify , createVerifierPass }, -- 2.34.1