Skip to content
This repository was archived by the owner on Dec 4, 2023. It is now read-only.

Commit 18c76be

Browse files
ignisfignisf
committed
Refresh the patch set for upstream 6.0.286.44
1 parent e37cfd5 commit 18c76be

5 files changed

Lines changed: 43 additions & 35 deletions

‎patches/0001-Build-a-standalone-static-library.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 0bf02c0c573c22962065c5eb1a86e48f64a8ef24 Mon Sep 17 00:00:00 2001
1+
From b3d75137651a41d141c29c55725bc97485b247d8 Mon Sep 17 00:00:00 2001
22
From: Petko Bordjukov <bordjukov@gmail.com>
33
Date: Mon, 25 Jul 2016 00:00:19 +0300
44
Subject: [PATCH 1/5] Build a standalone static library
@@ -8,7 +8,7 @@ Subject: [PATCH 1/5] Build a standalone static library
88
1 file changed, 3 insertions(+)
99

1010
diff --git a/gypfiles/standalone.gypi b/gypfiles/standalone.gypi
11-
index 986aaaaebb..9006c2c2f5 100644
11+
index 4c805bf643..6a72a23cfb 100644
1212
--- a/gypfiles/standalone.gypi
1313
+++ b/gypfiles/standalone.gypi
1414
@@ -522,6 +522,9 @@

‎patches/0002-Don-t-compile-unnecessary-stuff.patch‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,52 @@
1-
From 3332a98da84d9ad9ec918feedb0aefc0bfceed52 Mon Sep 17 00:00:00 2001
1+
From 45000acd2fe5ccf48d1061f76eea2333524ebe74 Mon Sep 17 00:00:00 2001
22
From: Petko Bordjukov <bordjukov@gmail.com>
33
Date: Tue, 28 Feb 2017 00:04:26 +0200
44
Subject: [PATCH 2/5] Don't compile unnecessary stuff
55

66
---
7-
Makefile | 7 +------
8-
gypfiles/all.gyp | 32 --------------------------------
9-
2 files changed, 1 insertion(+), 38 deletions(-)
7+
Makefile | 14 ++++----------
8+
gypfiles/all.gyp | 33 ---------------------------------
9+
2 files changed, 4 insertions(+), 43 deletions(-)
1010

1111
diff --git a/Makefile b/Makefile
12-
index 299d4aa09c..16d8d2dd11 100644
12+
index ed5b3a7fab..360dc3a1a1 100644
1313
--- a/Makefile
1414
+++ b/Makefile
15-
@@ -270,12 +270,7 @@ GYPFILES = third_party/icu/icu.gypi third_party/icu/icu.gyp \
16-
gypfiles/shim_headers.gypi gypfiles/features.gypi \
17-
gypfiles/standalone.gypi \
18-
gypfiles/toolchain.gypi gypfiles/all.gyp gypfiles/mac/asan.gyp \
15+
@@ -265,16 +265,10 @@ ANDROID_ARCHES = android_ia32 android_x64 android_arm android_arm64 \
16+
android_mipsel android_x87
17+
18+
# List of files that trigger Makefile regeneration:
19+
-GYPFILES = third_party/icu/icu.gypi third_party/icu/icu.gyp \
20+
- gypfiles/shim_headers.gypi gypfiles/features.gypi \
21+
- gypfiles/standalone.gypi \
22+
- gypfiles/toolchain.gypi gypfiles/all.gyp gypfiles/mac/asan.gyp \
1923
- test/cctest/cctest.gyp test/fuzzer/fuzzer.gyp \
2024
- test/unittests/unittests.gyp src/v8.gyp \
2125
- tools/parser-shell.gyp testing/gmock.gyp testing/gtest.gyp \
2226
- buildtools/third_party/libc++abi/libc++abi.gyp \
2327
- buildtools/third_party/libc++/libc++.gyp samples/samples.gyp \
2428
- src/third_party/vtune/v8vtune.gyp src/d8.gyp
25-
+ src/v8.gyp tools/parser-shell.gyp src/d8.gyp
29+
+GYPFILES = gypfiles/shim_headers.gypi gypfiles/features.gypi \
30+
+ gypfiles/standalone.gypi gypfiles/toolchain.gypi \
31+
+ gypfiles/all.gyp gypfiles/mac/asan.gyp \
32+
+ tools/parser-shell.gyp src/d8.gyp
2633

