fdo#53855: Use the newly added HAVE_GCC_BUILTIN_ATOMIC for icu

Signed-off-by: Stephan Bergmann <sbergman@redhat.com>:
* pass -DU_HAVE_GCC_ATOMICS=1 in when applicable on MINGW, too

Change-Id: I2073c61fb92d698a3c1ba38266dbd0373b0a693c

icu/icu4c-interlck.patch

---- misc/icu/source/common/putilimp.h
-+++ misc/build/icu/source/common/putilimp.h
-@@ -175,7 +175,7 @@
-  */
- #ifdef U_HAVE_GCC_ATOMICS
-     /* Use the predefined value. */
--#elif defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 401)
-+#elif defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 404)
- #   define U_HAVE_GCC_ATOMICS 1
- #else
- #   define U_HAVE_GCC_ATOMICS 0

icu/makefile.mk

@@ -58,7 +58,6 @@ PATCH_FILES=\
     icu4c-warnings.patch \
     icu4c.9313.cygwin.patch \
     icu4c-macosx.patch \
-    icu4c-interlck.patch \
     icu4c-solarisgcc.patch \
 
 .IF "$(OS)"=="ANDROID"
@@ -69,6 +68,10 @@ PATCH_FILES+=\
     icu4c-rpath.patch
 .ENDIF
 
+.IF "$(HAVE_GCC_BUILTIN_ATOMIC)"=="TRUE"
+EXTRA_CDEFS+=-DU_HAVE_GCC_ATOMICS=1
+.ENDIF
+
 .IF "$(GUI)"=="UNX"
 
 .IF "$(SYSBASE)"!=""
@@ -236,7 +239,7 @@ BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-cross-bu
 BUILD_AND_HOST=--build=i586-pc-mingw32 --enable-64bit-libs=no
 .ENDIF
 
-CONFIGURE_ACTION+=sh -c 'CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="$(icu_LDFLAGS)" LIBS="$(icu_LIBS)" \
+CONFIGURE_ACTION+=sh -c 'CPPFLAGS="$(EXTRA_CDEFS)" CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="$(icu_LDFLAGS)" LIBS="$(icu_LIBS)" \
 ./configure $(BUILD_AND_HOST) --enable-layout --disable-static --enable-shared --disable-samples'
 
 CONFIGURE_FLAGS=