[Arm] Various cleanups to the Arm assembler backend.

src/objects.h

Index: src/objects.h
diff --git a/src/objects.h b/src/objects.h
index bf7f67d22af9cb8bc4820bafc7bdbeffde17f91e..6c0e6cb8e677ecc817d7c091d4fa91c613a11811 100644
--- a/src/objects.h
+++ b/src/objects.h
@@ -1231,10 +1231,8 @@ template <class C> inline bool Is(Object* obj);
     "The current stack pointer is below csp")                                 \
   V(kTheInstructionShouldBeALui, "The instruction should be a lui")           \
   V(kTheInstructionShouldBeAnOri, "The instruction should be an ori")         \
-  V(kTheInstructionToPatchShouldBeALoadFromPc,                                \
-    "The instruction to patch should be a load from pc")                      \
-  V(kTheInstructionToPatchShouldBeALoadFromPp,                                \
-    "The instruction to patch should be a load from pp")                      \
+  V(kTheInstructionToPatchShouldBeALoadFromConstantPool,                      \
+    "The instruction to patch should be a load from the constant pool")       \
   V(kTheInstructionToPatchShouldBeAnLdrLiteral,                               \
     "The instruction to patch should be a ldr literal")                       \
   V(kTheInstructionToPatchShouldBeALui,                                       \