[llvm-commits] [llvm] r56967 - in /llvm/trunk: include/llvm/CompilerDriver/ tools/llvmc2/ tools/llvmc2/examples/ tools/llvmc2/plugins/Base/ tools/llvmc2/plugins/Clang/ tools/llvmc2/plugins/Hello/
Mikhail Glushenkov
foldr at codedgers.com
Thu Oct 2 14:15:06 PDT 2008
Author: foldr
Date: Thu Oct 2 16:15:05 2008
New Revision: 56967
URL: http://llvm.org/viewvc/llvm-project?rev=56967&view=rev
Log:
Build system tweaks to make it more convenient for the plugin authors.
Plugins can be now compiled in with a slight Makefile change.
For example, to compile the new Clang driver, use:
cd $LLVMC2_DIR
make TOOLNAME=ccc2 BUILTIN_PLUGINS=Clang
Added:
llvm/trunk/include/llvm/CompilerDriver/Common.td
- copied, changed from r56965, llvm/trunk/tools/llvmc2/Common.td
llvm/trunk/include/llvm/CompilerDriver/Tools.td
- copied, changed from r56965, llvm/trunk/tools/llvmc2/Tools.td
llvm/trunk/tools/llvmc2/plugins/Base/
llvm/trunk/tools/llvmc2/plugins/Base/AutoGenerated.cpp
llvm/trunk/tools/llvmc2/plugins/Base/Base.td
- copied, changed from r56965, llvm/trunk/tools/llvmc2/Graph.td
llvm/trunk/tools/llvmc2/plugins/Base/Makefile
- copied, changed from r56965, llvm/trunk/tools/llvmc2/plugins/Hello/Makefile
llvm/trunk/tools/llvmc2/plugins/Clang/
llvm/trunk/tools/llvmc2/plugins/Clang/AutoGenerated.cpp
llvm/trunk/tools/llvmc2/plugins/Clang/Clang.td
- copied, changed from r56965, llvm/trunk/tools/llvmc2/examples/Clang.td
llvm/trunk/tools/llvmc2/plugins/Clang/Makefile
- copied, changed from r56965, llvm/trunk/tools/llvmc2/plugins/Hello/Makefile
Removed:
llvm/trunk/tools/llvmc2/AutoGenerated.cpp
llvm/trunk/tools/llvmc2/Common.td
llvm/trunk/tools/llvmc2/Graph.td
llvm/trunk/tools/llvmc2/Tools.td
llvm/trunk/tools/llvmc2/examples/Clang.td
Modified:
llvm/trunk/tools/llvmc2/Makefile
llvm/trunk/tools/llvmc2/plugins/Hello/Makefile
Copied: llvm/trunk/include/llvm/CompilerDriver/Common.td (from r56965, llvm/trunk/tools/llvmc2/Common.td)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CompilerDriver/Common.td?p2=llvm/trunk/include/llvm/CompilerDriver/Common.td&p1=llvm/trunk/tools/llvmc2/Common.td&r1=56965&r2=56967&rev=56967&view=diff
==============================================================================
(empty)
Copied: llvm/trunk/include/llvm/CompilerDriver/Tools.td (from r56965, llvm/trunk/tools/llvmc2/Tools.td)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CompilerDriver/Tools.td?p2=llvm/trunk/include/llvm/CompilerDriver/Tools.td&p1=llvm/trunk/tools/llvmc2/Tools.td&r1=56965&r2=56967&rev=56967&view=diff
==============================================================================
(empty)
Removed: llvm/trunk/tools/llvmc2/AutoGenerated.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/AutoGenerated.cpp?rev=56966&view=auto
==============================================================================
--- llvm/trunk/tools/llvmc2/AutoGenerated.cpp (original)
+++ llvm/trunk/tools/llvmc2/AutoGenerated.cpp (removed)
@@ -1,15 +0,0 @@
-//===--- AutoGenerated.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.
-//
-//===----------------------------------------------------------------------===//
-//
-// Auto-generated tool descriptions - implementation.
-//
-//===----------------------------------------------------------------------===//
-
-// The auto-generated file
-#include "AutoGenerated.inc"
Removed: llvm/trunk/tools/llvmc2/Common.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/Common.td?rev=56966&view=auto
==============================================================================
--- llvm/trunk/tools/llvmc2/Common.td (original)
+++ llvm/trunk/tools/llvmc2/Common.td (removed)
@@ -1,106 +0,0 @@
-//===- Common.td - Common definitions for LLVMC2 ----------*- tablegen -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file contains common definitions used in llvmc2 tool description files.
-//
-//===----------------------------------------------------------------------===//
-
-class Tool<list<dag> l> {
- list<dag> properties = l;
-}
-
-// Special Tool instance - the root node of the compilation graph.
-
-def root : Tool<[]>;
-
-// Possible Tool properties
-
-def in_language;
-def out_language;
-def output_suffix;
-def cmd_line;
-def join;
-def sink;
-
-// Possible option types
-
-def alias_option;
-def switch_option;
-def parameter_option;
-def parameter_list_option;
-def prefix_option;
-def prefix_list_option;
-
-// Possible option properties
-
-def append_cmd;
-def forward;
-def forward_as;
-def stop_compilation;
-def unpack_values;
-def help;
-def required;
-
-// Empty DAG marker.
-def empty;
-
-// The 'case' construct.
-def case;
-
-// Primitive tests.
-def switch_on;
-def parameter_equals;
-def element_in_list;
-def input_languages_contain;
-def not_empty;
-def default;
-
-// Boolean operators.
-def and;
-def or;
-
-// Increase/decrease the edge weight.
-def inc_weight;
-def dec_weight;
-
-// Option list - used to specify aliases and sometimes help strings.
-class OptionList<list<dag> l> {
- list<dag> options = l;
-}
-
-// Map from suffixes to language names
-
-class LangToSuffixes<string str, list<string> lst> {
- string lang = str;
- list<string> suffixes = lst;
-}
-
-class LanguageMap<list<LangToSuffixes> lst> {
- list<LangToSuffixes> map = lst;
-}
-
-// Compilation graph
-
-class EdgeBase<Tool t1, Tool t2, dag d> {
- Tool a = t1;
- Tool b = t2;
- dag weight = d;
-}
-
-class Edge<Tool t1, Tool t2> : EdgeBase<t1, t2, (empty)>;
-
-// Edge and SimpleEdge are synonyms.
-class SimpleEdge<Tool t1, Tool t2> : EdgeBase<t1, t2, (empty)>;
-
-// Optionally enabled edge.
-class OptionalEdge<Tool t1, Tool t2, dag props> : EdgeBase<t1, t2, props>;
-
-class CompilationGraph<list<EdgeBase> lst> {
- list<EdgeBase> edges = lst;
-}
Removed: llvm/trunk/tools/llvmc2/Graph.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/Graph.td?rev=56966&view=auto
==============================================================================
--- llvm/trunk/tools/llvmc2/Graph.td (original)
+++ llvm/trunk/tools/llvmc2/Graph.td (removed)
@@ -1,49 +0,0 @@
-//===- Graph.td - LLVMC2 toolchain descriptions ------------*- tablegen -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file contains compilation graph description used by llvmc2.
-//
-//===----------------------------------------------------------------------===//
-
-include "Common.td"
-include "Tools.td"
-
-// Toolchains
-
-def CompilationGraph : CompilationGraph<[
- Edge<root, llvm_gcc_c>,
- Edge<root, llvm_gcc_assembler>,
- Edge<root, llvm_gcc_cpp>,
- Edge<root, llvm_as>,
-
- Edge<llvm_gcc_c, llc>,
- Edge<llvm_gcc_cpp, llc>,
- Edge<llvm_as, llc>,
-
- OptionalEdge<llvm_gcc_c, opt, (case (switch_on "opt"), (inc_weight))>,
- OptionalEdge<llvm_gcc_cpp, opt, (case (switch_on "opt"), (inc_weight))>,
- OptionalEdge<llvm_as, opt, (case (switch_on "opt"), (inc_weight))>,
- Edge<opt, llc>,
-
- Edge<llc, llvm_gcc_assembler>,
- Edge<llvm_gcc_assembler, llvm_gcc_linker>,
- OptionalEdge<llvm_gcc_assembler, llvm_gcc_cpp_linker,
- (case
- (input_languages_contain "c++"), (inc_weight),
- (or (parameter_equals "linker", "g++"),
- (parameter_equals "linker", "c++")), (inc_weight))>,
-
-
- Edge<root, llvm_gcc_linker>,
- OptionalEdge<root, llvm_gcc_cpp_linker,
- (case
- (input_languages_contain "c++"), (inc_weight),
- (or (parameter_equals "linker", "g++"),
- (parameter_equals "linker", "c++")), (inc_weight))>
- ]>;
Modified: llvm/trunk/tools/llvmc2/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/Makefile?rev=56967&r1=56966&r2=56967&view=diff
==============================================================================
--- llvm/trunk/tools/llvmc2/Makefile (original)
+++ llvm/trunk/tools/llvmc2/Makefile Thu Oct 2 16:15:05 2008
@@ -6,24 +6,39 @@
# Source License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
+
+# Compiled-in plugins
+BUILTIN_PLUGINS = Base
+
LEVEL = ../..
TOOLNAME = llvmc2
-BUILT_SOURCES = AutoGenerated.inc
LINK_COMPONENTS = support system
REQUIRES_EH := 1
+ifneq ($(BUILTIN_PLUGINS),)
+
+export BUILTIN_LLVMC_PLUGIN=1
+USEDLIBS = $(patsubst %,LLVMC%,$(BUILTIN_PLUGINS))
+
+endif
+
include $(LEVEL)/Makefile.common
-GRAPH=Graph.td
-$(GRAPH) : Common.td
-Graph.td : Tools.td
-TOOLS_SOURCE=$(GRAPH)
-
-# TOFIX: integrate this part into Makefile.rules?
-# The degree of horrorshowness in that file is too much for me atm.
-$(ObjDir)/AutoGenerated.inc.tmp: $(TOOLS_SOURCE) $(ObjDir)/.dir $(TBLGEN)
- $(Echo) "Building LLVMC configuration library with tblgen"
- $(Verb) $(TableGen) -gen-llvmc -o $(call SYSPATH, $@) $<
+TD_COMMON = $(wildcard $(LLVM_SRC_ROOT)/include/llvm/CompilerDriver/*.td)
+
+# There is probably a better way to do this: currently we enter the
+# subdirectory 2 times - the second time is not needed.
+# This probably also needs to be integrated into Makefile.rules.
+define PLUGIN_template
+PLUGIN_$(1)_SOURCES=$$(wildcard plugins/$(1)/*.cpp)
+PLUGIN_$(1)_TD_SOURCES=$$(wildcard plugins/$(1)/*.cpp)
+
+$$(LibDir)/LLVMC$(1).o: $$(PLUGIN_$(1)_SOURCES) $$(PLUGIN_$(1)_TD_SOURCES) \
+ $$(TD_COMMON)
+ @$$(MAKE) -C plugins/$(1)
+
+$$(RecursiveTargets) ::
+ @$$(MAKE) -C plugins/$(1) $$@
+endef
-AutoGenerated.inc : $(ObjDir)/AutoGenerated.inc.tmp
- $(Verb) $(CMP) -s $@ $< || $(CP) $< $@
+$(foreach plugin,$(BUILTIN_PLUGINS),$(eval $(call PLUGIN_template,$(plugin))))
Removed: llvm/trunk/tools/llvmc2/Tools.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/Tools.td?rev=56966&view=auto
==============================================================================
--- llvm/trunk/tools/llvmc2/Tools.td (original)
+++ llvm/trunk/tools/llvmc2/Tools.td (removed)
@@ -1,117 +0,0 @@
-//===- Tools.td - Tools description for LLVMC2 -------------*- tablegen -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file contains descriptions of the various build tools run by llvmc2.
-//
-//===----------------------------------------------------------------------===//
-
-def llvm_gcc_c : Tool<
-[(in_language "c"),
- (out_language "llvm-bitcode"),
- (output_suffix "bc"),
- (cmd_line (case
- (switch_on "E"),
- (case (not_empty "o"),
- "llvm-gcc -E -x c++ $INFILE -o $OUTFILE",
- (default),
- "llvm-gcc -E -x c++ $INFILE"),
- (default),
- "llvm-gcc -c -x c $INFILE -o $OUTFILE -emit-llvm")),
- (switch_option "E", (stop_compilation),
- (help "Stop after the preprocessing stage, do not run the compiler")),
- (sink)
-]>;
-
-def llvm_gcc_cpp : Tool<
-[(in_language "c++"),
- (out_language "llvm-bitcode"),
- (output_suffix "bc"),
- (cmd_line (case
- (switch_on "E"),
- (case (not_empty "o"),
- "llvm-g++ -E -x c++ $INFILE -o $OUTFILE",
- (default),
- "llvm-g++ -E -x c++ $INFILE"),
- (default),
- "llvm-g++ -c -x c++ $INFILE -o $OUTFILE -emit-llvm")),
- (switch_option "E", (stop_compilation)),
- (sink)
-]>;
-
-def opt : Tool<
-[(in_language "llvm-bitcode"),
- (out_language "llvm-bitcode"),
- (switch_option "opt", (help "Enable opt")),
- (output_suffix "bc"),
- (cmd_line "opt -f $INFILE -o $OUTFILE")
-]>;
-
-def llvm_as : Tool<
-[(in_language "llvm-assembler"),
- (out_language "llvm-bitcode"),
- (output_suffix "bc"),
- (cmd_line "llvm-as $INFILE -o $OUTFILE")
-]>;
-
-def llc : Tool<
-[(in_language "llvm-bitcode"),
- (out_language "assembler"),
- (output_suffix "s"),
- (switch_option "S", (stop_compilation),
- (help "Stop after compilation, do not assemble")),
- (cmd_line "llc -f $INFILE -o $OUTFILE")
-]>;
-
-def llvm_gcc_assembler : Tool<
-[(in_language "assembler"),
- (out_language "object-code"),
- (output_suffix "o"),
- (cmd_line "llvm-gcc -c -x assembler $INFILE -o $OUTFILE"),
- (switch_option "c", (stop_compilation),
- (help "Compile and assemble, but do not link")),
- (prefix_list_option "Wa,", (unpack_values), (help "Pass options to assembler"))
-]>;
-
-// Default linker
-def llvm_gcc_linker : Tool<
-[(in_language "object-code"),
- (out_language "executable"),
- (output_suffix "out"),
- (cmd_line "llvm-gcc $INFILE -o $OUTFILE"),
- (join),
- (prefix_list_option "L", (forward), (help "Add a directory to link path")),
- (prefix_list_option "l", (forward), (help "Search a library when linking")),
- (prefix_list_option "Wl,", (unpack_values), (help "Pass options to linker"))
-]>;
-
-// Alternative linker for C++
-def llvm_gcc_cpp_linker : Tool<
-[(in_language "object-code"),
- (out_language "executable"),
- (output_suffix "out"),
- (cmd_line "llvm-g++ $INFILE -o $OUTFILE"),
- (join),
- (parameter_option "linker",
- (help "Choose linker (possible values: gcc, g++)")),
- (prefix_list_option "L", (forward)),
- (prefix_list_option "l", (forward)),
- (prefix_list_option "Wl,", (unpack_values))
-]>;
-
-// Language map
-
-def LanguageMap : LanguageMap<
- [LangToSuffixes<"c++", ["cc", "cp", "cxx", "cpp", "CPP", "c++", "C"]>,
- LangToSuffixes<"c", ["c"]>,
- LangToSuffixes<"assembler", ["s"]>,
- LangToSuffixes<"llvm-assembler", ["ll"]>,
- LangToSuffixes<"llvm-bitcode", ["bc"]>,
- LangToSuffixes<"object-code", ["o"]>,
- LangToSuffixes<"executable", ["out"]>
- ]>;
Removed: llvm/trunk/tools/llvmc2/examples/Clang.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/examples/Clang.td?rev=56966&view=auto
==============================================================================
--- llvm/trunk/tools/llvmc2/examples/Clang.td (original)
+++ llvm/trunk/tools/llvmc2/examples/Clang.td (removed)
@@ -1,86 +0,0 @@
-// A (first stab at a) replacement for the Clang's ccc script.
-// To compile, use this command:
-// make TOOLNAME=ccc2 GRAPH=examples/Clang.td
-
-include "Common.td"
-
-
-// TOFIX: Add an explicit option list for aliases and things like this.
-def Options : OptionList<[
-(switch_option "E",
- (help "Stop after the preprocessing stage, do not run the compiler"))
-]>;
-
-class clang_base<string language, dag cmdline> : Tool<
-[(in_language language),
- (out_language "llvm-bitcode"),
- (output_suffix "bc"),
- (cmd_line cmdline),
- (switch_option "E", (stop_compilation), (output_suffix "i")),
- (sink)
-]>;
-
-def clang_c : clang_base<"c",
-(case
-(switch_on "E"),
- (case
- (not_empty "o"),
- "clang -E -x c $INFILE -o $OUTFILE",
- (default),
- "clang -E -x c $INFILE"),
-(default),
- "clang -emit-llvm-bc -x c $INFILE -o $OUTFILE")>;
-
-def clang_cpp : clang_base<"c++",
-(case
-(switch_on "E"),
- (case
- (not_empty "o"),
- "clang -E -x c++ $INFILE -o $OUTFILE",
- (default),
- "clang -E -x c++ $INFILE"),
-(default),
- "clang -emit-llvm-bc -x c++ $INFILE -o $OUTFILE")>;
-
-def clang_objective_c : clang_base<"objective-c",
-(case
-(switch_on "E"),
- (case
- (not_empty "o"),
- "clang -E -x objective-c $INFILE -o $OUTFILE",
- (default),
- "clang -E -x objective-c $INFILE"),
-(default),
- "clang -emit-llvm-bc -x objective-c $INFILE -o $OUTFILE")>;
-
-// Default linker
-def llvm_ld : Tool<
-[(in_language "llvm-bitcode"),
- (out_language "executable"),
- (output_suffix "out"),
- (cmd_line "llvm-ld -native -disable-internalize $INFILE -o $OUTFILE"),
- (prefix_list_option "L", (forward), (help "Specify a library search path")),
- (join)
-]>;
-
-// Language map
-
-def LanguageMap : LanguageMap<
- [LangToSuffixes<"c++", ["cc", "cp", "cxx", "cpp", "CPP", "c++", "C"]>,
- LangToSuffixes<"c", ["c"]>,
- LangToSuffixes<"objective-c", ["m"]>,
- LangToSuffixes<"c-cpp-output", ["i"]>,
- LangToSuffixes<"objective-c-cpp-output", ["mi"]>
- ]>;
-
-// Compilation graph
-
-def CompilationGraph : CompilationGraph<[
- Edge<root, clang_c>,
- Edge<root, clang_cpp>,
- Edge<root, clang_objective_c>,
- Edge<clang_c, llvm_ld>,
- Edge<clang_cpp, llvm_ld>,
- Edge<clang_objective_c, llvm_ld>
- ]>;
-
Added: llvm/trunk/tools/llvmc2/plugins/Base/AutoGenerated.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/plugins/Base/AutoGenerated.cpp?rev=56967&view=auto
==============================================================================
--- llvm/trunk/tools/llvmc2/plugins/Base/AutoGenerated.cpp (added)
+++ llvm/trunk/tools/llvmc2/plugins/Base/AutoGenerated.cpp Thu Oct 2 16:15:05 2008
@@ -0,0 +1 @@
+#include "AutoGenerated.inc"
Copied: llvm/trunk/tools/llvmc2/plugins/Base/Base.td (from r56965, llvm/trunk/tools/llvmc2/Graph.td)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/plugins/Base/Base.td?p2=llvm/trunk/tools/llvmc2/plugins/Base/Base.td&p1=llvm/trunk/tools/llvmc2/Graph.td&r1=56965&r2=56967&rev=56967&view=diff
==============================================================================
--- llvm/trunk/tools/llvmc2/Graph.td (original)
+++ llvm/trunk/tools/llvmc2/plugins/Base/Base.td Thu Oct 2 16:15:05 2008
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-include "Common.td"
-include "Tools.td"
+include "llvm/CompilerDriver/Common.td"
+include "llvm/CompilerDriver/Tools.td"
// Toolchains
Copied: llvm/trunk/tools/llvmc2/plugins/Base/Makefile (from r56965, llvm/trunk/tools/llvmc2/plugins/Hello/Makefile)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/plugins/Base/Makefile?p2=llvm/trunk/tools/llvmc2/plugins/Base/Makefile&p1=llvm/trunk/tools/llvmc2/plugins/Hello/Makefile&r1=56965&r2=56967&rev=56967&view=diff
==============================================================================
--- llvm/trunk/tools/llvmc2/plugins/Hello/Makefile (original)
+++ llvm/trunk/tools/llvmc2/plugins/Base/Makefile Thu Oct 2 16:15:05 2008
@@ -1,4 +1,4 @@
-##===- lib/Transforms/Hello/Makefile -----------------------*- Makefile -*-===##
+##===- tools/llvmc2/plugins/Base/Makefile ------------------*- Makefile -*-===##
#
# The LLVM Compiler Infrastructure
#
@@ -7,11 +7,6 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../../../..
-LIBRARYNAME = LLVMCHello
-LOADABLE_MODULE = 1
-REQUIRES_EH = 1
-USEDLIBS =
-
-include $(LEVEL)/Makefile.common
+LLVMC_PLUGIN = Base
+include ../Makefile.common
Added: llvm/trunk/tools/llvmc2/plugins/Clang/AutoGenerated.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/plugins/Clang/AutoGenerated.cpp?rev=56967&view=auto
==============================================================================
--- llvm/trunk/tools/llvmc2/plugins/Clang/AutoGenerated.cpp (added)
+++ llvm/trunk/tools/llvmc2/plugins/Clang/AutoGenerated.cpp Thu Oct 2 16:15:05 2008
@@ -0,0 +1 @@
+#include "AutoGenerated.inc"
Copied: llvm/trunk/tools/llvmc2/plugins/Clang/Clang.td (from r56965, llvm/trunk/tools/llvmc2/examples/Clang.td)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/plugins/Clang/Clang.td?p2=llvm/trunk/tools/llvmc2/plugins/Clang/Clang.td&p1=llvm/trunk/tools/llvmc2/examples/Clang.td&r1=56965&r2=56967&rev=56967&view=diff
==============================================================================
--- llvm/trunk/tools/llvmc2/examples/Clang.td (original)
+++ llvm/trunk/tools/llvmc2/plugins/Clang/Clang.td Thu Oct 2 16:15:05 2008
@@ -1,11 +1,11 @@
// A (first stab at a) replacement for the Clang's ccc script.
// To compile, use this command:
-// make TOOLNAME=ccc2 GRAPH=examples/Clang.td
+// cd $LLVMC2_DIR
+// make TOOLNAME=ccc2 BUILTIN_PLUGINS=Clang
-include "Common.td"
+include "llvm/CompilerDriver/Common.td"
-// TOFIX: Add an explicit option list for aliases and things like this.
def Options : OptionList<[
(switch_option "E",
(help "Stop after the preprocessing stage, do not run the compiler"))
Copied: llvm/trunk/tools/llvmc2/plugins/Clang/Makefile (from r56965, llvm/trunk/tools/llvmc2/plugins/Hello/Makefile)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/plugins/Clang/Makefile?p2=llvm/trunk/tools/llvmc2/plugins/Clang/Makefile&p1=llvm/trunk/tools/llvmc2/plugins/Hello/Makefile&r1=56965&r2=56967&rev=56967&view=diff
==============================================================================
--- llvm/trunk/tools/llvmc2/plugins/Hello/Makefile (original)
+++ llvm/trunk/tools/llvmc2/plugins/Clang/Makefile Thu Oct 2 16:15:05 2008
@@ -1,4 +1,4 @@
-##===- lib/Transforms/Hello/Makefile -----------------------*- Makefile -*-===##
+##===- tools/llvmc2/plugins/Clang/Makefile -----------------*- Makefile -*-===##
#
# The LLVM Compiler Infrastructure
#
@@ -7,11 +7,7 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../../../..
-LIBRARYNAME = LLVMCHello
-LOADABLE_MODULE = 1
-REQUIRES_EH = 1
-USEDLIBS =
+LLVMC_PLUGIN = Clang
-include $(LEVEL)/Makefile.common
+include ../Makefile.common
Modified: llvm/trunk/tools/llvmc2/plugins/Hello/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/plugins/Hello/Makefile?rev=56967&r1=56966&r2=56967&view=diff
==============================================================================
--- llvm/trunk/tools/llvmc2/plugins/Hello/Makefile (original)
+++ llvm/trunk/tools/llvmc2/plugins/Hello/Makefile Thu Oct 2 16:15:05 2008
@@ -1,4 +1,4 @@
-##===- lib/Transforms/Hello/Makefile -----------------------*- Makefile -*-===##
+##===- tools/llvmc2/plugins/Hello/Makefile -----------------*- Makefile -*-===##
#
# The LLVM Compiler Infrastructure
#
@@ -7,11 +7,6 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../../../..
-LIBRARYNAME = LLVMCHello
-LOADABLE_MODULE = 1
-REQUIRES_EH = 1
-USEDLIBS =
-
-include $(LEVEL)/Makefile.common
+LLVMC_PLUGIN = Hello
+include ../Makefile.common
More information about the llvm-commits
mailing list