diff options
| author | Brad King <brad.king@kitware.com> | 2015-11-20 08:57:13 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-11-20 08:57:13 -0500 |
| commit | e3dfa3506c0589cb4c3e91107e560c2495cdc257 (patch) | |
| tree | 369fc04f34e98809ee2fac5ee5d1c6751081159d | |
| parent | 16ba21f79abbd4729124c8c042b66da482500e9c (diff) | |
| parent | c7ddc5f43821039f4c005271912da30ba0f213db (diff) | |
| download | cmake-e3dfa3506c0589cb4c3e91107e560c2495cdc257.tar.gz | |
Merge branch 'backport-fix-autodef-bigobj-64' into release
| -rw-r--r-- | Source/bindexplib.cxx | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/AutoExportDll/sub/sub.cxx | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Source/bindexplib.cxx b/Source/bindexplib.cxx index dc4db6358d..b2508422fd 100644 --- a/Source/bindexplib.cxx +++ b/Source/bindexplib.cxx @@ -425,7 +425,7 @@ DumpFile(const char* filename, FILE *fout) if(h->Sig1 == 0x0 && h->Sig2 == 0xffff) { DumpSymbols<cmANON_OBJECT_HEADER_BIGOBJ, cmIMAGE_SYMBOL_EX> symbolDumper((cmANON_OBJECT_HEADER_BIGOBJ*) lpFileBase, fout, - (dosHeader->e_magic == IMAGE_FILE_MACHINE_AMD64)); + (h->Machine == IMAGE_FILE_MACHINE_AMD64)); symbolDumper.DumpObjFile(); } else { printf("unrecognized file format in '%s'\n", filename); diff --git a/Tests/RunCMake/AutoExportDll/sub/sub.cxx b/Tests/RunCMake/AutoExportDll/sub/sub.cxx index 9766b41ecb..9a3145ec4c 100644 --- a/Tests/RunCMake/AutoExportDll/sub/sub.cxx +++ b/Tests/RunCMake/AutoExportDll/sub/sub.cxx @@ -1,4 +1,6 @@ +#include <stdio.h> int sub() { + printf(""); return 10; } |