aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/lto/LTOCodeGenerator.cpp20
-rw-r--r--tools/lto/LTOCodeGenerator.h12
-rw-r--r--tools/lto/lto.cpp5
-rw-r--r--tools/lto/lto.exports1
4 files changed, 1 insertions, 37 deletions
diff --git a/tools/lto/LTOCodeGenerator.cpp b/tools/lto/LTOCodeGenerator.cpp
index daeb964..3fe7af2 100644
--- a/tools/lto/LTOCodeGenerator.cpp
+++ b/tools/lto/LTOCodeGenerator.cpp
@@ -74,7 +74,7 @@ LTOCodeGenerator::LTOCodeGenerator()
_linker(new Module("ld-temp.o", _context)), _target(NULL),
_emitDwarfDebugInfo(false), _scopeRestrictionsDone(false),
_codeModel(LTO_CODEGEN_PIC_MODEL_DYNAMIC),
- _nativeObjectFile(NULL), ObjBufVect(0) {
+ _nativeObjectFile(NULL) {
InitializeAllTargets();
InitializeAllTargetMCs();
InitializeAllAsmPrinters();
@@ -85,7 +85,6 @@ LTOCodeGenerator::~LTOCodeGenerator() {
delete _target;
delete _nativeObjectFile;
delete _linker.getModule();
- delete[] ObjBufVect;
for (std::vector<char*>::iterator I = _codegenOptions.begin(),
E = _codegenOptions.end(); I != E; ++I)
@@ -247,23 +246,6 @@ const void* LTOCodeGenerator::compile(size_t* length, std::string& errMsg) {
return _nativeObjectFile->getBufferStart();
}
-// Currently compile() and compile_parallel() have no difference.
-NativeObjectFile *LTOCodeGenerator::compile_parallel(size_t *count,
- std::string &ErrMsg) {
- assert(ObjBufVect == 0 && "Should be NULL");
-
- size_t Len;
- const void *Buf = compile(&Len, ErrMsg);
- if (!Buf)
- return 0;
-
- *count = 1;
- ObjBufVect = new NativeObjectFile[1];
- ObjBufVect[0].content = Buf;
- ObjBufVect[0].length = Len;
- return ObjBufVect;
-}
-
bool LTOCodeGenerator::determineTarget(std::string &errMsg) {
if (_target != NULL)
return true;
diff --git a/tools/lto/LTOCodeGenerator.h b/tools/lto/LTOCodeGenerator.h
index 21c6b21..8f37cf0 100644
--- a/tools/lto/LTOCodeGenerator.h
+++ b/tools/lto/LTOCodeGenerator.h
@@ -102,17 +102,6 @@ struct LTOCodeGenerator {
//
const void *compile(size_t *length, std::string &errMsg);
- // Corresponding to lto_codegen_compile_parallel() API.
- // Generates code for merged module into an array of native object files.
- // On success returns a pointer to an array of NativeObjectFile. The count
- // parameter returns the number of elements in the array. Each element is
- // a pointer/length for a generated mach-o/ELF buffer. The buffer is owned
- // by the lto_code_gen_t and will be freed when lto_codegen_dispose() is
- // called, or lto_codegen_compile() is called again. On failure, returns
- // NULL (check lto_get_error_message() for details).
- //
- NativeObjectFile *compile_parallel(size_t *count, std::string &ErrMsg);
-
private:
void initializeLTOPasses();
@@ -138,7 +127,6 @@ private:
std::vector<char*> _codegenOptions;
std::string _mCpu;
std::string _nativeObjectPath;
- NativeObjectFile *ObjBufVect;
};
#endif // LTO_CODE_GENERATOR_H
diff --git a/tools/lto/lto.cpp b/tools/lto/lto.cpp
index bbb6071..db7147c 100644
--- a/tools/lto/lto.cpp
+++ b/tools/lto/lto.cpp
@@ -207,11 +207,6 @@ bool lto_codegen_compile_to_file(lto_code_gen_t cg, const char **name) {
return !cg->compile_to_file(name, sLastErrorString);
}
-extern const struct NativeObjectFile *
-lto_codegen_compile_parallel(lto_code_gen_t cg, size_t *count) {
- return cg->compile_parallel(count, sLastErrorString);
-}
-
/// lto_codegen_debug_options - Used to pass extra options to the code
/// generator.
void lto_codegen_debug_options(lto_code_gen_t cg, const char *opt) {
diff --git a/tools/lto/lto.exports b/tools/lto/lto.exports
index 61f0817..46d0d74 100644
--- a/tools/lto/lto.exports
+++ b/tools/lto/lto.exports
@@ -28,7 +28,6 @@ lto_codegen_set_assembler_args
lto_codegen_set_assembler_path
lto_codegen_set_cpu
lto_codegen_compile_to_file
-lto_codegen_compile_parallel
LLVMCreateDisasm
LLVMCreateDisasmCPU
LLVMDisasmDispose