X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fmain%2FCodeOutput.lhs;h=b58b7cd395933bccb9c62a6fd4498beda69629cf;hp=7cfc2e9be21fb6aee943736cecd71499c8910f5e;hb=f537dd87c4a07526e2b1fc1bd1c125d652833641;hpb=066b369de2c6f7da03c88206288dca29ab061b31

diff --git a/compiler/main/CodeOutput.lhs b/compiler/main/CodeOutput.lhs
index 7cfc2e9..b58b7cd 100644
--- a/compiler/main/CodeOutput.lhs
+++ b/compiler/main/CodeOutput.lhs
@@ -13,12 +13,6 @@ import LlvmCodeGen ( llvmCodeGen )
 
 import UniqSupply	( mkSplitUniqSupply )
 
-#ifdef JAVA
-import JavaGen		( javaGen )
-import qualified PrintJava
-import OccurAnal	( occurAnalyseBinds )
-#endif
-
 import Finder		( mkStubPaths )
 import PprC		( writeCs )
 import CmmLint		( cmmLint )
@@ -83,12 +77,6 @@ codeOutput dflags this_mod location foreign_stubs pkg_deps flat_abstractC
              HscAsm         -> outputAsm dflags filenm flat_abstractC;
              HscC           -> outputC dflags filenm flat_abstractC pkg_deps;
              HscLlvm        -> outputLlvm dflags filenm flat_abstractC;
-             HscJava        -> 
-#ifdef JAVA
-			       outputJava dflags filenm mod_name tycons core_binds;
-#else
-                               panic "Java support not compiled into this ghc";
-#endif
              HscNothing     -> panic "codeOutput: HscNothing"
 	  }
 	; return stubs_exist
@@ -156,8 +144,7 @@ outputAsm dflags filenm flat_absC
                  nativeCodeGen dflags f ncg_uniqs flat_absC
 
  | otherwise
-  = pprPanic "This compiler was built without a native code generator"
-             (text "Use -fvia-C instead")
+  = panic "This compiler was built without a native code generator"
 \end{code}
 
 
@@ -177,26 +164,6 @@ outputLlvm dflags filenm flat_absC
 
 %************************************************************************
 %*									*
-\subsection{Java}
-%*									*
-%************************************************************************
-
-\begin{code}
-#ifdef JAVA
-outputJava dflags filenm mod tycons core_binds
-  = doOutput filenm (\ f -> printForUser f alwaysQualify pp_java)
-	-- User style printing for now to keep indentation
-  where
-    occ_anal_binds = occurAnalyseBinds core_binds
-	-- Make sure we have up to date dead-var information
-    java_code = javaGen mod [{- Should be imports-}] tycons occ_anal_binds
-    pp_java   = PrintJava.compilationUnit java_code
-#endif
-\end{code}
-
-
-%************************************************************************
-%*									*
 \subsection{Foreign import/export}
 %*									*
 %************************************************************************