aboutsummaryrefslogtreecommitdiff
path: root/lib/Object/COFFObjectFile.cpp
diff options
context:
space:
mode:
authorDerek Schuff <dschuff@chromium.org>2012-10-12 16:24:16 -0700
committerDerek Schuff <dschuff@chromium.org>2012-10-12 16:24:16 -0700
commit5eceb0e04023bffa93f5683f356c09e35f9f4f43 (patch)
tree07d52d1eaf89a4b4544b48322dcdbc4f65b102d4 /lib/Object/COFFObjectFile.cpp
parent4db6bb7837c58641c4416e87643833bca4945841 (diff)
parent40573998821fde7ffeabe8507f4c9e8c7cf762f6 (diff)
Merge commit '40573998821fde7ffeabe8507f4c9e8c7cf762f6'
Conflicts: include/llvm/MC/MCAssembler.h lib/Target/ARM/ARMISelLowering.cpp lib/Target/X86/X86TargetMachine.h tools/llc/llc.cpp
Diffstat (limited to 'lib/Object/COFFObjectFile.cpp')
-rw-r--r--lib/Object/COFFObjectFile.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/Object/COFFObjectFile.cpp b/lib/Object/COFFObjectFile.cpp
index 8ab54c6295..064689c3f3 100644
--- a/lib/Object/COFFObjectFile.cpp
+++ b/lib/Object/COFFObjectFile.cpp
@@ -372,7 +372,14 @@ error_code COFFObjectFile::isSectionVirtual(DataRefImpl Sec,
error_code COFFObjectFile::isSectionZeroInit(DataRefImpl Sec,
bool &Result) const {
- // FIXME: Unimplemented
+ // FIXME: Unimplemented.
+ Result = false;
+ return object_error::success;
+}
+
+error_code COFFObjectFile::isSectionReadOnlyData(DataRefImpl Sec,
+ bool &Result) const {
+ // FIXME: Unimplemented.
Result = false;
return object_error::success;
}