Temporary revert r57567 and unbreak the build.

llvm-svn: 57578
This commit is contained in:
Anton Korobeynikov 2008-10-15 14:22:06 +00:00
parent fcab7d3d0c
commit 981c5cde30
7 changed files with 8 additions and 56 deletions

View File

@ -11,7 +11,7 @@ LEVEL = ../..
BUILTIN_PLUGINS = Base BUILTIN_PLUGINS = Base
DRIVER_NAME = llvmc2 DRIVER_NAME = llvmc2
DIRS = plugins driver DIRS = plugins driver
export BUILTIN_PLUGINS export BUILTIN_PLUGINS
export DRIVER_NAME export DRIVER_NAME

View File

@ -1 +0,0 @@
#include "AutoGenerated.inc"

View File

@ -1 +0,0 @@
#include "AutoGenerated.inc"

View File

@ -12,7 +12,7 @@ ifndef LLVMC_PLUGIN
LEVEL = ../../.. LEVEL = ../../..
DIRS = $(BUILTIN_PLUGINS) DIRS = $(BUILTIN_PLUGINS)
# TOFIX: How to build DSO versions of plugins? # TOFIX: DSO versions of plugins are not built
export BUILTIN_LLVMC_PLUGIN=1 export BUILTIN_LLVMC_PLUGIN=1
@ -22,28 +22,25 @@ else # LLVMC_PLUGIN
LEVEL = ../../../.. LEVEL = ../../../..
LIBRARYNAME := $(patsubst %,LLVMC%,$(LLVMC_PLUGIN)) LIBRARYNAME = $(patsubst %,LLVMC%,$(LLVMC_PLUGIN))
TOOLS_SOURCE = $(wildcard $(PROJ_SRC_DIR)/*.td)
REQUIRES_EH = 1 REQUIRES_EH = 1
ifndef BUILTIN_LLVMC_PLUGIN ifndef BUILTIN_LLVMC_PLUGIN
LOADABLE_MODULE = 1 LOADABLE_MODULE = 1
endif endif
# This probably breaks the build with $ObjDir != $SrcDir ifneq ($(TOOLS_SOURCE),"")
TOOLS_SOURCE := $(strip $(wildcard *.td)) BUILD_AUTOGENERATED_INC=1
ifneq ($(TOOLS_SOURCE),)
BUILD_AUTOGENERATED_INC = 1
BUILT_SOURCES = AutoGenerated.inc BUILT_SOURCES = AutoGenerated.inc
endif endif
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common
# TOFIX: This probably should go into Makefile.rules # TOFIX: This should go into Makefile.rules
ifdef BUILD_AUTOGENERATED_INC ifdef BUILD_AUTOGENERATED_INC
TD_COMMON :=$(strip $(wildcard \ TD_COMMON = $(wildcard $(LLVM_SRC_ROOT)/include/llvm/CompilerDriver/*.td)
$(LLVM_SRC_ROOT)/include/llvm/CompilerDriver/*.td))
$(ObjDir)/AutoGenerated.inc.tmp: $(TOOLS_SOURCE) $(ObjDir)/.dir \ $(ObjDir)/AutoGenerated.inc.tmp: $(TOOLS_SOURCE) $(ObjDir)/.dir \
$(TBLGEN) $(TD_COMMON) $(TBLGEN) $(TD_COMMON)

View File

@ -1,12 +0,0 @@
##===- tools/llvmc2/plugins/Simple/Makefile ------------------*- Makefile -*-===##
#
# The LLVM Compiler Infrastructure
#
# This file is distributed under the University of Illinois Open Source
# License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
LLVMC_PLUGIN = Simple
include ../Makefile

View File

@ -1 +0,0 @@
#include "AutoGenerated.inc"

View File

@ -1,30 +0,0 @@
// A simple wrapper for gcc.
// To compile, use this command:
//
// $ cd $LLVMC2_DIR
// $ make DRIVER_NAME=mygcc BUILTIN_PLUGINS=Simple
//
// To build this plugin as a dynamic library:
//
// $ cd $LLVMC2_DIR
// $ make BUILTIN_PLUGINS=""
// $ cd plugins/Simple
// $ make
//
// Run as:
//
// $ llvmc2 -load $LLVM_DIR/Release/lib/LLVMCSimple.so
include "llvm/CompilerDriver/Common.td"
def gcc : Tool<
[(in_language "c"),
(out_language "executable"),
(output_suffix "out"),
(cmd_line "gcc $INFILE -o $OUTFILE"),
(sink)
]>;
def LanguageMap : LanguageMap<[LangToSuffixes<"c", ["c"]>]>;
def CompilationGraph : CompilationGraph<[Edge<root, gcc>]>;