replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert 69474 and 69475. They are causing failures during a bootstrap on Darwin. 

llvm-svn: 69478
This commit is contained in:
Bill Wendling 2009-04-18 21:45:27 +00:00
parent 5c926f3660
commit 4d10aae8c2
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/autoconf/configure.ac
View File

@ -1065,9 +1065,6 @@ AC_CONFIG_FILES([llvm.spec])
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])

4
llvm/configure vendored
View File

@ -34003,9 +34003,6 @@ ac_config_files="$ac_config_files llvm.spec"
ac_config_files="$ac_config_files docs/doxygen.cfg"
ac_config_files="$ac_config_files tools/llvmc/plugins/Base/Base.td"
ac_config_files="$ac_config_files tools/llvm-config/llvm-config.in"
@ -34620,7 +34617,6 @@ do
"Makefile.config") CONFIG_FILES="$CONFIG_FILES Makefile.config" ;;
"llvm.spec") CONFIG_FILES="$CONFIG_FILES llvm.spec" ;;
"docs/doxygen.cfg") CONFIG_FILES="$CONFIG_FILES docs/doxygen.cfg" ;;
"tools/llvmc/plugins/Base/Base.td") CONFIG_FILES="$CONFIG_FILES tools/llvmc/plugins/Base/Base.td" ;;
"tools/llvm-config/llvm-config.in") CONFIG_FILES="$CONFIG_FILES tools/llvm-config/llvm-config.in" ;;
"setup") CONFIG_COMMANDS="$CONFIG_COMMANDS setup" ;;
"Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;;

14
llvm/tools/llvmc/plugins/Base/Base.td.in → llvm/tools/llvmc/plugins/Base/Base.td
View File

@ -80,10 +80,10 @@ class llvm_gcc_based <string cmd_prefix, string in_lang, string E_ext> : Tool<
(sink)
]>;
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++",
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<
@ -105,7 +105,7 @@ def llvm_gcc_assembler : Tool<
[(in_language "assembler"),
(out_language "object-code"),
(output_suffix "o"),
(cmd_line "@LLVMGCC@ -c -x assembler $INFILE -o $OUTFILE"),
(cmd_line "llvm-gcc -c -x assembler $INFILE -o $OUTFILE"),
(actions (case
(switch_on "c"), (stop_compilation),
(not_empty "Wa,"), (unpack_values "Wa,")))
@ -136,9 +136,9 @@ class llvm_gcc_based_linker <string cmd_prefix> : Tool<
]>;
// Default linker
def llvm_gcc_linker : llvm_gcc_based_linker<"@LLVMGCC@">;
def llvm_gcc_linker : llvm_gcc_based_linker<"llvm-gcc">;
// Alternative linker for C++
def llvm_gcc_cpp_linker : llvm_gcc_based_linker<"@LLVMGXX@">;
def llvm_gcc_cpp_linker : llvm_gcc_based_linker<"llvm-g++">;
// Language map