Hi Jim,<div><br></div><div>ARMMachObjectWriter is missing #include "llvm/Support/DataTypes.h" for uint32_t!</div><div><br></div><div><div>llvm[3]: Compiling ARMISelDAGToDAG.cpp for Debug+Asserts build</div><div>In file included from ARMAsmBackend.cpp:10:</div>
<div>ARM.h:65: error: ‘uint32_t’ has not been declared</div><div>ARM.h:66: error: ‘uint32_t’ has not been declared</div><div>In file included from ARMBaseRegisterInfo.cpp:14:</div><div>ARM.h:65: error: ‘uint32_t’ has not been declared</div>
<div>ARM.h:66: error: ‘uint32_t’ has not been declared</div><div>In file included from ARMExpandPseudoInsts.cpp:18:</div><div>ARM.h:65: error: ‘uint32_t’ has not been declared</div><div>ARM.h:66: error: ‘uint32_t’ has not been declared</div>
<div>In file included from ARMConstantIslandPass.cpp:17:</div><div>ARM.h:65: error: ‘uint32_t’ has not been declared</div><div>ARM.h:66: error: ‘uint32_t’ has not been declared</div></div><div>[...]</div><div><br></div><div>
Nick<br><br><div class="gmail_quote">On 22 June 2011 13:14, Jim Grosbach <span dir="ltr"><<a href="mailto:grosbach@apple.com">grosbach@apple.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
Author: grosbach<br>
Date: Wed Jun 22 15:14:52 2011<br>
New Revision: 133638<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=133638&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=133638&view=rev</a><br>
Log:<br>
Move ARMMachObjectWriter to its own file.<br>
<br>
Just tidy up a bit. No functional change.<br>
<br>
Added:<br>
llvm/trunk/lib/Target/ARM/ARMMachObjectWriter.cpp<br>
Modified:<br>
llvm/trunk/lib/Target/ARM/ARM.h<br>
llvm/trunk/lib/Target/ARM/ARMAsmBackend.cpp<br>
llvm/trunk/lib/Target/ARM/CMakeLists.txt<br>
<br>
Modified: llvm/trunk/lib/Target/ARM/ARM.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARM.h?rev=133638&r1=133637&r2=133638&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARM.h?rev=133638&r1=133637&r2=133638&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Target/ARM/ARM.h (original)<br>
+++ llvm/trunk/lib/Target/ARM/ARM.h Wed Jun 22 15:14:52 2011<br>
@@ -27,6 +27,7 @@<br>
class JITCodeEmitter;<br>
class formatted_raw_ostream;<br>
class MCCodeEmitter;<br>
+class MCObjectWriter;<br>
class TargetAsmBackend;<br>
class MachineInstr;<br>
class ARMAsmPrinter;<br>
@@ -58,6 +59,12 @@<br>
void LowerARMMachineInstrToMCInst(const MachineInstr *MI, MCInst &OutMI,<br>
ARMAsmPrinter &AP);<br>
<br>
+/// createARMMachObjectWriter - Construct an ARM Mach-O object writer.<br>
+MCObjectWriter *createARMMachObjectWriter(raw_ostream &OS,<br>
+ bool Is64Bit,<br>
+ uint32_t CPUType,<br>
+ uint32_t CPUSubtype);<br>
+<br>
} // end namespace llvm;<br>
<br>
#endif<br>
<br>
Modified: llvm/trunk/lib/Target/ARM/ARMAsmBackend.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMAsmBackend.cpp?rev=133638&r1=133637&r2=133638&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMAsmBackend.cpp?rev=133638&r1=133637&r2=133638&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Target/ARM/ARMAsmBackend.cpp (original)<br>
+++ llvm/trunk/lib/Target/ARM/ARMAsmBackend.cpp Wed Jun 22 15:14:52 2011<br>
@@ -28,14 +28,6 @@<br>
using namespace llvm;<br>
<br>
namespace {<br>
-class ARMMachObjectWriter : public MCMachObjectTargetWriter {<br>
-public:<br>
- ARMMachObjectWriter(bool Is64Bit, uint32_t CPUType,<br>
- uint32_t CPUSubtype)<br>
- : MCMachObjectTargetWriter(Is64Bit, CPUType, CPUSubtype,<br>
- /*UseAggressiveSymbolFolding=*/true) {}<br>
-};<br>
-<br>
class ARMELFObjectWriter : public MCELFObjectTargetWriter {<br>
public:<br>
ARMELFObjectWriter(Triple::OSType OSType)<br>
@@ -423,12 +415,9 @@<br>
: ARMAsmBackend(T), Subtype(st) { }<br>
<br>
MCObjectWriter *createObjectWriter(raw_ostream &OS) const {<br>
- return createMachObjectWriter(new ARMMachObjectWriter(<br>
- /*Is64Bit=*/false,<br>
- object::mach::CTM_ARM,<br>
- Subtype),<br>
- OS,<br>
- /*IsLittleEndian=*/true);<br>
+ return createARMMachObjectWriter(OS, /*Is64Bit=*/false,<br>
+ object::mach::CTM_ARM,<br>
+ Subtype);<br>
}<br>
<br>
void ApplyFixup(const MCFixup &Fixup, char *Data, unsigned DataSize,<br>
<br>
Added: llvm/trunk/lib/Target/ARM/ARMMachObjectWriter.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMMachObjectWriter.cpp?rev=133638&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMMachObjectWriter.cpp?rev=133638&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Target/ARM/ARMMachObjectWriter.cpp (added)<br>
+++ llvm/trunk/lib/Target/ARM/ARMMachObjectWriter.cpp Wed Jun 22 15:14:52 2011<br>
@@ -0,0 +1,32 @@<br>
+//===-- ARMMachObjectWriter.cpp - ARM Mach Object Writer ------------------===//<br>
+//<br>
+// The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===----------------------------------------------------------------------===//<br>
+<br>
+#include "ARM.h"<br>
+#include "llvm/MC/MCMachObjectWriter.h"<br>
+using namespace llvm;<br>
+<br>
+namespace {<br>
+class ARMMachObjectWriter : public MCMachObjectTargetWriter {<br>
+public:<br>
+ ARMMachObjectWriter(bool Is64Bit, uint32_t CPUType,<br>
+ uint32_t CPUSubtype)<br>
+ : MCMachObjectTargetWriter(Is64Bit, CPUType, CPUSubtype,<br>
+ /*UseAggressiveSymbolFolding=*/true) {}<br>
+};<br>
+}<br>
+<br>
+MCObjectWriter *llvm::createARMMachObjectWriter(raw_ostream &OS,<br>
+ bool Is64Bit,<br>
+ uint32_t CPUType,<br>
+ uint32_t CPUSubtype) {<br>
+ return createMachObjectWriter(new ARMMachObjectWriter(Is64Bit,<br>
+ CPUType,<br>
+ CPUSubtype),<br>
+ OS, /*IsLittleEndian=*/true);<br>
+}<br>
<br>
Modified: llvm/trunk/lib/Target/ARM/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/CMakeLists.txt?rev=133638&r1=133637&r2=133638&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/CMakeLists.txt?rev=133638&r1=133637&r2=133638&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Target/ARM/CMakeLists.txt (original)<br>
+++ llvm/trunk/lib/Target/ARM/CMakeLists.txt Wed Jun 22 15:14:52 2011<br>
@@ -34,6 +34,7 @@<br>
ARMISelLowering.cpp<br>
ARMInstrInfo.cpp<br>
ARMJITInfo.cpp<br>
+ ARMMachObjectWriter.cpp<br>
ARMMCCodeEmitter.cpp<br>
ARMMCExpr.cpp<br>
ARMLoadStoreOptimizer.cpp<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>