tidy up "missing symbol" error message
authorSimon Marlow <marlowsd@gmail.com>
Fri, 13 Mar 2009 10:13:34 +0000 (10:13 +0000)
committerSimon Marlow <marlowsd@gmail.com>
Fri, 13 Mar 2009 10:13:34 +0000 (10:13 +0000)
compiler/ghci/Linker.lhs
rts/Linker.c

index 0de30af..3d30c07 100644 (file)
@@ -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)
index f701377..f1534e9 100644 (file)
@@ -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:;
          }