mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-23 02:29:18 +00:00
Make dynamic LLVMC plugins work on Windows (finally!).
Implemented by making lib/CompilerDriver a shared library that holds all the global static data (CommandLine options, plugin registry) that we unfortunately have to live with. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@74417 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
868a302738
commit
95c1f5ba64
@ -200,6 +200,7 @@ ifdef LLVMC_PLUGIN
|
|||||||
LIBRARYNAME := $(patsubst %,plugin_llvmc_%,$(LLVMC_PLUGIN))
|
LIBRARYNAME := $(patsubst %,plugin_llvmc_%,$(LLVMC_PLUGIN))
|
||||||
CPP.Flags += -DLLVMC_PLUGIN_NAME=$(LLVMC_PLUGIN)
|
CPP.Flags += -DLLVMC_PLUGIN_NAME=$(LLVMC_PLUGIN)
|
||||||
REQUIRES_EH := 1
|
REQUIRES_EH := 1
|
||||||
|
LD.Flags += -lCompilerDriver
|
||||||
|
|
||||||
# Build a dynamic library if the user runs `make` directly from the plugin
|
# Build a dynamic library if the user runs `make` directly from the plugin
|
||||||
# directory.
|
# directory.
|
||||||
@ -217,9 +218,8 @@ endif # LLVMC_PLUGIN
|
|||||||
ifdef LLVMC_BASED_DRIVER
|
ifdef LLVMC_BASED_DRIVER
|
||||||
|
|
||||||
TOOLNAME = $(LLVMC_BASED_DRIVER)
|
TOOLNAME = $(LLVMC_BASED_DRIVER)
|
||||||
LLVMLIBS = CompilerDriver.a
|
|
||||||
LINK_COMPONENTS = support system
|
|
||||||
REQUIRES_EH := 1
|
REQUIRES_EH := 1
|
||||||
|
LD.Flags += -lCompilerDriver
|
||||||
|
|
||||||
# Preprocessor magic that generates references to static variables in built-in
|
# Preprocessor magic that generates references to static variables in built-in
|
||||||
# plugins.
|
# plugins.
|
||||||
|
@ -24,8 +24,6 @@
|
|||||||
#include "llvm/CompilerDriver/Plugin.h"
|
#include "llvm/CompilerDriver/Plugin.h"
|
||||||
|
|
||||||
#include "llvm/System/Path.h"
|
#include "llvm/System/Path.h"
|
||||||
#include "llvm/Support/CommandLine.h"
|
|
||||||
#include "llvm/Support/PluginLoader.h"
|
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
@ -35,42 +33,6 @@ namespace cl = llvm::cl;
|
|||||||
namespace sys = llvm::sys;
|
namespace sys = llvm::sys;
|
||||||
using namespace llvmc;
|
using namespace llvmc;
|
||||||
|
|
||||||
// Built-in command-line options.
|
|
||||||
// External linkage here is intentional.
|
|
||||||
|
|
||||||
cl::list<std::string> InputFilenames(cl::Positional, cl::desc("<input file>"),
|
|
||||||
cl::ZeroOrMore);
|
|
||||||
cl::opt<std::string> OutputFilename("o", cl::desc("Output file name"),
|
|
||||||
cl::value_desc("file"), cl::Prefix);
|
|
||||||
cl::list<std::string> Languages("x",
|
|
||||||
cl::desc("Specify the language of the following input files"),
|
|
||||||
cl::ZeroOrMore);
|
|
||||||
cl::opt<bool> DryRun("dry-run",
|
|
||||||
cl::desc("Only pretend to run commands"));
|
|
||||||
cl::opt<bool> VerboseMode("v",
|
|
||||||
cl::desc("Enable verbose mode"));
|
|
||||||
|
|
||||||
cl::opt<bool> CheckGraph("check-graph",
|
|
||||||
cl::desc("Check the compilation graph for errors"),
|
|
||||||
cl::Hidden);
|
|
||||||
cl::opt<bool> WriteGraph("write-graph",
|
|
||||||
cl::desc("Write compilation-graph.dot file"),
|
|
||||||
cl::Hidden);
|
|
||||||
cl::opt<bool> ViewGraph("view-graph",
|
|
||||||
cl::desc("Show compilation graph in GhostView"),
|
|
||||||
cl::Hidden);
|
|
||||||
|
|
||||||
cl::opt<SaveTempsEnum::Values> SaveTemps
|
|
||||||
("save-temps", cl::desc("Keep temporary files"),
|
|
||||||
cl::init(SaveTempsEnum::Unset),
|
|
||||||
cl::values(clEnumValN(SaveTempsEnum::Obj, "obj",
|
|
||||||
"Save files in the directory specified with -o"),
|
|
||||||
clEnumValN(SaveTempsEnum::Cwd, "cwd",
|
|
||||||
"Use current working directory"),
|
|
||||||
clEnumValN(SaveTempsEnum::Obj, "", "Same as 'cwd'"),
|
|
||||||
clEnumValEnd),
|
|
||||||
cl::ValueOptional);
|
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
sys::Path getTempDir() {
|
sys::Path getTempDir() {
|
||||||
|
52
lib/CompilerDriver/BuiltinOptions.cpp
Normal file
52
lib/CompilerDriver/BuiltinOptions.cpp
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
//===--- BuiltinOptions.cpp - The LLVM Compiler Driver ----------*- C++ -*-===//
|
||||||
|
//
|
||||||
|
// The LLVM Compiler Infrastructure
|
||||||
|
//
|
||||||
|
// This file is distributed under the University of Illinois Open
|
||||||
|
// Source License. See LICENSE.TXT for details.
|
||||||
|
//
|
||||||
|
//===----------------------------------------------------------------------===//
|
||||||
|
//
|
||||||
|
// Definitions of all global command-line option variables.
|
||||||
|
//
|
||||||
|
//===----------------------------------------------------------------------===//
|
||||||
|
|
||||||
|
#include "llvm/CompilerDriver/BuiltinOptions.h"
|
||||||
|
#include "llvm/Support/PluginLoader.h"
|
||||||
|
|
||||||
|
namespace cl = llvm::cl;
|
||||||
|
|
||||||
|
// External linkage here is intentional.
|
||||||
|
|
||||||
|
cl::list<std::string> InputFilenames(cl::Positional, cl::desc("<input file>"),
|
||||||
|
cl::ZeroOrMore);
|
||||||
|
cl::opt<std::string> OutputFilename("o", cl::desc("Output file name"),
|
||||||
|
cl::value_desc("file"), cl::Prefix);
|
||||||
|
cl::list<std::string> Languages("x",
|
||||||
|
cl::desc("Specify the language of the following input files"),
|
||||||
|
cl::ZeroOrMore);
|
||||||
|
cl::opt<bool> DryRun("dry-run",
|
||||||
|
cl::desc("Only pretend to run commands"));
|
||||||
|
cl::opt<bool> VerboseMode("v",
|
||||||
|
cl::desc("Enable verbose mode"));
|
||||||
|
|
||||||
|
cl::opt<bool> CheckGraph("check-graph",
|
||||||
|
cl::desc("Check the compilation graph for errors"),
|
||||||
|
cl::Hidden);
|
||||||
|
cl::opt<bool> WriteGraph("write-graph",
|
||||||
|
cl::desc("Write compilation-graph.dot file"),
|
||||||
|
cl::Hidden);
|
||||||
|
cl::opt<bool> ViewGraph("view-graph",
|
||||||
|
cl::desc("Show compilation graph in GhostView"),
|
||||||
|
cl::Hidden);
|
||||||
|
|
||||||
|
cl::opt<SaveTempsEnum::Values> SaveTemps
|
||||||
|
("save-temps", cl::desc("Keep temporary files"),
|
||||||
|
cl::init(SaveTempsEnum::Unset),
|
||||||
|
cl::values(clEnumValN(SaveTempsEnum::Obj, "obj",
|
||||||
|
"Save files in the directory specified with -o"),
|
||||||
|
clEnumValN(SaveTempsEnum::Cwd, "cwd",
|
||||||
|
"Use current working directory"),
|
||||||
|
clEnumValN(SaveTempsEnum::Obj, "", "Same as 'cwd'"),
|
||||||
|
clEnumValEnd),
|
||||||
|
cl::ValueOptional);
|
@ -12,8 +12,22 @@ LEVEL = ../..
|
|||||||
# We don't want this library to appear in `llvm-config --libs` output, so its
|
# We don't want this library to appear in `llvm-config --libs` output, so its
|
||||||
# name doesn't start with "LLVM".
|
# name doesn't start with "LLVM".
|
||||||
|
|
||||||
LIBRARYNAME = CompilerDriver
|
LIBRARYNAME = libCompilerDriver
|
||||||
LINK_COMPONENTS = support system
|
LLVMLIBS = LLVMSupport.a LLVMSystem.a
|
||||||
|
LOADABLE_MODULE := 1
|
||||||
REQUIRES_EH := 1
|
REQUIRES_EH := 1
|
||||||
|
|
||||||
include $(LEVEL)/Makefile.common
|
include $(LEVEL)/Makefile.common
|
||||||
|
|
||||||
|
FullLibName = $(LIBRARYNAME)$(SHLIBEXT)
|
||||||
|
|
||||||
|
# Copy the library to the bin dir so that llvmc can find it.
|
||||||
|
all-local::
|
||||||
|
$(Echo) Copying $(BuildMode) Shared Library $(FullLibName) \
|
||||||
|
to $(ToolDir)
|
||||||
|
-$(Verb) $(CP) $(LibDir)/$(FullLibName) $(ToolDir)/
|
||||||
|
|
||||||
|
clean-local::
|
||||||
|
$(Echo) Removing $(BuildMode) Shared Library $(FullLibName) \
|
||||||
|
from $(ToolDir)
|
||||||
|
-$(Verb) $(RM) -f $(ToolDir)/$(FullLibName)
|
||||||
|
@ -14,11 +14,17 @@
|
|||||||
#include "llvm/CompilerDriver/BuiltinOptions.h"
|
#include "llvm/CompilerDriver/BuiltinOptions.h"
|
||||||
#include "llvm/CompilerDriver/Tool.h"
|
#include "llvm/CompilerDriver/Tool.h"
|
||||||
|
|
||||||
|
#include "llvm/ADT/StringExtras.h"
|
||||||
#include "llvm/System/Path.h"
|
#include "llvm/System/Path.h"
|
||||||
|
|
||||||
using namespace llvm;
|
using namespace llvm;
|
||||||
using namespace llvmc;
|
using namespace llvmc;
|
||||||
|
|
||||||
|
// SplitString is used by derived Tool classes.
|
||||||
|
typedef void (*SplitStringFunPtr)(const std::string&,
|
||||||
|
std::vector<std::string>&, const char*);
|
||||||
|
SplitStringFunPtr ForceLinkageSplitString = &llvm::SplitString;
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
sys::Path MakeTempFile(const sys::Path& TempDir, const std::string& BaseName,
|
sys::Path MakeTempFile(const sys::Path& TempDir, const std::string& BaseName,
|
||||||
const std::string& Suffix) {
|
const std::string& Suffix) {
|
||||||
|
Loading…
Reference in New Issue
Block a user