Fix ARM integrated assembler to be able to compile spec2k examples.

src/IceFixups.h

Index: src/IceFixups.h
diff --git a/src/IceFixups.h b/src/IceFixups.h
index 303e592bb3d35e582eadb5141139f481e10f8a8d..87c687a3ff051cc58b8d00f41932e33f60e0c562 100644
--- a/src/IceFixups.h
+++ b/src/IceFixups.h
@@ -19,6 +19,8 @@
 
 namespace Ice {
 
+class Assembler;

[Jim Stichnoth, 2015/10/27 21:41:21]

Is this forward declaration needed?  It's already declared in IceDefs.h.

[Karl, 2015/10/27 22:16:41]

Done.

+
 /// Each target and container format has a different namespace of relocations.
 /// This holds the specific target+container format's relocation number.
 using FixupKind = uint32_t;
@@ -46,8 +48,7 @@ public:
   void set_value(const Constant *Value) { value_ = Value; }
 
   /// Emits fixup, then returns the number of bytes to skip.
-  virtual size_t emit(GlobalContext *Ctx, RelocOffsetT OverrideOffset,
-                      bool IsPCRel) const;
+  virtual size_t emit(GlobalContext *Ctx, const Assembler &Asm) const;
 
 private:
   intptr_t position_ = 0;
@@ -67,8 +68,7 @@ public:
   AssemblerTextFixup(const std::string &Message, size_t NumBytes)
       : AssemblerFixup(), Message(Message), NumBytes(NumBytes) {}
   ~AssemblerTextFixup() = default;
-  virtual size_t emit(GlobalContext *Ctx, RelocOffsetT OverrideOffset,
-                      bool isPcRel) const;
+  size_t emit(GlobalContext *Ctx, const Assembler &Asm) const override;
 
 private:
   const std::string Message;