commit f5d1dcca2f0bfb0f11cbce262159a2728a6051d8
author Yang Guo <yangguo@chromium.org> Thu May 09 15:09:18 2019 +0200
committer Jungshik Shin <jshin@chromium.org> Wed May 29 05:57:39 2019 +0000
tree 0396f0ba7fa6b4d53142075ce8fa7cbf90a2b955
parent bede82682293989f5e6854b4263351c01214c5c2

Fix embedded icu data on Windows

The symbol currently defined in the generated assembly does not match
what the linker expects.

Also remove the outdated special case for is_win.

R=jshin@chromium.org

Bug: chromium:938223
Change-Id: I2c2d3a16df7fa7f6801d70cdf4a80e99e2572f2f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/deps/icu/+/1599430
Reviewed-by: Jungshik Shin <jshin@chromium.org>

scripts/make_data_assembly.py

diff --git a/scripts/make_data_assembly.py b/scripts/make_data_assembly.py
index eb2bf72..94b07c8 100755
--- a/scripts/make_data_assembly.py
+++ b/scripts/make_data_assembly.py
@@ -60,10 +60,10 @@
                "\t.align 4\n"
                "_icudt%s_dat:\n" %tuple([version_number] * 3))
 elif options.win:
-  output.write(".globl icudt%s_dat\n"
+  output.write(".globl _icudt%s_dat\n"
                "\t.section .rdata\n"
                "\t.balign 16\n"
-               "icudt%s_dat:\n" % tuple([version_number] * 2))
+               "_icudt%s_dat:\n" % tuple([version_number] * 2))
 else:
   output.write(".globl icudt%s_dat\n"
                "\t.section .note.GNU-stack,\"\",%%progbits\n"