diff options
| author | Rui Ueyama <ruiu@google.com> | 2014-01-27 04:22:24 +0000 |
|---|---|---|
| committer | Rui Ueyama <ruiu@google.com> | 2014-01-27 04:22:24 +0000 |
| commit | 06dc5e79c67764a29331cdc28fd42746cceb1079 (patch) | |
| tree | 0c6a2009cef830de03a381f76cc4734edb9ff03e /llvm | |
| parent | a80501742c932715fcff28224be8e2f4ce4fcc3c (diff) | |
| download | bcm5719-llvm-06dc5e79c67764a29331cdc28fd42746cceb1079.tar.gz bcm5719-llvm-06dc5e79c67764a29331cdc28fd42746cceb1079.zip | |
Rename IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA.
editbin.exe and link.exe both accepts /highentropyva option to set this bit, so
doing s/VIRTUAL_ADDRESS/VA/ should make sense.
llvm-svn: 200191
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/include/llvm/Support/COFF.h | 2 | ||||
| -rw-r--r-- | llvm/test/tools/llvm-readobj/peplus.test | 2 | ||||
| -rw-r--r-- | llvm/tools/llvm-readobj/COFFDumper.cpp | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/llvm/include/llvm/Support/COFF.h b/llvm/include/llvm/Support/COFF.h index fde545f0085..e99e36cc56f 100644 --- a/llvm/include/llvm/Support/COFF.h +++ b/llvm/include/llvm/Support/COFF.h @@ -532,7 +532,7 @@ namespace COFF { enum DLLCharacteristics { /// ASLR with 64 bit address space. - IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VIRTUAL_ADDRESS = 0x0020, + IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA = 0x0020, /// DLL can be relocated at load time. IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE = 0x0040, /// Code integrity checks are enforced. diff --git a/llvm/test/tools/llvm-readobj/peplus.test b/llvm/test/tools/llvm-readobj/peplus.test index 48e0e7f6e19..8e6f5508547 100644 --- a/llvm/test/tools/llvm-readobj/peplus.test +++ b/llvm/test/tools/llvm-readobj/peplus.test @@ -37,7 +37,7 @@ CHECK: SizeOfHeaders: 512 CHECK: Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI (0x3) CHECK: Subsystem [ (0x8160) CHECK: IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE (0x40) -CHECK: IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VIRTUAL_ADDRESS (0x20) +CHECK: IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA (0x20) CHECK: IMAGE_DLL_CHARACTERISTICS_NX_COMPAT (0x100) CHECK: IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE (0x8000) CHECK: ] diff --git a/llvm/tools/llvm-readobj/COFFDumper.cpp b/llvm/tools/llvm-readobj/COFFDumper.cpp index dd6f3d6ba81..803e3f67330 100644 --- a/llvm/tools/llvm-readobj/COFFDumper.cpp +++ b/llvm/tools/llvm-readobj/COFFDumper.cpp @@ -281,8 +281,7 @@ static const EnumEntry<COFF::WindowsSubsystem> PEWindowsSubsystem[] = { }; static const EnumEntry<COFF::DLLCharacteristics> PEDLLCharacteristics[] = { - LLVM_READOBJ_ENUM_ENT(COFF, - IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VIRTUAL_ADDRESS), + LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA ), LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE ), LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY ), LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_DLL_CHARACTERISTICS_NX_COMPAT ), |
