diff --git a/ChangeLog b/ChangeLog
index 032d590..f56726e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2019-12-04  NIIBE Yutaka  <gniibe@fsij.org>
+
+	* chopstx-gnu-linux.c (chx_thread_start): Fix return value.
+
 2019-11-21  NIIBE Yutaka  <gniibe@fsij.org>
 
 	* chopstx-cortex-m.c (chx_set_running): New.
diff --git a/chopstx-gnu-linux.c b/chopstx-gnu-linux.c
index a0fa510..3f47c69 100644
--- a/chopstx-gnu-linux.c
+++ b/chopstx-gnu-linux.c
@@ -328,9 +328,11 @@ chx_sched (uint32_t yield)
 static void __attribute__((__noreturn__))
 chx_thread_start (voidfunc thread_entry, void *arg)
 {
+  void *ret;
+
   chx_cpu_sched_unlock ();
-  thread_entry (arg);
-  chopstx_exit (0);
+  ret = thread_entry (arg);
+  chopstx_exit (ret);
 }
 
 static struct chx_thread *