mirror of
				https://github.com/c64scene-ar/llvm-6502.git
				synced 2025-11-04 05:17:07 +00:00 
			
		
		
		
	Revert 69474 and 69475. They are causing failures during a bootstrap on Darwin.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@69478 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
		@@ -1065,9 +1065,6 @@ AC_CONFIG_FILES([llvm.spec])
 | 
				
			|||||||
dnl Configure doxygen's configuration file
 | 
					dnl Configure doxygen's configuration file
 | 
				
			||||||
AC_CONFIG_FILES([docs/doxygen.cfg])
 | 
					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.
 | 
					dnl Do the first stage of configuration for llvm-config.in.
 | 
				
			||||||
AC_CONFIG_FILES([tools/llvm-config/llvm-config.in])
 | 
					AC_CONFIG_FILES([tools/llvm-config/llvm-config.in])
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										4
									
								
								configure
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								configure
									
									
									
									
										vendored
									
									
								
							@@ -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 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"
 | 
					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" ;;
 | 
					    "Makefile.config") CONFIG_FILES="$CONFIG_FILES Makefile.config" ;;
 | 
				
			||||||
    "llvm.spec") CONFIG_FILES="$CONFIG_FILES llvm.spec" ;;
 | 
					    "llvm.spec") CONFIG_FILES="$CONFIG_FILES llvm.spec" ;;
 | 
				
			||||||
    "docs/doxygen.cfg") CONFIG_FILES="$CONFIG_FILES docs/doxygen.cfg" ;;
 | 
					    "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" ;;
 | 
					    "tools/llvm-config/llvm-config.in") CONFIG_FILES="$CONFIG_FILES tools/llvm-config/llvm-config.in" ;;
 | 
				
			||||||
    "setup") CONFIG_COMMANDS="$CONFIG_COMMANDS setup" ;;
 | 
					    "setup") CONFIG_COMMANDS="$CONFIG_COMMANDS setup" ;;
 | 
				
			||||||
    "Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;;
 | 
					    "Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -80,10 +80,10 @@ class llvm_gcc_based <string cmd_prefix, string in_lang, string E_ext> : Tool<
 | 
				
			|||||||
 (sink)
 | 
					 (sink)
 | 
				
			||||||
]>;
 | 
					]>;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def llvm_gcc_c : llvm_gcc_based<"@LLVMGCC@ -x c", "c", "i">;
 | 
					def llvm_gcc_c : llvm_gcc_based<"llvm-gcc -x c", "c", "i">;
 | 
				
			||||||
def llvm_gcc_cpp : llvm_gcc_based<"@LLVMGXX@ -x c++", "c++", "i">;
 | 
					def llvm_gcc_cpp : llvm_gcc_based<"llvm-g++ -x c++", "c++", "i">;
 | 
				
			||||||
def llvm_gcc_m : llvm_gcc_based<"@LLVMGCC@ -x objective-c", "objective-c", "mi">;
 | 
					def llvm_gcc_m : llvm_gcc_based<"llvm-gcc -x objective-c", "objective-c", "mi">;
 | 
				
			||||||
def llvm_gcc_mxx : llvm_gcc_based<"@LLVMGCC@ -x objective-c++",
 | 
					def llvm_gcc_mxx : llvm_gcc_based<"llvm-gcc -x objective-c++",
 | 
				
			||||||
                                  "objective-c++", "mi">;
 | 
					                                  "objective-c++", "mi">;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def opt : Tool<
 | 
					def opt : Tool<
 | 
				
			||||||
@@ -105,7 +105,7 @@ def llvm_gcc_assembler : Tool<
 | 
				
			|||||||
[(in_language "assembler"),
 | 
					[(in_language "assembler"),
 | 
				
			||||||
 (out_language "object-code"),
 | 
					 (out_language "object-code"),
 | 
				
			||||||
 (output_suffix "o"),
 | 
					 (output_suffix "o"),
 | 
				
			||||||
 (cmd_line "@LLVMGCC@ -c -x assembler $INFILE -o $OUTFILE"),
 | 
					 (cmd_line "llvm-gcc -c -x assembler $INFILE -o $OUTFILE"),
 | 
				
			||||||
 (actions (case
 | 
					 (actions (case
 | 
				
			||||||
          (switch_on "c"), (stop_compilation),
 | 
					          (switch_on "c"), (stop_compilation),
 | 
				
			||||||
          (not_empty "Wa,"), (unpack_values "Wa,")))
 | 
					          (not_empty "Wa,"), (unpack_values "Wa,")))
 | 
				
			||||||
@@ -136,9 +136,9 @@ class llvm_gcc_based_linker <string cmd_prefix> : Tool<
 | 
				
			|||||||
]>;
 | 
					]>;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Default linker
 | 
					// 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++
 | 
					// 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
 | 
					// Language map
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		Reference in New Issue
	
	Block a user