diff --git a/Rewrite-iconv-option-parsing-BZ-19519.patch b/Rewrite-iconv-option-parsing-BZ-19519.patch
index 0a88e90342c2a2406ac2478fdc87c0d2527a5742..1386e07a3c317e9a7a4f43d29d41f0fed6ad82e8 100644
--- a/Rewrite-iconv-option-parsing-BZ-19519.patch
+++ b/Rewrite-iconv-option-parsing-BZ-19519.patch
@@ -836,7 +836,7 @@ index 0000000000..669d812a6a
 +static int
 +do_test (void)
 +{
-+  xsetlocale (LC_ALL, "en_US.UTF-8");
++  setlocale (LC_ALL, "en_US.UTF-8");
 +
 +
 +  /* 0. iconv_open should gracefully fail for invalid character sets.  */
diff --git a/glibc.spec b/glibc.spec
index 6cf45185936e6cc5b46ffe6cae12043b46967e46..c0a99682fa0ad31955abe3a6e08a378c9d877643 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -59,7 +59,7 @@
 ##############################################################################
 Name: 	 	glibc
 Version: 	2.28
-Release: 	83
+Release: 	84
 Summary: 	The GNU libc libraries
 License:	%{all_license}
 URL: 		http://www.gnu.org/software/glibc/
@@ -1168,7 +1168,10 @@ fi
 %doc hesiod/README.hesiod
 
 %changelog
-* Fri Dec 3 2021 Yang yanchao <yangyanchao6huawei.com> - 2.28-83
+* Fri Dec 24 2021 Yang yanchao <yangyanchao6@huawei.com> - 2.28-84
+- use setlocale instand of xetlocale in tst-iconv-opt
+
+* Fri Dec 3 2021 Yang yanchao <yangyanchao6@huawei.com> - 2.28-83
 - iconv: revert Add missing brackets
   Rewrite iconv option parsing [BZ #19519]
   intl: Handle translation output codesets with suffixes [BZ #26383]