Fix bug with code to get rid of main

[c11tester.git] / threads.cc

diff --git a/threads.cc b/threads.cc
index 8ee3bf975e732d7c943e512005c2dfd9eb218118..17b76863a62be4943ef07fc22d5e7df5bf6e83c7 100644 (file)
--- a/threads.cc
+++ b/threads.cc
@@ -65,15 +65,10 @@ void modelexit() {
 }
 #endif
 
-void main_thread_startup() {
-#ifdef TLS
+void initMainThread() {
        atexit(modelexit);
        Thread * curr_thread = thread_current();
-
-       /* Add dummy "start" action, just to create a first clock vector */
        model->switch_to_master(new ModelAction(THREAD_START, std::memory_order_seq_cst, curr_thread));
-#endif
-       thread_startup();
 }
 
 /**
@@ -293,10 +288,7 @@ int Thread::create_context()
        context.uc_stack.ss_flags = 0;
        context.uc_link = model->get_system_context();
 #ifdef TLS
-       if (model != NULL)
-               makecontext(&context, setup_context, 0);
-       else
-               makecontext(&context, main_thread_startup, 0);
+       makecontext(&context, setup_context, 0);
 #else
        makecontext(&context, thread_startup, 0);
 #endif