2734
# If vtunejit=on, the v8vtune.gyp will be appended.
2835
ifeq ($(vtunejit), on)
2936
diff --git a/gypfiles/all.gyp b/gypfiles/all.gyp
30-
index bbad66741c..96820a0ecc 100644
37+
index bc9d9650eb..96820a0ecc 100644
3138
--- a/gypfiles/all.gyp
3239
+++ b/gypfiles/all.gyp
33-
@@ -9,7 +9,6 @@
40+
@@ -9,8 +9,6 @@
3441
'type': 'none',
3542
'dependencies': [
3643
'../src/d8.gyp:d8',
3744
- '../test/inspector/inspector.gyp:*',
45+
- '../test/mkgrokdump/mkgrokdump.gyp:*',
3846
],
3947
'conditions': [
4048
['component!="shared_library"', {
41-
@@ -17,37 +16,6 @@
49+
@@ -18,37 +16,6 @@
4250
'../tools/parser-shell.gyp:parser-shell',
4351
],
4452
}],

‎patches/0003-Use-the-fPIC-flag-for-the-static-library.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From b2ba4c09507d83ccd7ff9e95abf5087b30445430 Mon Sep 17 00:00:00 2001
1+
From 185c0249653dafb4ae20d21f2a0cc241c3e96c64 Mon Sep 17 00:00:00 2001
22
From: Petko Bordjukov <bordjukov@gmail.com>
33
Date: Mon, 25 Jul 2016 00:05:47 +0300
44
Subject: [PATCH 3/5] Use the -fPIC flag for the static library
@@ -8,10 +8,10 @@ Subject: [PATCH 3/5] Use the -fPIC flag for the static library
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/gypfiles/standalone.gypi b/gypfiles/standalone.gypi
11-
index 9006c2c2f5..08eb0761c9 100644
11+
index 6a72a23cfb..fdf27226ad 100644
1212
--- a/gypfiles/standalone.gypi
1313
+++ b/gypfiles/standalone.gypi
14-
@@ -794,7 +794,7 @@
14+
@@ -800,7 +800,7 @@
1515
[ 'visibility=="hidden" and v8_enable_backtrace==0', {
1616
'cflags': [ '-fvisibility=hidden' ],
1717
}],

‎patches/0004-Do-not-embed-debug-symbols-in-macOS-libraries.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From b5adedd20f6868d229ac524b170fcabc8c44c2db Mon Sep 17 00:00:00 2001
1+
From 596e88c9c1a158abc878bd81112aa9b5ec38033a Mon Sep 17 00:00:00 2001
22
From: Jb Aviat <jb@sqreen.io>
33
Date: Mon, 27 Feb 2017 11:14:42 +0200
44
Subject: [PATCH 4/5] Do not embed debug symbols in macOS libraries
@@ -9,10 +9,10 @@ This lowers dramatically the produced binary size
99
1 file changed, 1 insertion(+)
1010

1111
diff --git a/gypfiles/standalone.gypi b/gypfiles/standalone.gypi
12-
index 08eb0761c9..453e9efed9 100644
12+
index fdf27226ad..8c2972fe54 100644
1313
--- a/gypfiles/standalone.gypi
1414
+++ b/gypfiles/standalone.gypi
15-
@@ -1054,6 +1054,7 @@
15+
@@ -1059,6 +1059,7 @@
1616
'GCC_ENABLE_CPP_EXCEPTIONS': 'NO', # -fno-exceptions
1717
'GCC_ENABLE_CPP_RTTI': 'NO', # -fno-rtti
1818
'GCC_ENABLE_PASCAL_STRINGS': 'NO', # No -mpascal-strings

