Commit 30b39f25 authored by balazs.kilvady's avatar balazs.kilvady Committed by Commit bot

Add -Wshorten-64-to-32 flag to mac builds.

BUG=

Review URL: https://codereview.chromium.org/1237753004

Cr-Commit-Position: refs/heads/master@{#29652}
parent bf61b05b
...@@ -787,6 +787,12 @@ ...@@ -787,6 +787,12 @@
'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++0x', # -std=gnu++0x 'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++0x', # -std=gnu++0x
}, },
'conditions': [
['v8_target_arch=="x64" or v8_target_arch=="arm64" \
or v8_target_arch=="mips64el"', {
'xcode_settings': {'WARNING_CFLAGS': ['-Wshorten-64-to-32']},
}],
],
}], }],
], ],
'target_conditions': [ 'target_conditions': [
......
...@@ -111,7 +111,7 @@ TimeDelta TimeDelta::FromMachTimespec(struct mach_timespec ts) { ...@@ -111,7 +111,7 @@ TimeDelta TimeDelta::FromMachTimespec(struct mach_timespec ts) {
struct mach_timespec TimeDelta::ToMachTimespec() const { struct mach_timespec TimeDelta::ToMachTimespec() const {
struct mach_timespec ts; struct mach_timespec ts;
DCHECK(delta_ >= 0); DCHECK(delta_ >= 0);
ts.tv_sec = delta_ / Time::kMicrosecondsPerSecond; ts.tv_sec = static_cast<unsigned>(delta_ / Time::kMicrosecondsPerSecond);
ts.tv_nsec = (delta_ % Time::kMicrosecondsPerSecond) * ts.tv_nsec = (delta_ % Time::kMicrosecondsPerSecond) *
Time::kNanosecondsPerMicrosecond; Time::kNanosecondsPerMicrosecond;
return ts; return ts;
......
...@@ -355,17 +355,13 @@ class ELFSection : public DebugSectionBase<ELFSectionHeader> { ...@@ -355,17 +355,13 @@ class ELFSection : public DebugSectionBase<ELFSectionHeader> {
#if defined(__MACH_O) #if defined(__MACH_O)
class MachOTextSection : public MachOSection { class MachOTextSection : public MachOSection {
public: public:
MachOTextSection(uintptr_t align, MachOTextSection(uint32_t align, uintptr_t addr, uintptr_t size)
uintptr_t addr, : MachOSection("__text", "__TEXT", align,
uintptr_t size)
: MachOSection("__text",
"__TEXT",
align,
MachOSection::S_REGULAR | MachOSection::S_REGULAR |
MachOSection::S_ATTR_SOME_INSTRUCTIONS | MachOSection::S_ATTR_SOME_INSTRUCTIONS |
MachOSection::S_ATTR_PURE_INSTRUCTIONS), MachOSection::S_ATTR_PURE_INSTRUCTIONS),
addr_(addr), addr_(addr),
size_(size) { } size_(size) {}
protected: protected:
virtual void PopulateHeader(Writer::Slot<Header> header) { virtual void PopulateHeader(Writer::Slot<Header> header) {
...@@ -588,7 +584,8 @@ class MachO BASE_EMBEDDED { ...@@ -588,7 +584,8 @@ class MachO BASE_EMBEDDED {
Writer::Slot<MachOSection::Header> headers = Writer::Slot<MachOSection::Header> headers =
w->CreateSlotsHere<MachOSection::Header>(sections_.length()); w->CreateSlotsHere<MachOSection::Header>(sections_.length());
cmd->fileoff = w->position(); cmd->fileoff = w->position();
header->sizeofcmds = w->position() - load_command_start; header->sizeofcmds =
static_cast<uint32_t>(w->position() - load_command_start);
for (int section = 0; section < sections_.length(); ++section) { for (int section = 0; section < sections_.length(); ++section) {
sections_[section]->PopulateHeader(headers.at(section)); sections_[section]->PopulateHeader(headers.at(section));
sections_[section]->WriteBody(headers.at(section), w); sections_[section]->WriteBody(headers.at(section), w);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment