From c0c27e2bcde4aa1752ec7b689928e6cef0ea69ec Mon Sep 17 00:00:00 2001 From: ignisf Date: Tue, 10 Jun 2014 14:45:08 +0300 Subject: [PATCH] Bring patchset up to speed with 3.27.23 --- patches/arm/do-not-imply-vfp3-and-armv7.patch | 28 ------------------- patches/clang/no-unused-private-field.patch | 28 ------------------- ...n-types-and-unused-function-warnings.patch | 28 ------------------- patches/disable-building-tests.patch | 24 ++++++++-------- .../gcc48-wno-unused-local-typedefs.patch | 28 ------------------- 5 files changed, 12 insertions(+), 124 deletions(-) delete mode 100644 patches/arm/do-not-imply-vfp3-and-armv7.patch delete mode 100644 patches/clang/no-unused-private-field.patch delete mode 100644 patches/clang33/silence-nested-anon-types-and-unused-function-warnings.patch delete mode 100644 patches/gcc48/gcc48-wno-unused-local-typedefs.patch diff --git a/patches/arm/do-not-imply-vfp3-and-armv7.patch b/patches/arm/do-not-imply-vfp3-and-armv7.patch deleted file mode 100644 index 1030df9..0000000 --- a/patches/arm/do-not-imply-vfp3-and-armv7.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/build/common.gypi b/build/common.gypi -index 3a59639..594abe4 100644 ---- a/build/common.gypi -+++ b/build/common.gypi -@@ -173,7 +173,6 @@ - [ 'v8_use_arm_eabi_hardfloat=="true"', { - 'defines': [ - 'USE_EABI_HARDFLOAT=1', -- 'CAN_USE_VFP2_INSTRUCTIONS', - ], - 'target_conditions': [ - ['_toolset=="target"', { -diff --git a/build/standalone.gypi b/build/standalone.gypi -index 125c5bf..9900c5b 100644 ---- a/build/standalone.gypi -+++ b/build/standalone.gypi -@@ -77,9 +77,9 @@ - }], - ], - # Default ARM variable settings. -- 'armv7%': 1, -+ 'armv7%': 0, - 'arm_neon%': 0, -- 'arm_fpu%': 'vfpv3', -+ 'arm_fpu%': 'vfp', - }, - 'target_defaults': { - 'default_configuration': 'Debug', diff --git a/patches/clang/no-unused-private-field.patch b/patches/clang/no-unused-private-field.patch deleted file mode 100644 index cf84432..0000000 --- a/patches/clang/no-unused-private-field.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/build/common.gypi b/build/common.gypi -index 3a59639..14bf0f9 100644 ---- a/build/common.gypi -+++ b/build/common.gypi -@@ -376,7 +376,8 @@ - }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd"', { - 'cflags': [ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter', -- '-Wnon-virtual-dtor', '-Woverloaded-virtual' ], -+ '-Wnon-virtual-dtor', '-Woverloaded-virtual', -+ '-Wno-unused-private-field' ], - }], - ['OS=="linux" and v8_enable_backtrace==1', { - # Support for backtrace_symbols. -diff --git a/build/standalone.gypi b/build/standalone.gypi -index 125c5bf..c8d9b4f 100644 ---- a/build/standalone.gypi -+++ b/build/standalone.gypi -@@ -98,7 +98,8 @@ - 'target_defaults': { - 'cflags': [ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter', - '-Wnon-virtual-dtor', '-pthread', '-fno-rtti', -- '-fno-exceptions', '-pedantic' ], -+ '-fno-exceptions', '-pedantic', -+ '-Wno-unused-private-field' ], - 'ldflags': [ '-pthread', ], - 'conditions': [ - [ 'OS=="linux"', { diff --git a/patches/clang33/silence-nested-anon-types-and-unused-function-warnings.patch b/patches/clang33/silence-nested-anon-types-and-unused-function-warnings.patch deleted file mode 100644 index b395751..0000000 --- a/patches/clang33/silence-nested-anon-types-and-unused-function-warnings.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/build/common.gypi b/build/common.gypi -index 14bf0f9..301109a 100644 ---- a/build/common.gypi -+++ b/build/common.gypi -@@ -377,7 +377,8 @@ - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd"', { - 'cflags': [ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter', - '-Wnon-virtual-dtor', '-Woverloaded-virtual', -- '-Wno-unused-private-field' ], -+ '-Wno-unused-private-field', '-Wno-nested-anon-types', -+ '-Wno-unused-function' ], - }], - ['OS=="linux" and v8_enable_backtrace==1', { - # Support for backtrace_symbols. -diff --git a/build/standalone.gypi b/build/standalone.gypi -index c8d9b4f..ddd1693 100644 ---- a/build/standalone.gypi -+++ b/build/standalone.gypi -@@ -99,7 +99,8 @@ - 'cflags': [ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter', - '-Wnon-virtual-dtor', '-pthread', '-fno-rtti', - '-fno-exceptions', '-pedantic', -- '-Wno-unused-private-field' ], -+ '-Wno-unused-private-field', '-Wno-nested-anon-types', -+ '-Wno-unused-function' ], - 'ldflags': [ '-pthread', ], - 'conditions': [ - [ 'OS=="linux"', { diff --git a/patches/disable-building-tests.patch b/patches/disable-building-tests.patch index a9f2555..cb53540 100644 --- a/patches/disable-building-tests.patch +++ b/patches/disable-building-tests.patch @@ -1,25 +1,25 @@ diff --git a/Makefile b/Makefile -index 0cdae4b..2bf8aa5 100644 +index f49be61..89f0d47 100644 --- a/Makefile +++ b/Makefile -@@ -153,7 +153,7 @@ ANDROID_ARCHES = android_ia32 android_arm +@@ -227,7 +227,7 @@ NACL_ARCHES = nacl_ia32 nacl_x64 # List of files that trigger Makefile regeneration: - GYPFILES = build/all.gyp build/common.gypi build/standalone.gypi \ - preparser/preparser.gyp samples/samples.gyp src/d8.gyp \ + GYPFILES = build/all.gyp build/features.gypi build/standalone.gypi \ + build/toolchain.gypi samples/samples.gyp src/d8.gyp \ - test/cctest/cctest.gyp tools/gyp/v8.gyp + tools/gyp/v8.gyp - - # Generates all combinations of ARCHES and MODES, e.g. "ia32.release". - BUILDS = $(foreach mode,$(MODES),$(addsuffix .$(mode),$(ARCHES))) + + # If vtunejit=on, the v8vtune.gyp will be appended. + ifeq ($(vtunejit), on) diff --git a/build/all.gyp b/build/all.gyp -index 4b2fe52..9885678 100644 +index 3860379..176b60f 100644 --- a/build/all.gyp +++ b/build/all.gyp -@@ -11,7 +11,6 @@ - '../preparser/preparser.gyp:*', +@@ -10,7 +10,6 @@ + 'dependencies': [ '../samples/samples.gyp:*', '../src/d8.gyp:d8', - '../test/cctest/cctest.gyp:*', ], - } - ] + 'conditions': [ + ['component!="shared_library"', { diff --git a/patches/gcc48/gcc48-wno-unused-local-typedefs.patch b/patches/gcc48/gcc48-wno-unused-local-typedefs.patch deleted file mode 100644 index d45276d..0000000 --- a/patches/gcc48/gcc48-wno-unused-local-typedefs.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/build/common.gypi b/build/common.gypi -index 3a59639..365178a 100644 ---- a/build/common.gypi -+++ b/build/common.gypi -@@ -376,7 +376,8 @@ - }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd"', { - 'cflags': [ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter', -- '-Wnon-virtual-dtor', '-Woverloaded-virtual' ], -+ '-Wnon-virtual-dtor', '-Woverloaded-virtual', -+ '-Wno-unused-local-typedefs' ], - }], - ['OS=="linux" and v8_enable_backtrace==1', { - # Support for backtrace_symbols. -diff --git a/build/standalone.gypi b/build/standalone.gypi -index 125c5bf..32eaf85 100644 ---- a/build/standalone.gypi -+++ b/build/standalone.gypi -@@ -98,7 +98,8 @@ - 'target_defaults': { - 'cflags': [ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter', - '-Wnon-virtual-dtor', '-pthread', '-fno-rtti', -- '-fno-exceptions', '-pedantic' ], -+ '-fno-exceptions', '-pedantic', -+ '-Wno-unused-local-typedefs' ], - 'ldflags': [ '-pthread', ], - 'conditions': [ - [ 'OS=="linux"', {