diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 4ad6b1639fc..8d59b1f9e97 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,6 +1,10 @@
 2017-05-05  Jakub Jelinek  <jakub@redhat.com>
 
 	Backported from mainline
+	2017-03-30  Jakub Jelinek  <jakub@redhat.com>
+
+	* env.c (initialize_env): Initialize stacksize to 0.
+
 	2017-03-08  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c/79940
diff --git a/libgomp/env.c b/libgomp/env.c
index ac05c3b7b75..6dd3d46888e 100644
--- a/libgomp/env.c
+++ b/libgomp/env.c
@@ -1182,7 +1182,7 @@ handle_omp_display_env (unsigned long stacksize, int wait_policy)
 static void __attribute__((constructor))
 initialize_env (void)
 {
-  unsigned long thread_limit_var, stacksize;
+  unsigned long thread_limit_var, stacksize = 0;
   int wait_policy;
 
   /* Do a compile time check that mkomp_h.pl did good job.  */