Revision: 5195
Author: [email protected]
Date: Fri Aug 6 01:35:31 2010
Log: Merge r5179 (Fix GCC 4.4.4 build) to 2.2 branch
Review URL: http://codereview.chromium.org/3086020
http://code.google.com/p/v8/source/detail?r=5195
Modified:
/branches/2.2/src/globals.h
/branches/2.2/src/heap.h
/branches/2.2/src/version.cc
=======================================
--- /branches/2.2/src/globals.h Tue Jul 13 13:58:03 2010
+++ /branches/2.2/src/globals.h Fri Aug 6 01:35:31 2010
@@ -642,11 +642,14 @@
#if defined(__GNUC__) && !defined(DEBUG)
#if (__GNUC__ >= 4)
#define INLINE(header) inline header __attribute__((always_inline))
+#define NO_INLINE(header) header __attribute__((noinline))
#else
#define INLINE(header) inline __attribute__((always_inline)) header
+#define NO_INLINE(header) __attribute__((noinline)) header
#endif
#else
#define INLINE(header) inline header
+#define NO_INLINE(header) header
#endif
// Feature flags bit positions. They are mostly based on the CPUID spec.
=======================================
--- /branches/2.2/src/heap.h Thu Aug 5 11:35:53 2010
+++ /branches/2.2/src/heap.h Fri Aug 6 01:35:31 2010
@@ -1195,12 +1195,12 @@
static bool CreateInitialMaps();
static bool CreateInitialObjects();
- // These four Create*EntryStub functions are here because of a gcc-4.4
bug
- // that assigns wrong vtable entries.
- static void CreateCEntryStub();
- static void CreateJSEntryStub();
- static void CreateJSConstructEntryStub();
- static void CreateRegExpCEntryStub();
+ // These four Create*EntryStub functions are here and forced to not be
inlined
+ // because of a gcc-4.4 bug that assigns wrong vtable entries.
+ NO_INLINE(static void CreateCEntryStub());
+ NO_INLINE(static void CreateJSEntryStub());
+ NO_INLINE(static void CreateJSConstructEntryStub());
+ NO_INLINE(static void CreateRegExpCEntryStub());
static void CreateFixedStubs();
=======================================
--- /branches/2.2/src/version.cc Thu Aug 5 11:35:53 2010
+++ /branches/2.2/src/version.cc Fri Aug 6 01:35:31 2010
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 2
#define MINOR_VERSION 2
#define BUILD_NUMBER 24
-#define PATCH_LEVEL 11
+#define PATCH_LEVEL 12
#define CANDIDATE_VERSION false
// Define SONAME to have the SCons build the put a specific SONAME into the
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
