projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix BitVectorTest on 32-bit hosts after r247972.
[oota-llvm.git]
/
lib
/
Object
/
COFFYAML.cpp
diff --git
a/lib/Object/COFFYAML.cpp
b/lib/Object/COFFYAML.cpp
index dda4b7f8c87eed69f55058fff87d02d68bc17587..4c1fca19bf1b9de73f3ccec363705b2df06802f7 100644
(file)
--- a/
lib/Object/COFFYAML.cpp
+++ b/
lib/Object/COFFYAML.cpp
@@
-56,6
+56,7
@@
void ScalarEnumerationTraits<COFF::MachineTypes>::enumeration(
ECase(IMAGE_FILE_MACHINE_AMD64);
ECase(IMAGE_FILE_MACHINE_ARM);
ECase(IMAGE_FILE_MACHINE_ARMNT);
ECase(IMAGE_FILE_MACHINE_AMD64);
ECase(IMAGE_FILE_MACHINE_ARM);
ECase(IMAGE_FILE_MACHINE_ARMNT);
+ ECase(IMAGE_FILE_MACHINE_ARM64);
ECase(IMAGE_FILE_MACHINE_EBC);
ECase(IMAGE_FILE_MACHINE_I386);
ECase(IMAGE_FILE_MACHINE_IA64);
ECase(IMAGE_FILE_MACHINE_EBC);
ECase(IMAGE_FILE_MACHINE_I386);
ECase(IMAGE_FILE_MACHINE_IA64);
@@
-210,6
+211,7
@@
void ScalarBitSetTraits<COFF::Characteristics>::bitset(
void ScalarBitSetTraits<COFF::SectionCharacteristics>::bitset(
IO &IO, COFF::SectionCharacteristics &Value) {
void ScalarBitSetTraits<COFF::SectionCharacteristics>::bitset(
IO &IO, COFF::SectionCharacteristics &Value) {
+ BCase(IMAGE_SCN_TYPE_NOLOAD);
BCase(IMAGE_SCN_TYPE_NO_PAD);
BCase(IMAGE_SCN_CNT_CODE);
BCase(IMAGE_SCN_CNT_INITIALIZED_DATA);
BCase(IMAGE_SCN_TYPE_NO_PAD);
BCase(IMAGE_SCN_CNT_CODE);
BCase(IMAGE_SCN_CNT_INITIALIZED_DATA);
@@
-335,7
+337,7
@@
struct NDLLCharacteristics {
COFF::DLLCharacteristics Characteristics;
};
COFF::DLLCharacteristics Characteristics;
};
-}
// namespace
+}
void MappingTraits<COFFYAML::Relocation>::mapping(IO &IO,
COFFYAML::Relocation &Rel) {
void MappingTraits<COFFYAML::Relocation>::mapping(IO &IO,
COFFYAML::Relocation &Rel) {
@@
-497,5
+499,5
@@
void MappingTraits<COFFYAML::Object>::mapping(IO &IO, COFFYAML::Object &Obj) {
IO.mapRequired("symbols", Obj.Symbols);
}
IO.mapRequired("symbols", Obj.Symbols);
}
-}
// namespace yaml
-}
// namespace llvm
+}
+}