Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(602)

Side by Side Diff: icu52/patches/data.build.patch

Issue 224943002: icu local change part1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/
Patch Set: function indentation changed Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « icu52/patches/csetdet.patch ('k') | icu52/patches/gcc46.patch » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 --- source/data/Makefile.in» 2010-10-29 13:21:33.000000000 -0700 1 Index: source/data/Makefile.in
2 +++ source/data/Makefile.in» 2011-01-25 17:20:34.534195000 -0800 2 ===================================================================
3 @@ -227,7 +227,14 @@ 3 --- source/data/Makefile.in» (revision 259715)
4 # 2005-may-05 Removed Unicode properties files (unorm.icu, uprops.icu, ucase.i cu, ubidi.icu) 4 +++ source/data/Makefile.in» (working copy)
5 # from data build. See Jitterbug 4497. (makedata.mak revision 1.117) 5 @@ -240,7 +240,14 @@
6 # 2010-dec Removed pnames.icu.
7 # These are now hardcoded in ICU4C and only loaded in ICU4J.
6 # 8 #
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 9 -DAT_FILES_SHORT=unames.icu cnvalias.icu coll/ucadata.icu coll/invuca.icu nfc.nr m nfkc.nrm nfkc_cf.nrm uts46.nrm
8 +# CHROME: unames.icu is excluded from the data file. 10 +# 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, 11 +# 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 12 +# 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 13 +# 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 14 +# presence when compiling coll/root.txt. We have to put it back if Webkit
13 +# begins to use it. 15 +# begins to use it.
14 +# See https://bugs.webkit.org/show_bug.cgi?id=30437#c32 about invuca.icu. 16 +# 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 17 +DAT_FILES_SHORT=cnvalias.icu coll/ucadata.icu nfc.nrm nfkc.nrm nfkc_cf.nrm uts4 6.nrm
16 DAT_FILES=$(DAT_FILES_SHORT:%=$(BUILDDIR)/%) 18 DAT_FILES=$(DAT_FILES_SHORT:%=$(BUILDDIR)/%)
17 19
18 ## BRK files 20 ## BRK files
19 @@ -258,7 +265,8 @@ 21 @@ -271,7 +278,8 @@
20 -include $(UCMSRCDIR)/ucmfiles.mk 22 -include $(UCMSRCDIR)/ucmfiles.mk
21 -include $(UCMSRCDIR)/ucmebcdic.mk 23 -include $(UCMSRCDIR)/ucmebcdic.mk
22 -include $(UCMSRCDIR)/ucmlocal.mk 24 -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) 25 -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. 26 +# CHROME: we don't need any EBCDIC converters.
25 +ALL_UCM_SOURCE=$(UCM_SOURCE_CORE) $(UCM_SOURCE_FILES) $(UCM_SOURCE_EBCDIC) $(UC M_SOURCE_LOCAL) 27 +ALL_UCM_SOURCE=$(UCM_SOURCE_CORE) $(UCM_SOURCE_FILES) $(UCM_SOURCE_EBCDIC) $(UC M_SOURCE_LOCAL)
26 UCM_FILES = $(ALL_UCM_SOURCE:%=$(SRCDATADIR)/%) 28 UCM_FILES = $(ALL_UCM_SOURCE:%=$(SRCDATADIR)/%)
27 CNV_FILES = $(ALL_UCM_SOURCE:%.ucm=$(BUILDDIR)/%.cnv) 29 CNV_FILES = $(ALL_UCM_SOURCE:%.ucm=$(BUILDDIR)/%.cnv)
28 CNV_FILES_SHORT = $(ALL_UCM_SOURCE:%.ucm=%.cnv) 30 CNV_FILES_SHORT = $(ALL_UCM_SOURCE:%.ucm=%.cnv)
29 @@ -325,7 +333,8 @@ 31 @@ -338,7 +346,8 @@
30 TRANSLIT_SRC_FILES = $(TRANSLIT_SRC:%=$(TRANSLITSRCDIR)/%) 32 TRANSLIT_SRC_FILES = $(TRANSLIT_SRC:%=$(TRANSLITSRCDIR)/%)
31 INSTALLED_TRANSLIT_FILES = $(TRANSLIT_SOURCE:%.txt=%) $(TRANSLIT_SOURCE_LOCAL: %.txt=%) 33 INSTALLED_TRANSLIT_FILES = $(TRANSLIT_SOURCE:%.txt=%) $(TRANSLIT_SOURCE_LOCAL: %.txt=%)
32 endif 34 endif
33 -GENRBOPTS=-k 35 -GENRBOPTS=-k
34 +# CHROME : To save space, use '-R' option. 36 +# CHROME : To save space, use '-R' option.
35 +GENRBOPTS=-k -R 37 +GENRBOPTS=-k -R
36 38
37 ## MISC files 39 ## MISC files
38 -include $(MISCSRCDIR)/miscfiles.mk 40 -include $(MISCSRCDIR)/miscfiles.mk
39 @@ -494,7 +503,8 @@ 41 Index: source/tools/toolutil/pkg_genc.c
40 #################################################### SPP 42 ===================================================================
41 # SPP FILES 43 --- source/tools/toolutil/pkg_genc.c» (revision 259715)
42 44 +++ source/tools/toolutil/pkg_genc.c» (working copy)
43 -$(BUILDDIR)/%.spp: $(SPREPSRCDIR)/%.txt $(TOOLBINDIR)/gensprep$(TOOLEXEEXT) $(B UILDDIR)/unames.icu $(BUILDDIR)/pnames.icu 45 @@ -119,7 +119,11 @@
44 +# CHROME: We don't build unames.icu. 46 ".globl %s\n"
45 +$(BUILDDIR)/%.spp: $(SPREPSRCDIR)/%.txt $(TOOLBINDIR)/gensprep$(TOOLEXEEXT) $(B UILDDIR)/pnames.icu
46 » $(INVOKE) $(TOOLBINDIR)/gensprep -d $(BUILDDIR) -i $(BUILDDIR) -s $(SPRE PSRCDIR) -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" 47 "\t.section .note.GNU-stack,\"\",%%progbits\n"
53 "\t.section .rodata\n" 48 "\t.section .rodata\n"
54 "\t.align 8\n" /* Either align 8 bytes or 2^8 (256) bytes. 8 bytes is n eeded. */ 49 - "\t.balign 16\n"
50 + "\t.balign 16\n"
55 + /* The 3 lines below are added for Chrome. */ 51 + /* The 3 lines below are added for Chrome. */
56 + "#ifdef U_HIDE_DATA_SYMBOL\n" 52 + "#ifdef U_HIDE_DATA_SYMBOL\n"
57 + "\t.hidden %s\n" 53 + "\t.hidden %s\n"
58 + "#endif\n" 54 + "#endif\n"
59 "\t.type %s,%%object\n" 55 "\t.type %s,%%object\n"
60 "%s:\n\n", 56 "%s:\n\n",
61 57
62 @@ -130,6 +134,10 @@ 58 @@ -129,6 +133,10 @@
63 /*"\t.section __TEXT,__text,regular,pure_instructions\n" 59 /*"\t.section __TEXT,__text,regular,pure_instructions\n"
64 "\t.section __TEXT,__picsymbolstub1,symbol_stubs,pure_instructions,32\n "*/ 60 "\t.section __TEXT,__picsymbolstub1,symbol_stubs,pure_instructions,32\n "*/
65 ".globl _%s\n" 61 ".globl _%s\n"
66 + /* The 3 lines below are added for Chrome. */ 62 + /* The 3 lines below are added for Chrome. */
67 + "#ifdef U_HIDE_DATA_SYMBOL\n" 63 + "#ifdef U_HIDE_DATA_SYMBOL\n"
68 + "\t.private_extern _%s\n" 64 + "\t.private_extern _%s\n"
69 + "#endif\n" 65 + "#endif\n"
70 "\t.data\n" 66 "\t.data\n"
71 "\t.const\n" 67 "\t.const\n"
72 "\t.align 4\n" /* 1<<4 = 16 */ 68 "\t.balign 16\n"
73 @@ -249,7 +257,7 @@ 69 @@ -264,7 +272,7 @@
74 exit(U_FILE_ACCESS_ERROR); 70 exit(U_FILE_ACCESS_ERROR);
75 } 71 }
76 72
77 - getOutFilename(filename, destdir, bufferStr, entry, ".s", optFilename); 73 - getOutFilename(filename, destdir, bufferStr, entry, ".s", optFilename);
78 + getOutFilename(filename, destdir, bufferStr, entry, ".S", optFilename); 74 + getOutFilename(filename, destdir, bufferStr, entry, ".S", optFilename);
79 out=T_FileStream_open(bufferStr, "w"); 75 out=T_FileStream_open(bufferStr, "w");
80 if(out==NULL) { 76 if(out==NULL) {
81 fprintf(stderr, "genccode: unable to open output file %s\n", bufferStr) ; 77 fprintf(stderr, "genccode: unable to open output file %s\n", bufferStr) ;
OLDNEW
« no previous file with comments | « icu52/patches/csetdet.patch ('k') | icu52/patches/gcc46.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698