• Home
  • Line#
  • Scopes#
  • Navigate#
  • Raw
  • Download
1--- source/data/Makefile.in	2010-10-29 13:21:33.000000000 -0700
2+++ source/data/Makefile.in	2011-01-25 17:20:34.534195000 -0800
3@@ -227,7 +227,14 @@
4 #  2005-may-05 Removed Unicode properties files (unorm.icu, uprops.icu, ucase.icu, ubidi.icu)
5 #  from data build. See Jitterbug 4497. (makedata.mak revision 1.117)
6 #
7-DAT_FILES_SHORT=pnames.icu unames.icu cnvalias.icu coll/ucadata.icu coll/invuca.icu nfc.nrm nfkc.nrm nfkc_cf.nrm uts46.nrm
8+# CHROME: unames.icu is excluded from the data file.
9+# coll/invuca.icu is also excluded. When building a ICU data file to check in,
10+# we need to copy data/in/coll/invuca.icu to the build location (expected
11+# by genrb : out/build/icudt46l/coll) by hand because genrb requires its
12+# presence when compiling coll/root.txt. We have to put it back if Webkit
13+# begins to use it.
14+# See https://bugs.webkit.org/show_bug.cgi?id=30437#c32 about invuca.icu.
15+DAT_FILES_SHORT=pnames.icu cnvalias.icu coll/ucadata.icu nfc.nrm nfkc.nrm nfkc_cf.nrm uts46.nrm
16 DAT_FILES=$(DAT_FILES_SHORT:%=$(BUILDDIR)/%)
17
18 ## BRK files
19@@ -258,7 +265,8 @@
20 -include $(UCMSRCDIR)/ucmfiles.mk
21 -include $(UCMSRCDIR)/ucmebcdic.mk
22 -include $(UCMSRCDIR)/ucmlocal.mk
23-ALL_UCM_SOURCE=ibm-37_P100-1995.ucm ibm-1047_P100-1995.ucm $(UCM_SOURCE_CORE) $(UCM_SOURCE_FILES) $(UCM_SOURCE_EBCDIC) $(UCM_SOURCE_LOCAL)
24+# CHROME: we don't need any EBCDIC converters.
25+ALL_UCM_SOURCE=$(UCM_SOURCE_CORE) $(UCM_SOURCE_FILES) $(UCM_SOURCE_EBCDIC) $(UCM_SOURCE_LOCAL)
26 UCM_FILES = $(ALL_UCM_SOURCE:%=$(SRCDATADIR)/%)
27 CNV_FILES = $(ALL_UCM_SOURCE:%.ucm=$(BUILDDIR)/%.cnv)
28 CNV_FILES_SHORT = $(ALL_UCM_SOURCE:%.ucm=%.cnv)
29@@ -325,7 +333,8 @@
30 TRANSLIT_SRC_FILES = $(TRANSLIT_SRC:%=$(TRANSLITSRCDIR)/%)
31 INSTALLED_TRANSLIT_FILES = $(TRANSLIT_SOURCE:%.txt=%)  $(TRANSLIT_SOURCE_LOCAL:%.txt=%)
32 endif
33-GENRBOPTS=-k
34+# CHROME : To save space, use '-R' option.
35+GENRBOPTS=-k -R
36
37 ## MISC files
38 -include $(MISCSRCDIR)/miscfiles.mk
39@@ -494,7 +503,8 @@
40 ####################################################    SPP
41 # SPP FILES
42
43-$(BUILDDIR)/%.spp: $(SPREPSRCDIR)/%.txt $(TOOLBINDIR)/gensprep$(TOOLEXEEXT) $(BUILDDIR)/unames.icu $(BUILDDIR)/pnames.icu
44+# CHROME: We don't build unames.icu.
45+$(BUILDDIR)/%.spp: $(SPREPSRCDIR)/%.txt $(TOOLBINDIR)/gensprep$(TOOLEXEEXT) $(BUILDDIR)/pnames.icu
46 	$(INVOKE) $(TOOLBINDIR)/gensprep -d $(BUILDDIR) -i $(BUILDDIR) -s $(SPREPSRCDIR) -b $(@F:%.spp=%) -m $(UNICODEDATADIR) -u 3.2.0 $(<F)
47
48 ####################################################    BRK
49--- source/tools/toolutil/pkg_genc.c	2010-07-12 11:03:29.000000000 -0700
50+++ source/tools/toolutil/pkg_genc.c	2011-01-27 17:16:33.624596000 -0800
51@@ -121,6 +121,10 @@
52         "\t.section .note.GNU-stack,\"\",%%progbits\n"
53         "\t.section .rodata\n"
54         "\t.align 8\n" /* Either align 8 bytes or 2^8 (256) bytes. 8 bytes is needed. */
55+        /* The 3 lines below are added for Chrome. */
56+        "#ifdef U_HIDE_DATA_SYMBOL\n"
57+        "\t.hidden %s\n"
58+        "#endif\n"
59         "\t.type %s,%%object\n"
60         "%s:\n\n",
61
62@@ -130,6 +134,10 @@
63         /*"\t.section __TEXT,__text,regular,pure_instructions\n"
64         "\t.section __TEXT,__picsymbolstub1,symbol_stubs,pure_instructions,32\n"*/
65         ".globl _%s\n"
66+        /* The 3 lines below are added for Chrome. */
67+        "#ifdef U_HIDE_DATA_SYMBOL\n"
68+        "\t.private_extern _%s\n"
69+        "#endif\n"
70         "\t.data\n"
71         "\t.const\n"
72         "\t.align 4\n"  /* 1<<4 = 16 */
73@@ -249,7 +257,7 @@
74         exit(U_FILE_ACCESS_ERROR);
75     }
76
77-    getOutFilename(filename, destdir, bufferStr, entry, ".s", optFilename);
78+    getOutFilename(filename, destdir, bufferStr, entry, ".S", optFilename);
79     out=T_FileStream_open(bufferStr, "w");
80     if(out==NULL) {
81         fprintf(stderr, "genccode: unable to open output file %s\n", bufferStr);
82