From: Michael Forney <mforney@mforney.org>
Date: Fri, 31 May 2019 18:25:48 +0000 (+0000)
Subject: cp-demangle.c: Don't define CP_DYNAMIC_ARRAYS if __STDC_NO_VLA__ is non-zero.
X-Git-Tag: misc/cutover-git~5122
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a1c064a94c077d3f0b1383f825de7105a7c075d;p=thirdparty%2Fgcc.git

cp-demangle.c: Don't define CP_DYNAMIC_ARRAYS if __STDC_NO_VLA__ is non-zero.

	* cp-demangle.c: Don't define CP_DYNAMIC_ARRAYS if __STDC_NO_VLA__
	is non-zero.

From-SVN: r271819
---

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 0fac65bb1534..c3daf2ae8c88 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2019-05-31  Michael Forney  <mforney@mforney.org>
+
+	* cp-demangle.c: Don't define CP_DYNAMIC_ARRAYS if __STDC_NO_VLA__
+	is non-zero.
+
 2019-04-30  Ben L  <bobsayshilol@live.co.uk>
 
 	* d-demangle.c (dlang_parse_assocarray): Correctly handle error result.
diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
index 4e5b733b548c..aa78c86dd443 100644
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -192,9 +192,9 @@ static void d_init_info (const char *, int, size_t, struct d_info *);
 #else
 #ifdef __STDC__
 #ifdef __STDC_VERSION__
-#if __STDC_VERSION__ >= 199901L
+#if __STDC_VERSION__ >= 199901L && !__STDC_NO_VLA__
 #define CP_DYNAMIC_ARRAYS
-#endif /* __STDC__VERSION >= 199901L */
+#endif /* __STDC_VERSION__ >= 199901L && !__STDC_NO_VLA__ */
 #endif /* defined (__STDC_VERSION__) */
 #endif /* defined (__STDC__) */
 #endif /* ! defined (__GNUC__) */