From 8815f0c06c1dcea2ecca14c98f0972ea9ed29d51 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Fri, 13 Mar 2009 10:13:34 +0000 Subject: [PATCH] tidy up "missing symbol" error message --- compiler/ghci/Linker.lhs | 2 +- rts/Linker.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/compiler/ghci/Linker.lhs b/compiler/ghci/Linker.lhs index 0de30af..3d30c07 100644 --- a/compiler/ghci/Linker.lhs +++ b/compiler/ghci/Linker.lhs @@ -413,7 +413,7 @@ reallyInitDynLinker dflags ; ok <- resolveObjs ; if succeeded ok then maybePutStrLn dflags "done" - else ghcError (InstallationError "linking extra libraries/objects failed") + else ghcError (ProgramError "linking extra libraries/objects failed") }} classifyLdInput :: FilePath -> IO (Maybe LibrarySpec) diff --git a/rts/Linker.c b/rts/Linker.c index f701377..f1534e9 100644 --- a/rts/Linker.c +++ b/rts/Linker.c @@ -2655,8 +2655,7 @@ ocResolve_PEi386 ( ObjectCode* oc ) copyName ( sym->Name, strtab, symbol, 1000-1 ); S = (UInt32) lookupSymbol( symbol ); if ((void*)S != NULL) goto foundit; - /* Newline first because the interactive linker has printed "linking..." */ - errorBelch("\n%s: unknown symbol `%s'", oc->fileName, symbol); + errorBelch("%s: unknown symbol `%s'", oc->fileName, symbol); return 0; foundit:; } -- 1.7.10.4