[Cmake-commits] CMake branch, next, updated. v3.8.0-rc4-666-gc4a4ee8
Kitware Robot
kwrobot at kitware.com
Tue Apr 4 09:05:04 EDT 2017
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
discards 10e5d6370b3e706c6bdb930378cdb62db363528f (commit)
discards 24621592b9d21b98d0442091414e4df6b29fa289 (commit)
discards b04bc46ee0416152631a2bb0251a404b60542e8b (commit)
discards 20eb6c1fd43db3aa14b8876a58d4ec1eb7b85fcc (commit)
discards e32a4714537f8d584716aad4c77ba640b476f776 (commit)
discards c7931c1e461bdb503eb69b8aca8eac5129801379 (commit)
discards e0bb38282266bb05477d292f0d2071c0635c5cef (commit)
via c4a4ee8c191faf89c1f5714db7728de135280f7e (commit)
via 290c4fbbda9f994f5cd0c16ce21345d8c37060c1 (commit)
via fdaf946a7520604936a61f9138c1c05fe6a19def (commit)
via d7dedd6d9e46466a2a1ca83dbdd6fcb49fec2b3e (commit)
via aaf044486fec1fb46a668f5f0db379668ec3d568 (commit)
via 83ebbd774893c5b986aa4fb84d77b01c1b46dc0a (commit)
via 3d2dd42103851ddb572686de5a77ff46b171f875 (commit)
via c792926b35d85fa504611fc921746db633f655b2 (commit)
via 48fa291469e5e8b3ae88fb846750df72468eb58a (commit)
via 97c605fd5bca193d0aeb90a4985fbccc884401ec (commit)
via 7a8860afbc614f2215e083adadb25963fe8f4dfe (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (10e5d6370b3e706c6bdb930378cdb62db363528f)
\
N -- N -- N (c4a4ee8c191faf89c1f5714db7728de135280f7e)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
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=c4a4ee8c191faf89c1f5714db7728de135280f7e
commit c4a4ee8c191faf89c1f5714db7728de135280f7e
Merge: 290c4fb 48fa291
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 4 12:55:07 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Apr 4 09:04:47 2017 -0400
Stage topic 'bindexplib-arm'
Topic-id: 23166
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/604
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=290c4fbbda9f994f5cd0c16ce21345d8c37060c1
commit 290c4fbbda9f994f5cd0c16ce21345d8c37060c1
Merge: fdaf946 fe21ccc
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 3 20:04:37 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Apr 4 09:04:47 2017 -0400
Stage topic 'test-CMakeOnly.AllFindModules-local-exclude'
Topic-id: 23466
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/661
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fdaf946a7520604936a61f9138c1c05fe6a19def
commit fdaf946a7520604936a61f9138c1c05fe6a19def
Merge: d7dedd6 12a7813
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 3 18:39:53 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Apr 4 09:04:46 2017 -0400
Stage topic 'ExternalProject-checkout-clarify'
Topic-id: 23463
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/660
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d7dedd6d9e46466a2a1ca83dbdd6fcb49fec2b3e
commit d7dedd6d9e46466a2a1ca83dbdd6fcb49fec2b3e
Merge: aaf0444 e51d939
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 3 17:39:37 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Apr 4 09:04:46 2017 -0400
Stage topic 'server-mode-test-no-pyc'
Topic-id: 23457
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/659
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aaf044486fec1fb46a668f5f0db379668ec3d568
commit aaf044486fec1fb46a668f5f0db379668ec3d568
Merge: 83ebbd7 53f1733
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 3 17:27:09 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Apr 4 09:04:45 2017 -0400
Stage topic 'mac-implicit-link-no-lto-flag'
Topic-id: 23456
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/658
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83ebbd774893c5b986aa4fb84d77b01c1b46dc0a
commit 83ebbd774893c5b986aa4fb84d77b01c1b46dc0a
Merge: 3d2dd42 c2c2286
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 3 14:46:22 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Apr 4 09:04:45 2017 -0400
Stage topic 'test-CMake.GetPrerequisites-config-message'
Topic-id: 23435
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/654
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d2dd42103851ddb572686de5a77ff46b171f875
commit 3d2dd42103851ddb572686de5a77ff46b171f875
Merge: c792926 862482d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 3 13:38:01 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Apr 4 09:04:45 2017 -0400
Stage topic 'FindBoost-vs-toolset-fallback'
Topic-id: 23326
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/639
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=48fa291469e5e8b3ae88fb846750df72468eb58a
commit 48fa291469e5e8b3ae88fb846750df72468eb58a
Author: Mikhail Paulyshka <me at mixaill.tk>
AuthorDate: Wed Mar 22 17:57:02 2017 +0300
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Apr 4 08:52:46 2017 -0400
bindexplib: add ARM support
Fixes: #16728
diff --git a/Source/bindexplib.cxx b/Source/bindexplib.cxx
index 4839ec8..75a2177 100644
--- a/Source/bindexplib.cxx
+++ b/Source/bindexplib.cxx
@@ -68,6 +68,10 @@
#include <iostream>
#include <windows.h>
+#ifndef IMAGE_FILE_MACHINE_ARMNT
+#define IMAGE_FILE_MACHINE_ARMNT 0x01c4
+#endif
+
typedef struct cmANON_OBJECT_HEADER_BIGOBJ
{
/* same as ANON_OBJECT_HEADER_V2 */
@@ -166,7 +170,7 @@ public:
*/
DumpSymbols(ObjectHeaderType* ih, std::set<std::string>& symbols,
- std::set<std::string>& dataSymbols, bool is64)
+ std::set<std::string>& dataSymbols, bool isI386)
: Symbols(symbols)
, DataSymbols(dataSymbols)
{
@@ -176,7 +180,7 @@ public:
this->ObjectImageHeader->PointerToSymbolTable);
this->SectionHeaders = GetSectionHeaderOffset(this->ObjectImageHeader);
this->SymbolCount = this->ObjectImageHeader->NumberOfSymbols;
- this->Is64Bit = is64;
+ this->IsI386 = isI386;
}
/*
@@ -231,12 +235,11 @@ public:
symbol.erase(posAt);
}
}
- // For 64 bit builds we don't need to remove _
- if (!this->Is64Bit) {
- if (symbol[0] == '_') {
- symbol.erase(0, 1);
- }
+ // For i386 builds we don't need to remove _
+ if (this->IsI386 && symbol[0] == '_') {
+ symbol.erase(0, 1);
}
+
/*
Check whether it is "Scalar deleting destructor" and
"Vector deleting destructor"
@@ -283,7 +286,7 @@ private:
PIMAGE_SECTION_HEADER SectionHeaders;
ObjectHeaderType* ObjectImageHeader;
SymbolTableType* SymbolTable;
- bool Is64Bit;
+ bool IsI386;
};
bool DumpFile(const char* filename, std::set<std::string>& symbols,
@@ -323,9 +326,10 @@ bool DumpFile(const char* filename, std::set<std::string>& symbols,
fprintf(stderr, "File is an executable. I don't dump those.\n");
return false;
}
- /* Does it look like a i386 COFF OBJ file??? */
+ /* Does it look like a COFF OBJ file??? */
else if (((dosHeader->e_magic == IMAGE_FILE_MACHINE_I386) ||
- (dosHeader->e_magic == IMAGE_FILE_MACHINE_AMD64)) &&
+ (dosHeader->e_magic == IMAGE_FILE_MACHINE_AMD64) ||
+ (dosHeader->e_magic == IMAGE_FILE_MACHINE_ARMNT)) &&
(dosHeader->e_sp == 0)) {
/*
* The two tests above aren't what they look like. They're
@@ -334,7 +338,7 @@ bool DumpFile(const char* filename, std::set<std::string>& symbols,
*/
DumpSymbols<IMAGE_FILE_HEADER, IMAGE_SYMBOL> symbolDumper(
(PIMAGE_FILE_HEADER)lpFileBase, symbols, dataSymbols,
- (dosHeader->e_magic == IMAGE_FILE_MACHINE_AMD64));
+ (dosHeader->e_magic == IMAGE_FILE_MACHINE_I386));
symbolDumper.DumpObjFile();
} else {
// check for /bigobj format
@@ -342,7 +346,7 @@ bool DumpFile(const char* filename, std::set<std::string>& symbols,
if (h->Sig1 == 0x0 && h->Sig2 == 0xffff) {
DumpSymbols<cmANON_OBJECT_HEADER_BIGOBJ, cmIMAGE_SYMBOL_EX> symbolDumper(
(cmANON_OBJECT_HEADER_BIGOBJ*)lpFileBase, symbols, dataSymbols,
- (h->Machine == IMAGE_FILE_MACHINE_AMD64));
+ (h->Machine == IMAGE_FILE_MACHINE_I386));
symbolDumper.DumpObjFile();
} else {
printf("unrecognized file format in '%s'\n", filename);
-----------------------------------------------------------------------
Summary of changes:
Source/.gitattributes | 1 -
Source/bindexplib.cxx | 511 +++++++++++++++++++++----------------------------
2 files changed, 223 insertions(+), 289 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list