[llvm-commits] [llvm] r69474 - in /llvm/trunk: autoconf/configure.ac tools/llvmc/plugins/Base/Base.td tools/llvmc/plugins/Base/Base.td.in
Bill Wendling
isanbard at gmail.com
Sat Apr 18 14:46:07 PDT 2009
Mikhail,
These are yet again causing this failure:
/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm.obj/Release/bin/
tblgen -I /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm.src/
tools/llvmc/plugins/Base -I /Volumes/Sandbox/Buildbot/llvm/full-llvm/
build/llvm.src/include -I /Volumes/Sandbox/Buildbot/llvm/full-llvm/
build/llvm.src/include -I /Volumes/Sandbox/Buildbot/llvm/full-llvm/
build/llvm.src/lib/Target -gen-llvmc -o /Volumes/Sandbox/Buildbot/
llvm/full-llvm/build/llvm.obj/tools/llvmc/plugins/Base/Release/
AutoGenerated.inc.tmp /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/
llvm.obj/tools/llvmc/plugins/Base/Release/.dir
Parsing /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm.obj/tools/
llvmc/plugins/Base/Release/.dir:1: Unexpected input at top level
Sat Apr 18 14:25:44 PDT 2009
^
make[4]: *** [/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm.obj/
tools/llvmc/plugins/Base/Release/AutoGenerated.inc.tmp] Error 1
make[3]: *** [all] Error 1
-bw
On Apr 18, 2009, at 1:55 PM, Mikhail Glushenkov wrote:
> Author: foldr
> Date: Sat Apr 18 15:55:28 2009
> New Revision: 69474
>
> URL: http://llvm.org/viewvc/llvm-project?rev=69474&view=rev
> Log:
> Add a configure check for llvm-gcc (reapply).
>
> Added:
> llvm/trunk/tools/llvmc/plugins/Base/Base.td.in
> - copied, changed from r69453, llvm/trunk/tools/llvmc/plugins/
> Base/Base.td
> Removed:
> llvm/trunk/tools/llvmc/plugins/Base/Base.td
> Modified:
> llvm/trunk/autoconf/configure.ac
>
> Modified: llvm/trunk/autoconf/configure.ac
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/configure.ac?rev=69474&r1=69473&r2=69474&view=diff
>
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- llvm/trunk/autoconf/configure.ac (original)
> +++ llvm/trunk/autoconf/configure.ac Sat Apr 18 15:55:28 2009
> @@ -1065,6 +1065,9 @@
> dnl Configure doxygen's configuration file
> AC_CONFIG_FILES([docs/doxygen.cfg])
>
> +dnl Configure llvmc's Base plugin
> +AC_CONFIG_FILES([tools/llvmc/plugins/Base/Base.td])
> +
> dnl Do the first stage of configuration for llvm-config.in.
> AC_CONFIG_FILES([tools/llvm-config/llvm-config.in])
>
>
> Removed: llvm/trunk/tools/llvmc/plugins/Base/Base.td
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc/plugins/Base/Base.td?rev=69473&view=auto
>
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- llvm/trunk/tools/llvmc/plugins/Base/Base.td (original)
> +++ llvm/trunk/tools/llvmc/plugins/Base/Base.td (removed)
> @@ -1,202 +0,0 @@
> -//===- Base.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 "llvm/CompilerDriver/Common.td"
> -
> -// Options
> -
> -def OptList : OptionList<[
> - (switch_option "emit-llvm",
> - (help "Emit LLVM .ll files instead of native object files")),
> - (switch_option "E",
> - (help "Stop after the preprocessing stage, do not run the
> compiler")),
> - (switch_option "fsyntax-only",
> - (help "Stop after checking the input for syntax errors")),
> - (switch_option "opt",
> - (help "Enable opt")),
> - (switch_option "S",
> - (help "Stop after compilation, do not assemble")),
> - (switch_option "c",
> - (help "Compile and assemble, but do not link")),
> - (switch_option "pthread",
> - (help "Enable threads")),
> - (parameter_option "linker",
> - (help "Choose linker (possible values: gcc, g++)")),
> - (parameter_list_option "include",
> - (help "Include the named file prior to preprocessing")),
> - (prefix_list_option "I",
> - (help "Add a directory to include path")),
> - (prefix_list_option "Wa,",
> - (help "Pass options to assembler")),
> - (prefix_list_option "Wllc,",
> - (help "Pass options to llc")),
> - (prefix_list_option "L",
> - (help "Add a directory to link path")),
> - (prefix_list_option "l",
> - (help "Search a library when linking")),
> - (prefix_list_option "Wl,",
> - (help "Pass options to linker")),
> - (prefix_list_option "Wo,",
> - (help "Pass options to opt"))
> -]>;
> -
> -// Tools
> -
> -class llvm_gcc_based <string cmd_prefix, string in_lang, string
> E_ext> : Tool<
> -[(in_language in_lang),
> - (out_language "llvm-bitcode"),
> - (output_suffix "bc"),
> - (cmd_line (case
> - (switch_on "E"),
> - (case (not_empty "o"),
> - !strconcat(cmd_prefix, " -E $INFILE -o
> $OUTFILE"),
> - (default),
> - !strconcat(cmd_prefix, " -E $INFILE")),
> - (switch_on "fsyntax-only"),
> - !strconcat(cmd_prefix, " -fsyntax-only $INFILE"),
> - (and (switch_on "S"), (switch_on "emit-llvm")),
> - !strconcat(cmd_prefix, " -S $INFILE -o $OUTFILE -emit-
> llvm"),
> - (default),
> - !strconcat(cmd_prefix, " -c $INFILE -o $OUTFILE -emit-
> llvm"))),
> - (actions
> - (case
> - (switch_on "E"), [(stop_compilation), (output_suffix
> E_ext)],
> - (and (switch_on "emit-llvm"), (switch_on "S")),
> - [(output_suffix "ll"), (stop_compilation)],
> - (and (switch_on "emit-llvm"), (switch_on "c")),
> (stop_compilation),
> - (switch_on "fsyntax-only"), (stop_compilation),
> - (not_empty "include"), (forward "include"),
> - (not_empty "I"), (forward "I"))),
> - (sink)
> -]>;
> -
> -def llvm_gcc_c : llvm_gcc_based<"llvm-gcc -x c", "c", "i">;
> -def llvm_gcc_cpp : llvm_gcc_based<"llvm-g++ -x c++", "c++", "i">;
> -def llvm_gcc_m : llvm_gcc_based<"llvm-gcc -x objective-c",
> "objective-c", "mi">;
> -def llvm_gcc_mxx : llvm_gcc_based<"llvm-gcc -x objective-c++",
> - "objective-c++", "mi">;
> -
> -def opt : Tool<
> -[(in_language "llvm-bitcode"),
> - (out_language "llvm-bitcode"),
> - (output_suffix "bc"),
> - (actions (case (not_empty "Wo,"), (unpack_values "Wo,"))),
> - (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 llvm_gcc_assembler : Tool<
> -[(in_language "assembler"),
> - (out_language "object-code"),
> - (output_suffix "o"),
> - (cmd_line "llvm-gcc -c -x assembler $INFILE -o $OUTFILE"),
> - (actions (case
> - (switch_on "c"), (stop_compilation),
> - (not_empty "Wa,"), (unpack_values "Wa,")))
> -]>;
> -
> -def llc : Tool<
> -[(in_language "llvm-bitcode"),
> - (out_language "assembler"),
> - (output_suffix "s"),
> - (cmd_line "llc -f $INFILE -o $OUTFILE"),
> - (actions (case
> - (switch_on "S"), (stop_compilation),
> - (not_empty "Wllc,"), (unpack_values "Wllc,")))
> -]>;
> -
> -// Base class for linkers
> -class llvm_gcc_based_linker <string cmd_prefix> : Tool<
> -[(in_language "object-code"),
> - (out_language "executable"),
> - (output_suffix "out"),
> - (cmd_line !strconcat(cmd_prefix, " $INFILE -o $OUTFILE")),
> - (join),
> - (actions (case
> - (switch_on "pthread"), (append_cmd "-lpthread"),
> - (not_empty "L"), (forward "L"),
> - (not_empty "l"), (forward "l"),
> - (not_empty "Wl,"), (unpack_values "Wl,")))
> -]>;
> -
> -// Default linker
> -def llvm_gcc_linker : llvm_gcc_based_linker<"llvm-gcc">;
> -// Alternative linker for C++
> -def llvm_gcc_cpp_linker : llvm_gcc_based_linker<"llvm-g++">;
> -
> -// Language map
> -
> -def LanguageMap : LanguageMap<
> - [LangToSuffixes<"c++", ["cc", "cp", "cxx", "cpp", "CPP", "c++",
> "C"]>,
> - LangToSuffixes<"c", ["c"]>,
> - LangToSuffixes<"c-cpp-output", ["i"]>,
> - LangToSuffixes<"objective-c-cpp-output", ["mi"]>,
> - LangToSuffixes<"objective-c++", ["mm"]>,
> - LangToSuffixes<"objective-c", ["m"]>,
> - LangToSuffixes<"assembler", ["s"]>,
> - LangToSuffixes<"assembler-with-cpp", ["S"]>,
> - LangToSuffixes<"llvm-assembler", ["ll"]>,
> - LangToSuffixes<"llvm-bitcode", ["bc"]>,
> - LangToSuffixes<"object-code", ["o"]>,
> - LangToSuffixes<"executable", ["out"]>
> - ]>;
> -
> -// Compilation graph
> -
> -def CompilationGraph : CompilationGraph<[
> - Edge<"root", "llvm_gcc_c">,
> - Edge<"root", "llvm_gcc_assembler">,
> - Edge<"root", "llvm_gcc_cpp">,
> - Edge<"root", "llvm_gcc_m">,
> - Edge<"root", "llvm_gcc_mxx">,
> - Edge<"root", "llvm_as">,
> -
> - Edge<"llvm_gcc_c", "llc">,
> - Edge<"llvm_gcc_cpp", "llc">,
> - Edge<"llvm_gcc_m", "llc">,
> - Edge<"llvm_gcc_mxx", "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_gcc_m", "opt", (case (switch_on "opt"),
> (inc_weight))>,
> - OptionalEdge<"llvm_gcc_mxx", "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
> - (or (input_languages_contain "c++"),
> - (input_languages_contain "objective-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
> - (or (input_languages_contain "c++"),
> - (input_languages_contain "objective-c++")),
> - (inc_weight),
> - (or (parameter_equals "linker", "g++"),
> - (parameter_equals "linker", "c++")),
> (inc_weight))>
> - ]>;
>
> Copied: llvm/trunk/tools/llvmc/plugins/Base/Base.td.in (from r69453,
> llvm/trunk/tools/llvmc/plugins/Base/Base.td)
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc/plugins/Base/Base.td.in?p2=llvm/trunk/tools/llvmc/plugins/Base/Base.td.in&p1=llvm/trunk/tools/llvmc/plugins/Base/Base.td&r1=69453&r2=69474&rev=69474&view=diff
>
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- llvm/trunk/tools/llvmc/plugins/Base/Base.td (original)
> +++ llvm/trunk/tools/llvmc/plugins/Base/Base.td.in Sat Apr 18
> 15:55:28 2009
> @@ -80,10 +80,10 @@
> (sink)
> ]>;
>
> -def llvm_gcc_c : llvm_gcc_based<"llvm-gcc -x c", "c", "i">;
> -def llvm_gcc_cpp : llvm_gcc_based<"llvm-g++ -x c++", "c++", "i">;
> -def llvm_gcc_m : llvm_gcc_based<"llvm-gcc -x objective-c",
> "objective-c", "mi">;
> -def llvm_gcc_mxx : llvm_gcc_based<"llvm-gcc -x objective-c++",
> +def llvm_gcc_c : llvm_gcc_based<"@LLVMGCC@ -x c", "c", "i">;
> +def llvm_gcc_cpp : llvm_gcc_based<"@LLVMGXX@ -x c++", "c++", "i">;
> +def llvm_gcc_m : llvm_gcc_based<"@LLVMGCC@ -x objective-c",
> "objective-c", "mi">;
> +def llvm_gcc_mxx : llvm_gcc_based<"@LLVMGCC@ -x objective-c++",
> "objective-c++", "mi">;
>
> def opt : Tool<
> @@ -105,7 +105,7 @@
> [(in_language "assembler"),
> (out_language "object-code"),
> (output_suffix "o"),
> - (cmd_line "llvm-gcc -c -x assembler $INFILE -o $OUTFILE"),
> + (cmd_line "@LLVMGCC@ -c -x assembler $INFILE -o $OUTFILE"),
> (actions (case
> (switch_on "c"), (stop_compilation),
> (not_empty "Wa,"), (unpack_values "Wa,")))
> @@ -136,9 +136,9 @@
> ]>;
>
> // Default linker
> -def llvm_gcc_linker : llvm_gcc_based_linker<"llvm-gcc">;
> +def llvm_gcc_linker : llvm_gcc_based_linker<"@LLVMGCC@">;
> // Alternative linker for C++
> -def llvm_gcc_cpp_linker : llvm_gcc_based_linker<"llvm-g++">;
> +def llvm_gcc_cpp_linker : llvm_gcc_based_linker<"@LLVMGXX@">;
>
> // Language map
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
More information about the llvm-commits
mailing list