‎patches/0005-Fix-GCC-7-build-errors.patch‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 116d78a457473837092190b2a9187b660813258d Mon Sep 17 00:00:00 2001
1+
From da4cfa16ed1cbbc5e2ecfeecb64cbe939029ff36 Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= <mic.besace@gmail.com>
33
Date: Tue, 20 Jun 2017 13:14:38 +0200
44
Subject: [PATCH 5/5] Fix GCC 7 build errors
@@ -22,19 +22,19 @@ Cr-Commit-Position: refs/heads/master@{#46045}
2222
create mode 100644 src/objects/hash-table-inl.h
2323

2424
diff --git a/BUILD.gn b/BUILD.gn
25-
index 80ff7340b1..becf4177c1 100644
25+
index 80d6f34133..2060cb1981 100644
2626
--- a/BUILD.gn
2727
+++ b/BUILD.gn
28-
@@ -1717,6 +1717,7 @@ v8_source_set("v8_base") {
28+
@@ -1748,6 +1748,7 @@ v8_source_set("v8_base") {
2929
"src/objects/dictionary.h",
3030
"src/objects/frame-array-inl.h",
3131
"src/objects/frame-array.h",
3232
+ "src/objects/hash-table-inl.h",
3333
"src/objects/hash-table.h",
34-
"src/objects/literal-objects.cc",
35-
"src/objects/literal-objects.h",
34+
"src/objects/intl-objects.cc",
35+
"src/objects/intl-objects.h",
3636
diff --git a/src/objects-body-descriptors.h b/src/objects-body-descriptors.h
37-
index 9f080eb755..b201c20fbb 100644
37+
index 499c48a930..3eb3bb539e 100644
3838
--- a/src/objects-body-descriptors.h
3939
+++ b/src/objects-body-descriptors.h
4040
@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public BodyDescriptorBase {
@@ -44,10 +44,10 @@ index 9f080eb755..b201c20fbb 100644
4444
- IterateBody(obj);
4545
+ IterateBody<StaticVisitor>(obj);
4646
}
47-
};
4847

48+
static inline int SizeOf(Map* map, HeapObject* object) { return kSize; }
4949
diff --git a/src/objects-inl.h b/src/objects-inl.h
50-
index 4b819d43f4..07b62cc140 100644
50+
index 406f49d996..d179dc54d6 100644
5151
--- a/src/objects-inl.h
5252
+++ b/src/objects-inl.h
5353
@@ -31,6 +31,8 @@
@@ -100,10 +100,10 @@ index 0000000000..7b2db38495
100100
+
101101
+#endif // V8_OBJECTS_HASH_TABLE_INL_H_
102102
diff --git a/src/objects/hash-table.h b/src/objects/hash-table.h
103-
index 221598b711..3a351e3e16 100644
103+
index f3c68a82c5..de58bf4592 100644
104104
--- a/src/objects/hash-table.h
105105
+++ b/src/objects/hash-table.h
106-
@@ -135,22 +135,10 @@ class HashTable : public HashTableBase {
106+
@@ -138,22 +138,10 @@ class HashTable : public HashTableBase {
107107
public:
108108
typedef Shape ShapeT;
109109

@@ -131,17 +131,17 @@ index 221598b711..3a351e3e16 100644
131131
// Returns a new HashTable object.
132132
MUST_USE_RESULT static Handle<Derived> New(
133133
diff --git a/src/v8.gyp b/src/v8.gyp
134-
index 1f94a0680a..a8efcdcf3f 100644
134+
index 34fccc19dc..720b4a54f7 100644
135135
--- a/src/v8.gyp
136136
+++ b/src/v8.gyp
137-
@@ -1118,6 +1118,7 @@
137+
@@ -1228,6 +1228,7 @@
138138
'objects/dictionary.h',
139139
'objects/frame-array.h',
140140
'objects/frame-array-inl.h',
141141
+ 'objects/hash-table-inl.h',
142142
'objects/hash-table.h',
143-
'objects/literal-objects.cc',
144-
'objects/literal-objects.h',
143+
'objects/intl-objects.cc',
144+
'objects/intl-objects.h',
145145
--
146146
2.13.3
147147

0 commit comments

Comments
 (0)