On Monday, 12 de December de 2011 19.34.21, Thiago Macieira wrote: > On Monday, 12 de December de 2011 18.03.53, aaron.kenn...@nokia.com wrote: > > > $ git reset --hard d28b6a024826aaa48a8b3e69c096d01c91aff2c9 > > > Checking out files: 100% (894/894), done. > > > HEAD is now at d28b6a0 Add flag to avoid breakpoint relocation > > > > The Qt v8 repo is a clone of the official v8 git repo, so we preserve > > whatever formatting Google has chosen. > > Doesn't mean they have sane procedures... > > But that's yet another reason for it to move out of qtbase. People are far > less likely to modify the qt5.git repository than qtbase.git.
Can we PLEASE make the move happen? I'm tired of every week chasing which
commit in my 100-commit-on-top-of-origin master branch included
src/3rdparty/v8 by accident.
At the very least, please apply the two attached patches as soon as possible.
(V8 isn't subject to the CLA and I'm not sending patches to Google either)
--
Thiago Macieira - thiago.macieira (AT) intel.com
Software Architect - Intel Open Source Technology Center
Intel Sweden AB - Registration Number: 556189-6027
Knarrarnäsgatan 15, 164 40 Kista, Stockholm, Sweden
>From 35464b4b92538ddad22c26ec2b021c68d2879066 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macie...@intel.com>
Date: Thu, 1 Sep 2011 11:30:40 +0200
Subject: [PATCH 1/2] Fix compilation with Intel CC.
---
src/objects.cc | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/objects.cc b/src/objects.cc
index 6a4eff9..040628c 100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -11129,6 +11129,7 @@ template class Dictionary<StringDictionaryShape, String*>;
template class Dictionary<NumberDictionaryShape, uint32_t>;
+#ifndef __INTEL_COMPILER
template MaybeObject* Dictionary<NumberDictionaryShape, uint32_t>::Allocate(
int);
@@ -11203,7 +11204,7 @@ int Dictionary<StringDictionaryShape, String*>::NumberOfEnumElements();
template
int HashTable<NumberDictionaryShape, uint32_t>::FindEntry(uint32_t);
-
+#endif
// Collates undefined and unexisting elements below limit from position
// zero of the elements. The object stays in Dictionary mode.
--
1.7.6.4
>From 8884b0e7f529fd356acc637e98d1f285afbfe723 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macie...@intel.com>
Date: Mon, 5 Dec 2011 12:49:30 -0800
Subject: [PATCH 2/2] Make the snapshot creator output proper byte (0-255)
numbers
These numbers are stored in a "const byte[]" array. In C++11 mode, a
negative number like -1 cannot be automatically converted to an
unsigned char. So output only the proper unsigned numbers.
---
src/mksnapshot.cc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mksnapshot.cc b/src/mksnapshot.cc
index bc0c2fc..c354f6d 100644
--- a/src/mksnapshot.cc
+++ b/src/mksnapshot.cc
@@ -109,10 +109,10 @@ class PartialSnapshotSink : public i::SnapshotByteSink {
if (j != 0) {
fprintf(fp, ",");
}
- fprintf(fp, "%d", at(j));
+ fprintf(fp, "%u", at(j));
}
}
- char at(int i) { return data_[i]; }
+ unsigned char at(int i) { return data_[i]; }
bool Compress(Compressor* compressor) {
ASSERT_EQ(-1, raw_size_);
raw_size_ = data_.length();
--
1.7.6.4
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
