[Cmake-commits] CMake branch, next, updated. v3.4.0-1444-gec64904

[Brad King]

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  ec649040592ea1ae06b02c3a9665f72f9ffbe6a5 (commit)
       via  65b866122184e1a791127dc77fcd3b937ff5dbb9 (commit)
       via  c7ddc5f43821039f4c005271912da30ba0f213db (commit)
      from  acb550c33e9b1c6a19fb7fb9d691bd45bd8ec795 (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=ec649040592ea1ae06b02c3a9665f72f9ffbe6a5
commit ec649040592ea1ae06b02c3a9665f72f9ffbe6a5
Merge: acb550c 65b8661
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 20 08:51:24 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 20 08:51:24 2015 -0500

    Merge topic 'fix-autodef-bigobj-64' into next
    
    65b86612 Merge branch 'backport-fix-autodef-bigobj-64' into fix-autodef-bigobj-64
    c7ddc5f4 Fix auto export symbols for Dlls containing /bigobj for 64bit builds.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=65b866122184e1a791127dc77fcd3b937ff5dbb9
commit 65b866122184e1a791127dc77fcd3b937ff5dbb9
Merge: 7500428 c7ddc5f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 20 08:48:30 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Nov 20 08:48:30 2015 -0500

    Merge branch 'backport-fix-autodef-bigobj-64' into fix-autodef-bigobj-64


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c7ddc5f43821039f4c005271912da30ba0f213db
commit c7ddc5f43821039f4c005271912da30ba0f213db
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Thu Nov 19 17:21:03 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Nov 20 08:43:58 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 dc4db63..b250842 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 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:


hooks/post-receive
-- 
CMake