This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via acb550c33e9b1c6a19fb7fb9d691bd45bd8ec795 (commit) via 75004280af22edd22a3efb7b47d5d87f2da65354 (commit) from e8f8a0805ff5cf70cd962c8365dcff47797cb45d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=acb550c33e9b1c6a19fb7fb9d691bd45bd8ec795 commit acb550c33e9b1c6a19fb7fb9d691bd45bd8ec795 Merge: e8f8a08 7500428 Author: Bill Hoffman <bill.hoff...@kitware.com> AuthorDate: Thu Nov 19 17:24:20 2015 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Nov 19 17:24:20 2015 -0500 Merge topic 'fix_bigobj_64_autodef' into next 75004280 Fix auto export symbols for Dlls containing /bigobj for 64bit builds. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=75004280af22edd22a3efb7b47d5d87f2da65354 commit 75004280af22edd22a3efb7b47d5d87f2da65354 Author: Bill Hoffman <bill.hoff...@kitware.com> AuthorDate: Thu Nov 19 17:21:03 2015 -0500 Commit: Bill Hoffman <bill.hoff...@kitware.com> CommitDate: Thu Nov 19 17:21:03 2015 -0500 Fix auto export symbols for Dlls containing /bigobj for 64bit builds. This fixes a bug where 64 bit builds with /bigobj incorrectly determined that the object files were not 64 bit. This manifested itself with printf type functions showing up as undefined because the leading underscore was being removed and should not be removed. diff --git a/Source/bindexplib.cxx b/Source/bindexplib.cxx index 64621e0..e7263ae 100644 --- a/Source/bindexplib.cxx +++ b/Source/bindexplib.cxx @@ -422,7 +422,7 @@ DumpFile(const char* filename, DumpSymbols<cmANON_OBJECT_HEADER_BIGOBJ, cmIMAGE_SYMBOL_EX> symbolDumper((cmANON_OBJECT_HEADER_BIGOBJ*) lpFileBase, symbols, dataSymbols, - (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 9766b41..9a3145e 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; } ----------------------------------------------------------------------- Summary of changes: Source/bindexplib.cxx | 2 +- Tests/RunCMake/AutoExportDll/sub/sub.cxx | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits