For PR514:

* Make sure the "etcdir" gets checked for configuration files so that
  the installed location for config files is checked.
* Remove the st.in file (moved to projects/Stacker/tools/stkrc)

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@22135 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/tools/llvmc/Configuration.cpp b/tools/llvmc/Configuration.cpp
index 3b9d221fe358dcad644c278c38b506ae24a1256a..e29ece2058b7a86c9bc4bfdafa0f49efa785df24 100644 (file)
--- a/tools/llvmc/Configuration.cpp
+++ b/tools/llvmc/Configuration.cpp
@@ -562,7 +562,7 @@ LLVMC_ConfigDataProvider::ReadConfigData(const std::string& ftype) {
         if (!confFile.readable())
           confFile.clear();
       }
-      if (!confFile.isEmpty()) {
+      if (confFile.isEmpty()) {
         // Okay, try the LLVM installation directory
         confFile = sys::Path::GetLLVMConfigDir();
         confFile.appendFile(ftype);

diff --git a/tools/llvmc/st.in b/tools/llvmc/st.in
deleted file mode 100644 (file)
index 7bb324e..0000000
--- a/tools/llvmc/st.in
+++ /dev/null
@@ -1,63 +0,0 @@
-# Stacker configuration file for llvmc
-
-##########################################################
-# Language definitions
-##########################################################
-  lang.name=Stacker 
-  lang.opt1=-O1
-  lang.opt2=-O2
-  lang.opt3=-O3
-  lang.opt4=-O4
-  lang.opt5=-O5
-
-##########################################################
-# Pre-processor definitions
-##########################################################
-
-  # Stacker doesn't have a preprocessor but the following
-  # allows the -E option to be supported
-  preprocessor.command=cp %in% %out%
-  preprocessor.required=false
-
-##########################################################
-# Translator definitions
-##########################################################
-
-  # To compile stacker source, we just run the stacker
-  # compiler with a default stack size of 2048 entries.
-  translator.command=@LLVM_BINDIR@/stkrc -s 2048 %in% -f -o %out% %opt% \
-    %time% %stats% %args%
-
-  # stkrc doesn't preprocess but we set this to true so
-  # that we don't run the cp command by default.
-  translator.preprocesses=true
-
-  # The translator is required to run.
-  translator.required=false
-
-  # stkrc doesn't handle the -On options
-  translator.output=bytecode
-
-##########################################################
-# Optimizer definitions
-##########################################################
-  
-  # For optimization, we use the LLVM "opt" program
-  optimizer.command=@LLVM_BINDIR@/stkrc -s 2048 %in% -f -o %out% %opt% \
-    %time% %stats% %args%
-
-  optimizer.required = yes
-
-  # opt doesn't translate
-  optimizer.translates = yes
-
-  # opt doesn't preprocess
-  optimizer.preprocesses=yes
-
-  # opt produces bytecode
-  optimizer.output = bc
-
-##########################################################
-# Assembler definitions
-##########################################################
-  assembler.command=@LLVM_BINDIR@/llc %in% -o %out% %target% %time% %stats%