aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReid Spencer <rspencer@reidspencer.com>2004-08-24 14:24:14 +0000
committerReid Spencer <rspencer@reidspencer.com>2004-08-24 14:24:14 +0000
commit01b77f9c0811ca8ae67a5a46db48c50777ef6678 (patch)
tree8de70d0b30a615489a81b5bcf01c8e162c809314
parent2cf17a4f0fdc593cd2e98bf9b407deaf0535cb46 (diff)
Adjustments for changes in the configuration language.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16026 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--tools/llvmc/ll8
-rw-r--r--tools/llvmc/st20
2 files changed, 9 insertions, 19 deletions
diff --git a/tools/llvmc/ll b/tools/llvmc/ll
index 3811734c93..f9dc858bec 100644
--- a/tools/llvmc/ll
+++ b/tools/llvmc/ll
@@ -1,14 +1,12 @@
# LLVM Assembly Config File For llvmc
+ version="1.0"
lang.name=LLVM Assembly
preprocessor.command=
preprocessor.required=false
translator.command=llvm-as %in% -o %out%
- translator.groks_dash_O=no
translator.optimizes=no
translator.preprocesses=true
translator.required=TRUE
- optimizer.command=opt %in% -o %out%
- optimizer.groks_dash_O=no
- optimizer.groks_optimization=yes
+ optimizer.command=opt %in% -o %out% %opt% %args%
+ optimizer.translates=no
assembler.command=llc %in% -o %out%
- linker.command=llvm-link %in% -o %out%
diff --git a/tools/llvmc/st b/tools/llvmc/st
index e9a72ef5da..c08c8d1c7c 100644
--- a/tools/llvmc/st
+++ b/tools/llvmc/st
@@ -43,11 +43,8 @@
# The translator is required to run.
translator.required=true
- # stkrc doesn't do any optimization, it just translates
- translator.optimizes=no
-
# stkrc doesn't handle the -On options
- translator.groks_dash_O=no
+ translator.output=bytecode
##########################################################
# Optimizer definitions
@@ -57,8 +54,7 @@
optimizer.command=opt %in% -o %out% %opt% %time% %stats% \
%args%
- # opt doesn't (yet) grok -On
- optimizer.groks_dash_O=no
+ optimizer.required = true
# opt doesn't translate
optimizer.translates = no
@@ -66,14 +62,10 @@
# opt doesn't preprocess
optimizer.preprocesses=no
-##########################################################
-# Assembler definitions
-##########################################################
- assembler.command=llc %in% -o %out% %target% \
- "-regalloc=linearscan" %time% %stats%
+ # opt produces bytecode
+ optimizer.output = bc
##########################################################
-# Linker definitions
+# Assembler definitions
##########################################################
- linker.libs=stkr_runtime
- linker.paths=
+ assembler.command=llc %in% -o %out% %target% %time% %stats%