[pypy-svn] r64220 - in pypy/trunk/pypy/config: . test

[pedronis at codespeak.net]

Author: pedronis
Date: Fri Apr 17 10:46:04 2009
New Revision: 64220

Modified:
   pypy/trunk/pypy/config/test/test_config.py
   pypy/trunk/pypy/config/translationoption.py
Log:
remove references to llvm

Modified: pypy/trunk/pypy/config/test/test_config.py
==============================================================================
--- pypy/trunk/pypy/config/test/test_config.py	(original)
+++ pypy/trunk/pypy/config/test/test_config.py	Fri Apr 17 10:46:04 2009
@@ -299,11 +299,10 @@
         OptionDescription("s", '', [
             ChoiceOption("type_system", "", ["ll", "oo"], "ll"),
             ChoiceOption("backend", "",
-                         ["c", "llvm", "cli"], "llvm",
+                         ["c", "cli"], "c",
                          requires={
                              "c": [("s.type_system", "ll"),
                                    ("toplevel", True)],
-                             "llvm": [("s.type_system", "ll")],
                              "cli": [("s.type_system", "oo")],
                          })
         ])
@@ -314,7 +313,7 @@
 
 def test_choice_with_no_default():
     descr = OptionDescription("test", "", [
-        ChoiceOption("backend", "", ["c", "llvm"])])
+        ChoiceOption("backend", "", ["c", "cli"])])
     config = Config(descr)
     assert config.backend is None
     config.backend = "c"

Modified: pypy/trunk/pypy/config/translationoption.py
==============================================================================
--- pypy/trunk/pypy/config/translationoption.py	(original)
+++ pypy/trunk/pypy/config/translationoption.py	Fri Apr 17 10:46:04 2009
@@ -36,17 +36,10 @@
                  ["c", "cli", "jvm"], default="c",
                  requires={
                      "c":      [("translation.type_system", "lltype")],
-                     #"llvm":   [("translation.type_system", "lltype"),
-                     #           ("translation.backendopt.raisingop2direct_call", True),
-                     #           ],
                      "cli":    [("translation.type_system", "ootype")],
                      "jvm":    [("translation.type_system", "ootype")],
-                     #"js":     [("translation.type_system", "ootype")],
                      },
                  cmdline="-b --backend"),
-    #BoolOption("llvm_via_c", "compile llvm via C",
-    #           default=False, cmdline="--llvm-via-c",
-    #           requires=[("translation.backend", "llvm")]),
 
     # gc
     ChoiceOption("gc", "Garbage Collection Strategy",
@@ -85,16 +78,12 @@
                  cmdline="--gcrootfinder",
                  requires={
                      "shadowstack": [("translation.gctransformer", "framework")],
-                     #"llvmgc": [("translation.gctransformer", "framework"),
-                     #           ("translation.backend", "llvm"),
-                     #           ("translation.thread", False)],
                      "asmgcc": [("translation.gctransformer", "framework"),
                                 ("translation.backend", "c"),
                                 ("translation.thread", False)],
                     },
                  suggests={
                      "shadowstack": [("translation.gc", "generation")],
-                     #"llvmgc": [("translation.gc", "generation")],
                      "asmgcc": [("translation.gc", "generation")],
                  }),
 
@@ -255,14 +244,6 @@
                              ('translation.backendopt.constfold', False)])
     ]),
 
-    #OptionDescription("llvm", "GenLLVM options", [
-    #    BoolOption("debug", "Include the llops in the source as comments", default=False),
-    #    BoolOption("logging", "Log how long the various parts of llvm generation take", default=False),
-    #    BoolOption("isolate", "Perform an isolated import", default=True),
-    #    StrOption("opt_options", "Options passed to opt (influences level of optimization in LLVM)",
-    #                 default="-std-compile-opts"),
-    #]),
-
     OptionDescription("cli", "GenCLI options", [
         BoolOption("trace_calls", "Trace function calls", default=False,
                    cmdline="--cli-trace-calls"),