commit 0c7f9e562f88d8ee08c8b952ea8c2a19496cfa66
author Diana Chen <mysekki@gmail.com> Thu Aug 28 10:27:43 2014 +0800
committer Diana Chen <mysekki@gmail.com> Thu Oct 02 10:47:58 2014 +0800
tree e5f110b91a44af53edfeb764bce5bc6224b39930
parent 13735032231ff57c72e0b25ac806dfc91bbd25b1

arm: Refine error message

include/mcld/LD/DiagRelocations.inc

diff --git a/include/mcld/LD/DiagRelocations.inc b/include/mcld/LD/DiagRelocations.inc
index 91e0787..0035523 100644
--- a/include/mcld/LD/DiagRelocations.inc
+++ b/include/mcld/LD/DiagRelocations.inc
@@ -16,9 +16,9 @@
      "%1:%2: undefined reference to `%0'")
 DIAG(non_pic_relocation,
      DiagnosticEngine::Error,
-     "attempt to generate unsupported relocation type `%0' for symbol `%1', "
+     "attempt to generate unsupported relocation `%0' for symbol `%1', "
      "recompile with -fPIC",
-     "attempt to generate unsupported relocation type `%0' for symbol `%1, "
+     "attempt to generate unsupported relocation `%0' for symbol `%1, "
      "recompile with -fPIC")
 DIAG(base_relocation,
      DiagnosticEngine::Fatal,

lib/Target/ARM/ARMRelocator.cpp

diff --git a/lib/Target/ARM/ARMRelocator.cpp b/lib/Target/ARM/ARMRelocator.cpp
index fefa08f..c23f4d3 100644
--- a/lib/Target/ARM/ARMRelocator.cpp
+++ b/lib/Target/ARM/ARMRelocator.cpp
@@ -399,7 +399,7 @@
       break;
 
     default:
-      error(diag::non_pic_relocation) << static_cast<int>(pReloc.type())
+      error(diag::non_pic_relocation) << getName(pReloc.type())
                                       << pReloc.symInfo()->name();
       break;
   }
@@ -462,7 +462,7 @@
     case llvm::ELF::R_ARM_THM_MOVT_ABS: {
       // PIC code should not contain these kinds of relocation
       if (config().isCodeIndep()) {
-        error(diag::non_pic_relocation) << static_cast<int>(pReloc.type())
+        error(diag::non_pic_relocation) << getName(pReloc.type())
                                         << pReloc.symInfo()->name();
       }
       return;