1diff -ru a/icu4c/source/common/udata.cpp b/icu4c/source/common/udata.cpp
2--- a/icu4c/source/common/udata.cpp	2019-04-17 12:03:04.000000000 +0000
3+++ b/icu4c/source/common/udata.cpp	2020-07-14 23:49:37.836668741 +0000
4@@ -18,11 +18,10 @@
5
6 #include "unicode/utypes.h"  /* U_PLATFORM etc. */
7
8-#ifdef __GNUC__
9-/* if gcc
10-#define ATTRIBUTE_WEAK __attribute__ ((weak))
11-might have to #include some other header
12-*/
13+#if defined(__GNUC__) || defined(__SUNPRO_CC)
14+#  define ATTRIBUTE_WEAK __attribute__ ((weak))
15+#else
16+#  define ATTRIBUTE_WEAK
17 #endif
18
19 #include "unicode/putil.h"
20@@ -649,10 +648,9 @@
21  * partial-data-library access functions where each returns a pointer
22  * to its data package, if it is linked in.
23  */
24-/*
25-extern const void *uprv_getICUData_collation(void) ATTRIBUTE_WEAK;
26-extern const void *uprv_getICUData_conversion(void) ATTRIBUTE_WEAK;
27-*/
28+U_CDECL_BEGIN
29+const void *uprv_getICUData_conversion(void) ATTRIBUTE_WEAK;
30+U_CDECL_END
31
32 /*----------------------------------------------------------------------*
33  *                                                                      *
34@@ -710,10 +708,11 @@
35         if (uprv_getICUData_collation) {
36             setCommonICUDataPointer(uprv_getICUData_collation(), FALSE, pErrorCode);
37         }
38+        */
39         if (uprv_getICUData_conversion) {
40             setCommonICUDataPointer(uprv_getICUData_conversion(), FALSE, pErrorCode);
41         }
42-        */
43+
44 #if U_PLATFORM_HAS_WINUWP_API == 0 // Windows UWP Platform does not support dll icu data at this time
45         setCommonICUDataPointer(&U_ICUDATA_ENTRY_POINT, FALSE, pErrorCode);
46         {
47diff -ru a/icu4c/source/common/unicode/uconfig.h b/icu4c/source/common/unicode/uconfig.h
48--- a/icu4c/source/common/unicode/uconfig.h	2019-04-17 12:03:04.000000000 +0000
49+++ b/icu4c/source/common/unicode/uconfig.h	2020-07-14 23:49:37.836668741 +0000
50@@ -55,6 +55,11 @@
51 #include "uconfig_local.h"
52 #endif
53
54+// Tensorflow is statically linked on all platforms.
55+#ifndef U_STATIC_IMPLEMENTATION
56+#define U_STATIC_IMPLEMENTATION
57+#endif
58+
59 /**
60  * \def U_DEBUG
61  * Determines whether to include debugging code.
62