7 files changed, 9 insertions, 9 deletions
diff --git a/src/stdio/__stdio_exit.c b/src/stdio/__stdio_exit.c
index e4380aaf..716e5f73 100644
--- a/src/stdio/__stdio_exit.c
+++ b/src/stdio/__stdio_exit.c
@@ -1,6 +1,6 @@
 #include "stdio_impl.h"
 
-static FILE *const dummy_file = 0;
+static FILE *volatile dummy_file = 0;
 weak_alias(dummy_file, __stdin_used);
 weak_alias(dummy_file, __stdout_used);
 weak_alias(dummy_file, __stderr_used);
diff --git a/src/stdio/fflush.c b/src/stdio/fflush.c
index af709503..7bf862a6 100644
--- a/src/stdio/fflush.c
+++ b/src/stdio/fflush.c
@@ -19,7 +19,7 @@ static int __fflush_unlocked(FILE *f)
 }
 
 /* stdout.c will override this if linked */
-static FILE *const dummy = 0;
+static FILE *volatile dummy = 0;
 weak_alias(dummy, __stdout_used);
 
 int fflush(FILE *f)
diff --git a/src/stdio/stderr.c b/src/stdio/stderr.c
index 3fd8f81d..229c8651 100644
--- a/src/stdio/stderr.c
+++ b/src/stdio/stderr.c
@@ -13,4 +13,4 @@ static FILE f = {
 	.lock = -1,
 };
 FILE *const stderr = &f;
-FILE *const __stderr_used = &f;
+FILE *volatile __stderr_used = &f;
diff --git a/src/stdio/stdin.c b/src/stdio/stdin.c
index 476dc708..171ff22a 100644
--- a/src/stdio/stdin.c
+++ b/src/stdio/stdin.c
@@ -12,4 +12,4 @@ static FILE f = {
 	.lock = -1,
 };
 FILE *const stdin = &f;
-FILE *const __stdin_used = &f;
+FILE *volatile __stdin_used = &f;
diff --git a/src/stdio/stdout.c b/src/stdio/stdout.c
index 3855dd0b..6b188942 100644
--- a/src/stdio/stdout.c
+++ b/src/stdio/stdout.c
@@ -13,4 +13,4 @@ static FILE f = {
 	.lock = -1,
 };
 FILE *const stdout = &f;
-FILE *const __stdout_used = &f;
+FILE *volatile __stdout_used = &f;
diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index 64151254..e77e54a5 100644
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -116,12 +116,12 @@ static int start(void *p)
 #define ROUND(x) (((x)+PAGE_SIZE-1)&-PAGE_SIZE)
 
 /* pthread_key_create.c overrides this */
-static const size_t dummy = 0;
+static volatile size_t dummy = 0;
 weak_alias(dummy, __pthread_tsd_size);
-static void *const dummy_tsd[1] = { 0 };
+static void *dummy_tsd[1] = { 0 };
 weak_alias(dummy_tsd, __pthread_tsd_main);
 
-static FILE *const dummy_file = 0;
+static FILE *volatile dummy_file = 0;
 weak_alias(dummy_file, __stdin_used);
 weak_alias(dummy_file, __stdout_used);
 weak_alias(dummy_file, __stderr_used);
diff --git a/src/thread/pthread_key_create.c b/src/thread/pthread_key_create.c
index ef8a755d..a9187f7b 100644
--- a/src/thread/pthread_key_create.c
+++ b/src/thread/pthread_key_create.c
@@ -1,6 +1,6 @@
 #include "pthread_impl.h"
 
-const size_t __pthread_tsd_size = sizeof(void *) * PTHREAD_KEYS_MAX;
+volatile size_t __pthread_tsd_size = sizeof(void *) * PTHREAD_KEYS_MAX;
 void *__pthread_tsd_main[PTHREAD_KEYS_MAX] = { 0 };
 
 static void (*keys[PTHREAD_KEYS_MAX])(void *);