diff --git a/Do-not-define-tgmath.h-fmaxmag-fminmag-macros-for-C2.patch b/Do-not-define-tgmath.h-fmaxmag-fminmag-macros-for-C2.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ce25968f0bbbd400aef9c3feb878106d0326d995
--- /dev/null
+++ b/Do-not-define-tgmath.h-fmaxmag-fminmag-macros-for-C2.patch
@@ -0,0 +1,37 @@
+From 79850e1025aabeccd3586c32ca259aa854607582 Mon Sep 17 00:00:00 2001
+From: Joseph Myers <joseph@codesourcery.com>
+Date: Wed, 29 Sep 2021 17:38:32 +0000
+Subject: [PATCH] Do not define tgmath.h fmaxmag, fminmag macros for C2X (bug
+ 28397)
+
+C2X does not include fmaxmag and fminmag.  When I updated feature test
+macro handling accordingly (commit
+858045ad1c5ac1682288bbcb3676632b97a21ddf, "Update floating-point
+feature test macro handling for C2X", included in 2.34), I missed
+updating tgmath.h so it doesn't define the corresponding type-generic
+macros unless __STDC_WANT_IEC_60559_BFP_EXT__ is defined; I've now
+reported this as bug 28397.  Adjust the conditionals in tgmath.h
+accordingly.
+
+Tested for x86_64.
+---
+ math/tgmath.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/math/tgmath.h b/math/tgmath.h
+index 9868353..3d7b099 100644
+--- a/math/tgmath.h
++++ b/math/tgmath.h
+@@ -921,7 +921,9 @@
+ 
+ /* Like ilogb, but returning long int.  */
+ # define llogb(Val) __TGMATH_UNARY_REAL_RET_ONLY (Val, llogb)
++#endif
+ 
++#if __GLIBC_USE (IEC_60559_BFP_EXT)
+ /* Return value with maximum magnitude.  */
+ # define fmaxmag(Val1, Val2) __TGMATH_BINARY_REAL_ONLY (Val1, Val2, fmaxmag)
+ 
+-- 
+1.8.3.1
+
diff --git a/glibc.spec b/glibc.spec
index 09df504fd84b7ea5359fd68d44ba8068a8c92874..c4ea06ce34437b9544db8d87357b034de08d0570 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -65,7 +65,7 @@
 ##############################################################################
 Name: 	 	glibc
 Version: 	2.34
-Release: 	35
+Release: 	36
 Summary: 	The GNU libc libraries
 License:	%{all_license}
 URL: 		http://www.gnu.org/software/glibc/
@@ -143,6 +143,7 @@ Patch56: Use-support_open_dev_null_range-io-tst-closefrom-mis.patch
 Patch57: Fix-failing-nss-tst-nss-files-hosts-long-with-local-.patch
 Patch58: nptl-Add-one-more-barrier-to-nptl-tst-create1.patch
 Patch59: io-Fix-ftw-internal-realloc-buffer-BZ-28126.patch
+Patch60: Do-not-define-tgmath.h-fmaxmag-fminmag-macros-for-C2.patch
 
 Patch9000: turn-default-value-of-x86_rep_stosb_threshold_form_2K_to_1M.patch
 Patch9001: delete-no-hard-link-to-avoid-all_language-package-to.patch 
@@ -1339,6 +1340,9 @@ fi
 %endif
 
 %changelog
+* Fri Dec 24 2021 Qingqing Li <liqingqing3@huawei.com> - 2.34-36
+- do not define tgmath.h fmaxmag, fminmag macros for C2X (BZ #28397)
+
 * Fri Dec 24 2021 Qingqing Li <liqingqing3@huawei.com> - 2.34-35
 - io: Fix ftw internal realloc buffer (BZ #28126)