//
//===----------------------------------------------------------------------===//
-#include "llvm/Config/config.h"
-#include "plugin-api.h"
-
+#include "llvm/Config/config.h" // plugin-api.h requires HAVE_STDINT_H
#include "llvm-c/lto.h"
-
-#include "llvm/Support/ToolOutputFile.h"
+#include "llvm/ADT/OwningPtr.h"
+#include "llvm/ADT/StringSet.h"
#include "llvm/Support/Errno.h"
+#include "llvm/Support/FileSystem.h"
+#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/Program.h"
-
+#include "llvm/Support/ToolOutputFile.h"
+#include "llvm/Support/system_error.h"
#include <cerrno>
#include <cstdlib>
#include <cstring>
#include <fstream>
#include <list>
+#include <plugin-api.h>
#include <vector>
// Support Windows/MinGW crazyness.
lto_codegen_model output_type = LTO_CODEGEN_PIC_MODEL_STATIC;
std::string output_name = "";
std::list<claimed_file> Modules;
- std::vector<sys::Path> Cleanup;
+ std::vector<std::string> Cleanup;
lto_code_gen_t code_gen = NULL;
+ StringSet<> CannotBeHidden;
}
namespace options {
switch (tv->tv_u.tv_val) {
case LDPO_REL: // .o
case LDPO_DYN: // .so
+ case LDPO_PIE: // position independent executable
output_type = LTO_CODEGEN_PIC_MODEL_DYNAMIC;
break;
case LDPO_EXEC: // .exe
case LDPT_ADD_SYMBOLS:
add_symbols = tv->tv_u.tv_add_symbols;
break;
- case LDPT_GET_SYMBOLS:
+ case LDPT_GET_SYMBOLS_V2:
get_symbols = tv->tv_u.tv_get_symbols;
break;
case LDPT_ADD_INPUT_FILE:
static ld_plugin_status claim_file_hook(const ld_plugin_input_file *file,
int *claimed) {
lto_module_t M;
-
+ const void *view;
+ OwningPtr<MemoryBuffer> buffer;
if (get_view) {
- const void *view;
if (get_view(file->handle, &view) != LDPS_OK) {
(*message)(LDPL_ERROR, "Failed to get a view of %s", file->name);
return LDPS_ERR;
}
- M = lto_module_create_from_memory(view, file->filesize);
- } else if (file->offset) {
+ } else {
+ int64_t offset = 0;
// Gold has found what might be IR part-way inside of a file, such as
// an .a archive.
- M = lto_module_create_from_fd_at_offset(file->fd, file->name, -1,
- file->filesize, file->offset);
- } else {
- M = lto_module_create_from_fd(file->fd, file->name, file->filesize);
+ if (file->offset) {
+ offset = file->offset;
+ }
+ if (error_code ec = MemoryBuffer::getOpenFileSlice(
+ file->fd, file->name, buffer, file->filesize, offset)) {
+ (*message)(LDPL_ERROR, ec.message().c_str());
+ return LDPS_ERR;
+ }
+ view = buffer->getBufferStart();
}
- if (!M)
+
+ if (!lto_module_is_object_file_in_memory(view, file->filesize))
+ return LDPS_OK;
+
+ M = lto_module_create_from_memory(view, file->filesize);
+ if (!M) {
+ if (const char* msg = lto_get_error_message()) {
+ (*message)(LDPL_ERROR,
+ "LLVM gold plugin has failed to create LTO module: %s",
+ msg);
+ return LDPS_ERR;
+ }
return LDPS_OK;
+ }
*claimed = 1;
Modules.resize(Modules.size() + 1);
sym.version = NULL;
int scope = attrs & LTO_SYMBOL_SCOPE_MASK;
+ bool CanBeHidden = scope == LTO_SYMBOL_SCOPE_DEFAULT_CAN_BE_HIDDEN;
+ if (!CanBeHidden)
+ CannotBeHidden.insert(sym.name);
switch (scope) {
case LTO_SYMBOL_SCOPE_HIDDEN:
sym.visibility = LDPV_HIDDEN;
break;
case 0: // extern
case LTO_SYMBOL_SCOPE_DEFAULT:
+ case LTO_SYMBOL_SCOPE_DEFAULT_CAN_BE_HIDDEN:
sym.visibility = LDPV_DEFAULT;
break;
default:
}
}
- if (code_gen)
- lto_codegen_add_module(code_gen, M);
+ if (code_gen) {
+ if (lto_codegen_add_module(code_gen, M)) {
+ (*message)(LDPL_ERROR, "Error linking module: %s",
+ lto_get_error_message());
+ return LDPS_ERR;
+ }
+ }
lto_module_dispose(M);
return LDPS_OK;
}
+static bool mustPreserve(const claimed_file &F, int i) {
+ if (F.syms[i].resolution == LDPR_PREVAILING_DEF)
+ return true;
+ if (F.syms[i].resolution == LDPR_PREVAILING_DEF_IRONLY_EXP)
+ return CannotBeHidden.count(F.syms[i].name);
+ return false;
+}
+
/// all_symbols_read_hook - gold informs us that all symbols have been read.
/// At this point, we use get_symbols to see if any of our definitions have
/// been overridden by a native object file. Then, perform optimization and
}
}
- // If we don't preserve any symbols, libLTO will assume that all symbols are
- // needed. Keep all symbols unless we're producing a final executable.
- bool anySymbolsPreserved = false;
for (std::list<claimed_file>::iterator I = Modules.begin(),
E = Modules.end(); I != E; ++I) {
+ if (I->syms.empty())
+ continue;
(*get_symbols)(I->handle, I->syms.size(), &I->syms[0]);
for (unsigned i = 0, e = I->syms.size(); i != e; i++) {
- if (I->syms[i].resolution == LDPR_PREVAILING_DEF) {
+ if (mustPreserve(*I, i)) {
lto_codegen_add_must_preserve_symbol(code_gen, I->syms[i].name);
- anySymbolsPreserved = true;
if (options::generate_api_file)
api_file << I->syms[i].name << "\n";
if (options::generate_api_file)
api_file.close();
- if (!anySymbolsPreserved) {
- // All of the IL is unnecessary!
- lto_codegen_dispose(code_gen);
- return LDPS_OK;
- }
-
lto_codegen_set_pic_model(code_gen, output_type);
lto_codegen_set_debug_model(code_gen, LTO_DEBUG_MODEL_DWARF);
if (!options::mcpu.empty())
bool err = lto_codegen_write_merged_modules(code_gen, path.c_str());
if (err)
(*message)(LDPL_FATAL, "Failed to write the output file.");
- if (options::generate_bc_file == options::BC_ONLY)
+ if (options::generate_bc_file == options::BC_ONLY) {
+ lto_codegen_dispose(code_gen);
exit(0);
+ }
}
- size_t bufsize = 0;
- const char *objPath;
- if (lto_codegen_compile_to_file(code_gen, &objPath)) {
- (*message)(LDPL_ERROR, "Could not produce a combined object file\n");
+
+ std::string ObjPath;
+ {
+ const char *Temp;
+ if (lto_codegen_compile_to_file(code_gen, &Temp)) {
+ (*message)(LDPL_ERROR, "Could not produce a combined object file\n");
+ }
+ ObjPath = Temp;
}
lto_codegen_dispose(code_gen);
}
}
- if ((*add_input_file)(objPath) != LDPS_OK) {
+ if ((*add_input_file)(ObjPath.c_str()) != LDPS_OK) {
(*message)(LDPL_ERROR, "Unable to add .o file to the link.");
- (*message)(LDPL_ERROR, "File left behind in: %s", objPath);
+ (*message)(LDPL_ERROR, "File left behind in: %s", ObjPath.c_str());
return LDPS_ERR;
}
}
if (options::obj_path.empty())
- Cleanup.push_back(sys::Path(objPath));
+ Cleanup.push_back(ObjPath);
return LDPS_OK;
}
static ld_plugin_status cleanup_hook(void) {
- std::string ErrMsg;
-
- for (int i = 0, e = Cleanup.size(); i != e; ++i)
- if (Cleanup[i].eraseFromDisk(false, &ErrMsg))
+ for (int i = 0, e = Cleanup.size(); i != e; ++i) {
+ error_code EC = sys::fs::remove(Cleanup[i]);
+ if (EC)
(*message)(LDPL_ERROR, "Failed to delete '%s': %s", Cleanup[i].c_str(),
- ErrMsg.c_str());
+ EC.message().c_str());
+ }
return LDPS_OK;
}
projects / oota-llvm.git / blobdiff