Skip to content

Commit c95c596

Browse files
psumberapsumbera
authored
Merge pull request #9 from gco/master
jdk-11 and jdk-12 do not build on Solaris 11.4 with Solaris Studio 12.4
2 parents 535dffe + f9905a8 commit c95c596

File tree

4 files changed

+622
-0
lines changed

4 files changed

+622
-0
lines changed

‎OracleSolaris_OpenJDK_Builder/patches-11/harfbuzz.patch

+310
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,310 @@
1+
diff -r 40b646e9d8fb src/java.desktop/share/native/libharfbuzz/hb-machinery.hh
2+
--- a/src/java.desktop/share/native/libharfbuzz/hb-machinery.hh Fri Jun 12 02:34:44 2020 +0000
3+
+++ b/src/java.desktop/share/native/libharfbuzz/hb-machinery.hh Tue Jun 23 02:06:40 2020 -0500
4+
@@ -478,7 +478,7 @@
5+
}
6+
7+
template <typename Type>
8+
- hb_blob_t *reference_table (const hb_face_t *face, hb_tag_t tableTag = Type::tableTag)
9+
+ hb_blob_t *reference_table (const hb_face_t *face, hb_tag_t tableTag)
10+
{
11+
if (!num_glyphs_set)
12+
set_num_glyphs (hb_face_get_glyph_count (face));
13+
@@ -899,7 +899,7 @@
14+
hb_blob_t>
15+
{
16+
static hb_blob_t *create (hb_face_t *face)
17+
- { return hb_sanitize_context_t ().reference_table<T> (face); }
18+
+ { return hb_sanitize_context_t ().reference_table<T> (face, T::tableTag); }
19+
static void destroy (hb_blob_t *p) { hb_blob_destroy (p); }
20+
21+
static const hb_blob_t *get_null ()
22+
diff -r 40b646e9d8fb src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-table.hh
23+
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-table.hh Fri Jun 12 02:34:44 2020 +0000
24+
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-table.hh Tue Jun 23 02:06:40 2020 -0500
25+
@@ -1002,7 +1002,7 @@
26+
fontDicts.init ();
27+
privateDicts.init ();
28+
29+
- this->blob = sc.reference_table<cff1> (face);
30+
+ this->blob = sc.reference_table<cff1> (face, cff1::tableTag);
31+
32+
/* setup for run-time santization */
33+
sc.init (this->blob);
34+
@@ -1266,7 +1266,7 @@
35+
bool success = true;
36+
if (hb_subset_cff1 (plan, &cff_prime)) {
37+
success = success && plan->add_table (HB_OT_TAG_cff1, cff_prime);
38+
- hb_blob_t *head_blob = hb_sanitize_context_t().reference_table<head> (plan->source);
39+
+ hb_blob_t *head_blob = hb_sanitize_context_t().reference_table<head> (plan->source, head::tableTag);
40+
success = success && head_blob && plan->add_table (HB_OT_TAG_head, head_blob);
41+
hb_blob_destroy (head_blob);
42+
} else {
43+
diff -r 40b646e9d8fb src/java.desktop/share/native/libharfbuzz/hb-ot-cff2-table.hh
44+
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff2-table.hh Fri Jun 12 02:34:44 2020 +0000
45+
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff2-table.hh Tue Jun 23 02:06:40 2020 -0500
46+
@@ -426,7 +426,7 @@
47+
fontDicts.init ();
48+
privateDicts.init ();
49+
50+
- this->blob = sc.reference_table<cff2> (face);
51+
+ this->blob = sc.reference_table<cff2> (face, cff2::tableTag);
52+
53+
/* setup for run-time santization */
54+
sc.init (this->blob);
55+
@@ -540,7 +540,7 @@
56+
bool success = true;
57+
if (hb_subset_cff2 (plan, &cff2_prime)) {
58+
success = success && plan->add_table (HB_OT_TAG_cff2, cff2_prime);
59+
- hb_blob_t *head_blob = hb_sanitize_context_t().reference_table<head> (plan->source);
60+
+ hb_blob_t *head_blob = hb_sanitize_context_t().reference_table<head> (plan->source, head::tableTag);
61+
success = success && head_blob && plan->add_table (HB_OT_TAG_head, head_blob);
62+
hb_blob_destroy (head_blob);
63+
} else {
64+
diff -r 40b646e9d8fb src/java.desktop/share/native/libharfbuzz/hb-ot-cmap-table.hh
65+
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-cmap-table.hh Fri Jun 12 02:34:44 2020 +0000
66+
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-cmap-table.hh Tue Jun 23 02:06:40 2020 -0500
67+
@@ -996,7 +996,7 @@
68+
{
69+
void init (hb_face_t *face)
70+
{
71+
- this->table = hb_sanitize_context_t ().reference_table<cmap> (face);
72+
+ this->table = hb_sanitize_context_t ().reference_table<cmap> (face, cmap::tableTag);
73+
bool symbol;
74+
this->subtable = table->find_best_subtable (&symbol);
75+
this->subtable_uvs = &Null (CmapSubtableFormat14);
76+
diff -r 40b646e9d8fb src/java.desktop/share/native/libharfbuzz/hb-ot-color-cbdt-table.hh
77+
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-color-cbdt-table.hh Fri Jun 12 02:34:44 2020 +0000
78+
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-color-cbdt-table.hh Tue Jun 23 02:06:40 2020 -0500
79+
@@ -384,8 +384,8 @@
80+
{
81+
void init (hb_face_t *face)
82+
{
83+
- cblc = hb_sanitize_context_t().reference_table<CBLC> (face);
84+
- cbdt = hb_sanitize_context_t().reference_table<CBDT> (face);
85+
+ cblc = hb_sanitize_context_t().reference_table<CBLC> (face, CBLC::tableTag);
86+
+ cbdt = hb_sanitize_context_t().reference_table<CBDT> (face, CBDT::tableTag);
87+
88+
upem = hb_face_get_upem (face);
89+
}
90+
diff -r 40b646e9d8fb src/java.desktop/share/native/libharfbuzz/hb-ot-color-sbix-table.hh
91+
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-color-sbix-table.hh Fri Jun 12 02:34:44 2020 +0000
92+
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-color-sbix-table.hh Tue Jun 23 02:06:40 2020 -0500
93+
@@ -140,7 +140,7 @@
94+
{
95+
void init (hb_face_t *face)
96+
{
97+
- table = hb_sanitize_context_t().reference_table<sbix> (face);
98+
+ table = hb_sanitize_context_t().reference_table<sbix> (face, sbix::tableTag);
99+
num_glyphs = face->get_num_glyphs ();
100+
}
101+
void fini () { table.destroy (); }
102+
diff -r 40b646e9d8fb src/java.desktop/share/native/libharfbuzz/hb-ot-color-svg-table.hh
103+
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-color-svg-table.hh Fri Jun 12 02:34:44 2020 +0000
104+
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-color-svg-table.hh Tue Jun 23 02:06:40 2020 -0500
105+
@@ -80,7 +80,7 @@
106+
struct accelerator_t
107+
{
108+
void init (hb_face_t *face)
109+
- { table = hb_sanitize_context_t().reference_table<SVG> (face); }
110+
+ { table = hb_sanitize_context_t().reference_table<SVG> (face, SVG::tableTag); }
111+
void fini () { table.destroy (); }
112+
113+
hb_blob_t *reference_blob_for_glyph (hb_codepoint_t glyph_id) const
114+
diff -r 40b646e9d8fb src/java.desktop/share/native/libharfbuzz/hb-ot-glyf-table.hh
115+
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-glyf-table.hh Fri Jun 12 02:34:44 2020 +0000
116+
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-glyf-table.hh Tue Jun 23 02:06:40 2020 -0500
117+
@@ -104,7 +104,7 @@
118+
static bool
119+
_add_head_and_set_loca_version (hb_subset_plan_t *plan, bool use_short_loca)
120+
{
121+
- hb_blob_t *head_blob = hb_sanitize_context_t ().reference_table<head> (plan->source);
122+
+ hb_blob_t *head_blob = hb_sanitize_context_t ().reference_table<head> (plan->source, head::tableTag);
123+
hb_blob_t *head_prime_blob = hb_blob_copy_writable_or_fail (head_blob);
124+
hb_blob_destroy (head_blob);
125+
126+
@@ -238,8 +238,8 @@
127+
return;
128+
short_offset = 0 == head.indexToLocFormat;
129+
130+
- loca_table = hb_sanitize_context_t ().reference_table<loca> (face);
131+
- glyf_table = hb_sanitize_context_t ().reference_table<glyf> (face);
132+
+ loca_table = hb_sanitize_context_t ().reference_table<loca> (face, loca::tableTag);
133+
+ glyf_table = hb_sanitize_context_t ().reference_table<glyf> (face, glyf::tableTag);
134+
135+
num_glyphs = MAX (1u, loca_table.get_length () / (short_offset ? 2 : 4)) - 1;
136+
}
137+
diff -r 40b646e9d8fb src/java.desktop/share/native/libharfbuzz/hb-ot-hmtx-table.hh
138+
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-hmtx-table.hh Fri Jun 12 02:34:44 2020 +0000
139+
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-hmtx-table.hh Tue Jun 23 02:06:40 2020 -0500
140+
@@ -200,7 +200,7 @@
141+
got_font_extents = (ascender | descender) != 0;
142+
}
143+
144+
- hb_blob_t *_hea_blob = hb_sanitize_context_t().reference_table<H> (face);
145+
+ hb_blob_t *_hea_blob = hb_sanitize_context_t().reference_table<H> (face, H::tableTag);
146+
const H *_hea_table = _hea_blob->as<H> ();
147+
num_advances = _hea_table->numberOfLongMetrics;
148+
if (!got_font_extents)
149+
diff -r 40b646e9d8fb src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gdef-table.hh
150+
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gdef-table.hh Fri Jun 12 02:34:44 2020 +0000
151+
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gdef-table.hh Tue Jun 23 02:06:40 2020 -0500
152+
@@ -416,7 +416,7 @@
153+
{
154+
void init (hb_face_t *face)
155+
{
156+
- this->table = hb_sanitize_context_t().reference_table<GDEF> (face);
157+
+ this->table = hb_sanitize_context_t().reference_table<GDEF> (face, GDEF::tableTag);
158+
if (unlikely (this->table->is_blacklisted (this->table.get_blob (), face)))
159+
{
160+
hb_blob_destroy (this->table.get_blob ());
161+
diff -r 40b646e9d8fb src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gsubgpos.hh
162+
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gsubgpos.hh Fri Jun 12 02:34:44 2020 +0000
163+
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gsubgpos.hh Tue Jun 23 02:06:40 2020 -0500
164+
@@ -2724,7 +2724,7 @@
165+
{
166+
void init (hb_face_t *face)
167+
{
168+
- this->table = hb_sanitize_context_t().reference_table<T> (face);
169+
+ this->table = hb_sanitize_context_t().reference_table<T> (face, T::tableTag);
170+
if (unlikely (this->table->is_blacklisted (this->table.get_blob (), face)))
171+
{
172+
hb_blob_destroy (this->table.get_blob ());
173+
diff -r 40b646e9d8fb src/java.desktop/share/native/libharfbuzz/hb-ot-maxp-table.hh
174+
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-maxp-table.hh Fri Jun 12 02:34:44 2020 +0000
175+
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-maxp-table.hh Tue Jun 23 02:06:40 2020 -0500
176+
@@ -96,7 +96,7 @@
177+
178+
bool subset (hb_subset_plan_t *plan) const
179+
{
180+
- hb_blob_t *maxp_blob = hb_sanitize_context_t().reference_table<maxp> (plan->source);
181+
+ hb_blob_t *maxp_blob = hb_sanitize_context_t().reference_table<maxp> (plan->source, maxp::tableTag);
182+
hb_blob_t *maxp_prime_blob = hb_blob_copy_writable_or_fail (maxp_blob);
183+
hb_blob_destroy (maxp_blob);
184+
185+
diff -r 40b646e9d8fb src/java.desktop/share/native/libharfbuzz/hb-ot-name-table.hh
186+
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-name-table.hh Fri Jun 12 02:34:44 2020 +0000
187+
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-name-table.hh Tue Jun 23 02:06:40 2020 -0500
188+
@@ -180,7 +180,7 @@
189+
{
190+
void init (hb_face_t *face)
191+
{
192+
- this->table = hb_sanitize_context_t().reference_table<name> (face);
193+
+ this->table = hb_sanitize_context_t().reference_table<name> (face, name::tableTag);
194+
assert (this->table.get_length () >= this->table->stringOffset);
195+
this->pool = (const char *) (const void *) (this->table+this->table->stringOffset);
196+
this->pool_len = this->table.get_length () - this->table->stringOffset;
197+
diff -r 40b646e9d8fb src/java.desktop/share/native/libharfbuzz/hb-ot-os2-table.hh
198+
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-os2-table.hh Fri Jun 12 02:34:44 2020 +0000
199+
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-os2-table.hh Tue Jun 23 02:06:40 2020 -0500
200+
@@ -147,7 +147,7 @@
201+
202+
bool subset (hb_subset_plan_t *plan) const
203+
{
204+
- hb_blob_t *os2_blob = hb_sanitize_context_t ().reference_table<OS2> (plan->source);
205+
+ hb_blob_t *os2_blob = hb_sanitize_context_t ().reference_table<OS2> (plan->source, OS2::tableTag);
206+
hb_blob_t *os2_prime_blob = hb_blob_create_sub_blob (os2_blob, 0, -1);
207+
// TODO(grieger): move to hb_blob_copy_writable_or_fail
208+
hb_blob_destroy (os2_blob);
209+
diff -r 40b646e9d8fb src/java.desktop/share/native/libharfbuzz/hb-ot-post-table.hh
210+
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-post-table.hh Fri Jun 12 02:34:44 2020 +0000
211+
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-post-table.hh Tue Jun 23 02:06:40 2020 -0500
212+
@@ -76,7 +76,7 @@
213+
bool subset (hb_subset_plan_t *plan) const
214+
{
215+
unsigned int post_prime_length;
216+
- hb_blob_t *post_blob = hb_sanitize_context_t ().reference_table<post>(plan->source);
217+
+ hb_blob_t *post_blob = hb_sanitize_context_t ().reference_table<post>(plan->source, post::tableTag);
218+
hb_blob_t *post_prime_blob = hb_blob_create_sub_blob (post_blob, 0, post::min_size);
219+
post *post_prime = (post *) hb_blob_get_data_writable (post_prime_blob, &post_prime_length);
220+
hb_blob_destroy (post_blob);
221+
@@ -101,7 +101,7 @@
222+
{
223+
index_to_offset.init ();
224+
225+
- table = hb_sanitize_context_t ().reference_table<post> (face);
226+
+ table = hb_sanitize_context_t ().reference_table<post> (face, post::tableTag);
227+
unsigned int table_length = table.get_length ();
228+
229+
version = table->version.to_int ();
230+
diff -r 40b646e9d8fb src/java.desktop/share/native/libharfbuzz/hb-ot-vorg-table.hh
231+
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-vorg-table.hh Fri Jun 12 02:34:44 2020 +0000
232+
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-vorg-table.hh Tue Jun 23 02:06:40 2020 -0500
233+
@@ -104,7 +104,7 @@
234+
235+
bool subset (hb_subset_plan_t *plan) const
236+
{
237+
- hb_blob_t *vorg_blob = hb_sanitize_context_t().reference_table<VORG> (plan->source);
238+
+ hb_blob_t *vorg_blob = hb_sanitize_context_t().reference_table<VORG> (plan->source, VORG::tableTag);
239+
const VORG *vorg_table = vorg_blob->as<VORG> ();
240+
241+
/* count the number of glyphs to be included in the subset table */
242+
diff -r 40b646e9d8fb src/java.desktop/share/native/libharfbuzz/hb-static.cc
243+
--- a/src/java.desktop/share/native/libharfbuzz/hb-static.cc Fri Jun 12 02:34:44 2020 +0000
244+
+++ b/src/java.desktop/share/native/libharfbuzz/hb-static.cc Tue Jun 23 02:06:40 2020 -0500
245+
@@ -55,7 +55,7 @@
246+
{
247+
hb_sanitize_context_t c = hb_sanitize_context_t ();
248+
c.set_num_glyphs (0); /* So we don't recurse ad infinitum. */
249+
- hb_blob_t *maxp_blob = c.reference_table<OT::maxp> (this);
250+
+ hb_blob_t *maxp_blob = c.reference_table<OT::maxp> (this, OT::maxp::tableTag);
251+
const OT::maxp *maxp_table = maxp_blob->as<OT::maxp> ();
252+
253+
unsigned int ret = maxp_table->get_num_glyphs ();
254+
diff -r 40b646e9d8fb src/java.desktop/share/native/libharfbuzz/hb-subset-cff1.cc
255+
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset-cff1.cc Fri Jun 12 02:34:44 2020 +0000
256+
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-cff1.cc Tue Jun 23 02:06:40 2020 -0500
257+
@@ -1089,7 +1089,7 @@
258+
hb_subset_cff1 (hb_subset_plan_t *plan,
259+
hb_blob_t **prime /* OUT */)
260+
{
261+
- hb_blob_t *cff_blob = hb_sanitize_context_t().reference_table<CFF::cff1> (plan->source);
262+
+ hb_blob_t *cff_blob = hb_sanitize_context_t().reference_table<CFF::cff1> (plan->source, CFF::cff1::tableTag);
263+
const char *data = hb_blob_get_data(cff_blob, nullptr);
264+
265+
OT::cff1::accelerator_subset_t acc;
266+
diff -r 40b646e9d8fb src/java.desktop/share/native/libharfbuzz/hb-subset-cff2.cc
267+
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset-cff2.cc Fri Jun 12 02:34:44 2020 +0000
268+
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-cff2.cc Tue Jun 23 02:06:40 2020 -0500
269+
@@ -609,7 +609,7 @@
270+
hb_subset_cff2 (hb_subset_plan_t *plan,
271+
hb_blob_t **prime /* OUT */)
272+
{
273+
- hb_blob_t *cff2_blob = hb_sanitize_context_t().reference_table<CFF::cff2> (plan->source);
274+
+ hb_blob_t *cff2_blob = hb_sanitize_context_t().reference_table<CFF::cff2> (plan->source, CFF::cff2::tableTag);
275+
const char *data = hb_blob_get_data(cff2_blob, nullptr);
276+
277+
OT::cff2::accelerator_subset_t acc;
278+
diff -r 40b646e9d8fb src/java.desktop/share/native/libharfbuzz/hb-subset-glyf.cc
279+
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset-glyf.cc Fri Jun 12 02:34:44 2020 +0000
280+
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-glyf.cc Tue Jun 23 02:06:40 2020 -0500
281+
@@ -291,7 +291,7 @@
282+
hb_blob_t **glyf_prime, /* OUT */
283+
hb_blob_t **loca_prime /* OUT */)
284+
{
285+
- hb_blob_t *glyf_blob = hb_sanitize_context_t ().reference_table<OT::glyf> (plan->source);
286+
+ hb_blob_t *glyf_blob = hb_sanitize_context_t ().reference_table<OT::glyf> (plan->source, OT::glyf::tableTag);
287+
const char *glyf_data = hb_blob_get_data (glyf_blob, nullptr);
288+
289+
OT::glyf::accelerator_t glyf;
290+
diff -r 40b646e9d8fb src/java.desktop/share/native/libharfbuzz/hb-subset.cc
291+
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset.cc Fri Jun 12 02:34:44 2020 +0000
292+
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset.cc Tue Jun 23 02:06:40 2020 -0500
293+
@@ -64,7 +64,7 @@
294+
static bool
295+
_subset2 (hb_subset_plan_t *plan)
296+
{
297+
- hb_blob_t *source_blob = hb_sanitize_context_t ().reference_table<TableType> (plan->source);
298+
+ hb_blob_t *source_blob = hb_sanitize_context_t ().reference_table<TableType> (plan->source, TableType::tableTag);
299+
const TableType *table = source_blob->as<TableType> ();
300+
301+
hb_tag_t tag = TableType::tableTag;
302+
@@ -119,7 +119,7 @@
303+
static bool
304+
_subset (hb_subset_plan_t *plan)
305+
{
306+
- hb_blob_t *source_blob = hb_sanitize_context_t ().reference_table<TableType> (plan->source);
307+
+ hb_blob_t *source_blob = hb_sanitize_context_t ().reference_table<TableType> (plan->source, TableType::tableTag);
308+
const TableType *table = source_blob->as<TableType> ();
309+
310+
hb_tag_t tag = TableType::tableTag;

‎OracleSolaris_OpenJDK_Builder/patches-11/series

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
Solaris11-EM_486.patch -p0
22
Solaris11-TRAPNO.patch -p0
3+
harfbuzz.patch -p1

0 commit comments

Comments
 (0)