Changes in / [8ac3b0e:8e87f37]

Files:

• driver/cfa.cc (modified) (2 diffs)
• libcfa/src/Makefile.am (modified) (5 diffs)
• libcfa/src/Makefile.in (modified) (13 diffs)
• libcfa/src/bits/defs.hfa (modified) (1 diff)
• libcfa/src/bits/locks.hfa (modified) (1 diff)
• libcfa/src/concurrency/alarm.cfa (modified) (1 diff)
• libcfa/src/concurrency/coroutine.cfa (modified) (1 diff)
• libcfa/src/concurrency/invoke.c (modified) (2 diffs)
• libcfa/src/concurrency/kernel.cfa (modified) (2 diffs)
• libcfa/src/concurrency/kernel_private.hfa (modified) (1 diff)
• libcfa/src/concurrency/monitor.cfa (modified) (1 diff)
• libcfa/src/concurrency/mutex.cfa (modified) (1 diff)
• libcfa/src/concurrency/preemption.cfa (modified) (1 diff)
• libcfa/src/concurrency/thread.cfa (modified) (1 diff)
• libcfa/src/stdlib.cfa (modified) (1 diff)
• libcfa/src/stdlib.hfa (modified) (2 diffs)
• tests/linking/.expect/nothreads.txt (deleted)
• tests/linking/.expect/withthreads.txt (deleted)
• tests/linking/nothreads.cfa (deleted)
• tests/linking/withthreads.cfa (deleted)

driver/cfa.cc

@@ -405 +405 @@
                 args[nargs] = "--undefined=__cfaabi_appready_startup";
                 nargs += 1;
+                args[nargs] = "-Xlinker";
+                nargs += 1;
+                args[nargs] = "--undefined=__cfaabi_dbg_record";
+                nargs += 1;
 
                 // include the cfa library in case it's needed
@@ -410 +414 @@
                 nargs += 1;
                 args[nargs] = ( *new string( string("-Wl,-rpath," ) + libdir + (intree ? "/src/.libs" : "")) ).c_str();
-                nargs += 1;
-                args[nargs] = "-Wl,--push-state,--as-needed";
-                nargs += 1;
-                args[nargs] = "-lcfathread";
-                nargs += 1;
-                args[nargs] = "-Wl,--pop-state";
                 nargs += 1;
                 args[nargs] = "-lcfa";

libcfa/src/Makefile.am

@@ -22 +22 @@
 
 libdir = ${CFA_LIBDIR}
-lib_LTLIBRARIES = libcfa.la libcfathread.la
+lib_LTLIBRARIES = libcfa.la
 
 VPATH += :../prelude
@@ -41 +41 @@
           containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
 
+# not all platforms support concurrency, add option do disable it
+headers_nosrc += concurrency/invoke.h
+headers += concurrency/coroutine.hfa concurrency/thread.hfa concurrency/kernel.hfa concurrency/monitor.hfa concurrency/mutex.hfa
+
 libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa ${headers:.hfa=.cfa}
 
 # not all platforms support concurrency, add option do disable it
-thread_headers_nosrc = concurrency/invoke.h
-thread_headers = concurrency/coroutine.hfa concurrency/thread.hfa concurrency/kernel.hfa concurrency/monitor.hfa concurrency/mutex.hfa
-thread_libsrc = concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa concurrency/invoke.c concurrency/preemption.cfa ${thread_headers:.hfa=.cfa}
+libsrc += concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa concurrency/invoke.c concurrency/preemption.cfa
 else
 headers =
-thread_headers =
 headers_nosrc =
-thread_headers_nosrc =
 libsrc =
 endif
@@ -64 +64 @@
 $(libobjs) : @CFACC@ @CFACPP@ prelude.cfa
 
-thread_libobjs = $(addsuffix .lo, $(basename $(filter %.cfa,$(thread_libsrc))))
-$(thread_libobjs) : @CFACC@ @CFACPP@ prelude.cfa
-
 
 # .deps inclusion is not done automatically by automake for new languages
@@ -75 +72 @@
 
 -include $(libdeps)
-
-thread_libdeps = $(join \
-        $(addsuffix $(DEPDIR)/ , $(dir $(thread_libobjs) ) ), \
-        $(notdir ${thread_libobjs:.lo=.Plo}) \
-)
-
--include $(thread_libdeps)
-
 
 prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
@@ -96 +85 @@
 libcfa_la_LDFLAGS = -version-info @CFA_VERSION@
 
-libcfathread_la_SOURCES = ${thread_libsrc}
-libcfathread_la_LDFLAGS = -version-info @CFA_VERSION@
-
 stdhdr = $(shell find $(srcdir)/stdhdr -type f -printf "%p ")
 
 cfa_includedir = $(CFA_INCDIR)
-nobase_cfa_include_HEADERS = ${stdhdr} ${headers} ${headers_nosrc} ${thread_headers} ${thread_headers_nosrc}
+nobase_cfa_include_HEADERS = ${stdhdr} ${headers} ${headers_nosrc}
 
 #----------------------------------------------------------------------------------------------------------------

libcfa/src/Makefile.in

@@ -142 +142 @@
         time.cfa stdlib.cfa common.cfa containers/maybe.cfa \
         containers/pair.cfa containers/result.cfa \
-        containers/vector.cfa
+        containers/vector.cfa concurrency/coroutine.cfa \
+        concurrency/thread.cfa concurrency/kernel.cfa \
+        concurrency/monitor.cfa concurrency/mutex.cfa \
+        concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa \
+        concurrency/invoke.c concurrency/preemption.cfa
 am__dirstamp = $(am__leading_dot)dirstamp
 @BUILDLIB_TRUE@am__objects_1 = fstream.lo iostream.lo iterator.lo \
@@ -148 +152 @@
 @BUILDLIB_TRUE@ common.lo containers/maybe.lo \
 @BUILDLIB_TRUE@ containers/pair.lo containers/result.lo \
-@BUILDLIB_TRUE@ containers/vector.lo
+@BUILDLIB_TRUE@ containers/vector.lo concurrency/coroutine.lo \
+@BUILDLIB_TRUE@ concurrency/thread.lo concurrency/kernel.lo \
+@BUILDLIB_TRUE@ concurrency/monitor.lo concurrency/mutex.lo
 @BUILDLIB_TRUE@am__objects_2 = startup.lo interpose.lo bits/debug.lo \
 @BUILDLIB_TRUE@ assert.lo exception.lo virtual.lo heap.lo \
-@BUILDLIB_TRUE@ $(am__objects_1)
+@BUILDLIB_TRUE@ $(am__objects_1) \
+@BUILDLIB_TRUE@ concurrency/CtxSwitch-@ARCHITECTURE@.lo \
+@BUILDLIB_TRUE@ concurrency/alarm.lo concurrency/invoke.lo \
+@BUILDLIB_TRUE@ concurrency/preemption.lo
 am_libcfa_la_OBJECTS = prelude.lo $(am__objects_2)
 libcfa_la_OBJECTS = $(am_libcfa_la_OBJECTS)
@@ -161 +170 @@
         $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
         $(libcfa_la_LDFLAGS) $(LDFLAGS) -o $@
-libcfathread_la_LIBADD =
-am__libcfathread_la_SOURCES_DIST =  \
-        concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa \
-        concurrency/invoke.c concurrency/preemption.cfa \
-        concurrency/coroutine.cfa concurrency/thread.cfa \
-        concurrency/kernel.cfa concurrency/monitor.cfa \
-        concurrency/mutex.cfa
-@BUILDLIB_TRUE@am__objects_3 = concurrency/coroutine.lo \
-@BUILDLIB_TRUE@ concurrency/thread.lo concurrency/kernel.lo \
-@BUILDLIB_TRUE@ concurrency/monitor.lo concurrency/mutex.lo
-@BUILDLIB_TRUE@am__objects_4 =  \
-@BUILDLIB_TRUE@ concurrency/CtxSwitch-@ARCHITECTURE@.lo \
-@BUILDLIB_TRUE@ concurrency/alarm.lo concurrency/invoke.lo \
-@BUILDLIB_TRUE@ concurrency/preemption.lo $(am__objects_3)
-am_libcfathread_la_OBJECTS = $(am__objects_4)
-libcfathread_la_OBJECTS = $(am_libcfathread_la_OBJECTS)
-libcfathread_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-        $(AM_CFLAGS) $(CFLAGS) $(libcfathread_la_LDFLAGS) $(LDFLAGS) \
-        -o $@
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -225 +214 @@
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(libcfa_la_SOURCES) $(libcfathread_la_SOURCES)
-DIST_SOURCES = $(am__libcfa_la_SOURCES_DIST) \
-        $(am__libcfathread_la_SOURCES_DIST)
+SOURCES = $(libcfa_la_SOURCES)
+DIST_SOURCES = $(am__libcfa_la_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
@@ -237 +225 @@
         limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
         containers/maybe.hfa containers/pair.hfa containers/result.hfa \
-        containers/vector.hfa math.hfa gmp.hfa time_t.hfa \
-        bits/align.hfa bits/containers.hfa bits/defs.hfa \
-        bits/debug.hfa bits/locks.hfa concurrency/coroutine.hfa \
+        containers/vector.hfa concurrency/coroutine.hfa \
         concurrency/thread.hfa concurrency/kernel.hfa \
-        concurrency/monitor.hfa concurrency/mutex.hfa \
-        concurrency/invoke.h
+        concurrency/monitor.hfa concurrency/mutex.hfa math.hfa gmp.hfa \
+        time_t.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa \
+        bits/debug.hfa bits/locks.hfa concurrency/invoke.h
 HEADERS = $(nobase_cfa_include_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
@@ -434 +421 @@
 am__v_UPP_0 = @echo "  UPP     " $@;
 am__v_UPP_1 = 
-lib_LTLIBRARIES = libcfa.la libcfathread.la
+lib_LTLIBRARIES = libcfa.la
 
 # AM_CFLAGS for all cfa source
@@ -446 +433 @@
 
 #----------------------------------------------------------------------------------------------------------------
-@BUILDLIB_TRUE@headers_nosrc = math.hfa gmp.hfa time_t.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa
+
+# not all platforms support concurrency, add option do disable it
+@BUILDLIB_TRUE@headers_nosrc = math.hfa gmp.hfa time_t.hfa \
+@BUILDLIB_TRUE@ bits/align.hfa bits/containers.hfa \
+@BUILDLIB_TRUE@ bits/defs.hfa bits/debug.hfa bits/locks.hfa \
+@BUILDLIB_TRUE@ concurrency/invoke.h
 @BUILDLIB_FALSE@headers = 
-@BUILDLIB_TRUE@headers = fstream.hfa iostream.hfa iterator.hfa limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
-@BUILDLIB_TRUE@   containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
-
+@BUILDLIB_TRUE@headers = fstream.hfa iostream.hfa iterator.hfa \
+@BUILDLIB_TRUE@ limits.hfa rational.hfa time.hfa stdlib.hfa \
+@BUILDLIB_TRUE@ common.hfa containers/maybe.hfa \
+@BUILDLIB_TRUE@ containers/pair.hfa containers/result.hfa \
+@BUILDLIB_TRUE@ containers/vector.hfa concurrency/coroutine.hfa \
+@BUILDLIB_TRUE@ concurrency/thread.hfa concurrency/kernel.hfa \
+@BUILDLIB_TRUE@ concurrency/monitor.hfa concurrency/mutex.hfa
 @BUILDLIB_FALSE@libsrc = 
-@BUILDLIB_TRUE@libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa ${headers:.hfa=.cfa}
-@BUILDLIB_FALSE@thread_headers_nosrc = 
 
 # not all platforms support concurrency, add option do disable it
-@BUILDLIB_TRUE@thread_headers_nosrc = concurrency/invoke.h
-@BUILDLIB_FALSE@thread_headers = 
-@BUILDLIB_TRUE@thread_headers = concurrency/coroutine.hfa concurrency/thread.hfa concurrency/kernel.hfa concurrency/monitor.hfa concurrency/mutex.hfa
-@BUILDLIB_TRUE@thread_libsrc = concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa concurrency/invoke.c concurrency/preemption.cfa ${thread_headers:.hfa=.cfa}
+@BUILDLIB_TRUE@libsrc = startup.cfa interpose.cfa bits/debug.cfa \
+@BUILDLIB_TRUE@ assert.cfa exception.c virtual.c heap.cfa \
+@BUILDLIB_TRUE@ ${headers:.hfa=.cfa} \
+@BUILDLIB_TRUE@ concurrency/CtxSwitch-@ARCHITECTURE@.S \
+@BUILDLIB_TRUE@ concurrency/alarm.cfa concurrency/invoke.c \
+@BUILDLIB_TRUE@ concurrency/preemption.cfa
 
 #----------------------------------------------------------------------------------------------------------------
@@ -467 +463 @@
 # add dependency of cfa files
 libobjs = $(addsuffix .lo, $(basename $(filter %.cfa,$(libsrc))))
-thread_libobjs = $(addsuffix .lo, $(basename $(filter %.cfa,$(thread_libsrc))))
 
 # .deps inclusion is not done automatically by automake for new languages
@@ -475 +470 @@
 )
 
-thread_libdeps = $(join \
-        $(addsuffix $(DEPDIR)/ , $(dir $(thread_libobjs) ) ), \
-        $(notdir ${thread_libobjs:.lo=.Plo}) \
-)
-
 
 #----------------------------------------------------------------------------------------------------------------
 libcfa_la_SOURCES = prelude.cfa ${libsrc}
 libcfa_la_LDFLAGS = -version-info @CFA_VERSION@
-libcfathread_la_SOURCES = ${thread_libsrc}
-libcfathread_la_LDFLAGS = -version-info @CFA_VERSION@
 stdhdr = $(shell find $(srcdir)/stdhdr -type f -printf "%p ")
 cfa_includedir = $(CFA_INCDIR)
-nobase_cfa_include_HEADERS = ${stdhdr} ${headers} ${headers_nosrc} ${thread_headers} ${thread_headers_nosrc}
+nobase_cfa_include_HEADERS = ${stdhdr} ${headers} ${headers_nosrc}
 all: all-am
 
@@ -579 +567 @@
 containers/vector.lo: containers/$(am__dirstamp) \
         containers/$(DEPDIR)/$(am__dirstamp)
-
-libcfa.la: $(libcfa_la_OBJECTS) $(libcfa_la_DEPENDENCIES) $(EXTRA_libcfa_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(libcfa_la_LINK) -rpath $(libdir) $(libcfa_la_OBJECTS) $(libcfa_la_LIBADD) $(LIBS)
 concurrency/$(am__dirstamp):
         @$(MKDIR_P) concurrency
@@ -588 +573 @@
         @$(MKDIR_P) concurrency/$(DEPDIR)
         @: > concurrency/$(DEPDIR)/$(am__dirstamp)
-concurrency/CtxSwitch-@ARCHITECTURE@.lo: concurrency/$(am__dirstamp) \
-        concurrency/$(DEPDIR)/$(am__dirstamp)
-concurrency/alarm.lo: concurrency/$(am__dirstamp) \
-        concurrency/$(DEPDIR)/$(am__dirstamp)
-concurrency/invoke.lo: concurrency/$(am__dirstamp) \
-        concurrency/$(DEPDIR)/$(am__dirstamp)
-concurrency/preemption.lo: concurrency/$(am__dirstamp) \
-        concurrency/$(DEPDIR)/$(am__dirstamp)
 concurrency/coroutine.lo: concurrency/$(am__dirstamp) \
         concurrency/$(DEPDIR)/$(am__dirstamp)
@@ -606 +583 @@
 concurrency/mutex.lo: concurrency/$(am__dirstamp) \
         concurrency/$(DEPDIR)/$(am__dirstamp)
-
-libcfathread.la: $(libcfathread_la_OBJECTS) $(libcfathread_la_DEPENDENCIES) $(EXTRA_libcfathread_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(libcfathread_la_LINK) -rpath $(libdir) $(libcfathread_la_OBJECTS) $(libcfathread_la_LIBADD) $(LIBS)
+concurrency/CtxSwitch-@ARCHITECTURE@.lo: concurrency/$(am__dirstamp) \
+        concurrency/$(DEPDIR)/$(am__dirstamp)
+concurrency/alarm.lo: concurrency/$(am__dirstamp) \
+        concurrency/$(DEPDIR)/$(am__dirstamp)
+concurrency/invoke.lo: concurrency/$(am__dirstamp) \
+        concurrency/$(DEPDIR)/$(am__dirstamp)
+concurrency/preemption.lo: concurrency/$(am__dirstamp) \
+        concurrency/$(DEPDIR)/$(am__dirstamp)
+
+libcfa.la: $(libcfa_la_OBJECTS) $(libcfa_la_DEPENDENCIES) $(EXTRA_libcfa_la_DEPENDENCIES) 
+        $(AM_V_CCLD)$(libcfa_la_LINK) -rpath $(libdir) $(libcfa_la_OBJECTS) $(libcfa_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -937 +922 @@
         $(am__mv) $$depbase.Tpo $$depbase.Plo
 $(libobjs) : @CFACC@ @CFACPP@ prelude.cfa
-$(thread_libobjs) : @CFACC@ @CFACPP@ prelude.cfa
 
 -include $(libdeps)
-
--include $(thread_libdeps)
 
 prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@

libcfa/src/bits/defs.hfa

@@ -41 +41 @@
 }
 #endif
-
-#if defined(__cforall_thread__)
-#define OPTIONAL_THREAD
-#else
-#define OPTIONAL_THREAD __attribute__((weak))
-#endif

libcfa/src/bits/locks.hfa

@@ -50 +50 @@
 #ifdef __cforall
         extern "C" {
-                extern void disable_interrupts() OPTIONAL_THREAD;
-                extern void enable_interrupts_noPoll() OPTIONAL_THREAD;
+                extern void disable_interrupts();
+                extern void enable_interrupts_noPoll();
 
                 #ifdef __CFA_DEBUG__

libcfa/src/concurrency/alarm.cfa

@@ -13 +13 @@
 // Update Count     : 67
 //
-
-#define __cforall_thread__
 
 extern "C" {

libcfa/src/concurrency/coroutine.cfa

@@ -13 +13 @@
 // Update Count     : 9
 //
-
-#define __cforall_thread__
 
 #include "coroutine.hfa"

libcfa/src/concurrency/invoke.c

@@ -13 +13 @@
 // Update Count     : 5
 //
-
-#define __cforall_thread__
 
 #include <stdbool.h>
@@ -33 +31 @@
 extern void __finish_creation( struct thread_desc * );
 extern void __leave_thread_monitor( struct thread_desc * this );
-extern void disable_interrupts() OPTIONAL_THREAD;
+extern void disable_interrupts();
 extern void enable_interrupts( __cfaabi_dbg_ctx_param );
 

libcfa/src/concurrency/kernel.cfa

@@ -13 +13 @@
 // Update Count     : 25
 //
-
-#define __cforall_thread__
 
 //C Includes
@@ -945 +943 @@
         }
 )
-
-//-----------------------------------------------------------------------------
-// Debug
-bool threading_enabled(void) {
-        return true;
-}
 // Local Variables: //
 // mode: c //

libcfa/src/concurrency/kernel_private.hfa

@@ -26 +26 @@
 
 extern "C" {
-        void disable_interrupts() OPTIONAL_THREAD;
+        void disable_interrupts();
         void enable_interrupts_noPoll();
         void enable_interrupts( __cfaabi_dbg_ctx_param );

libcfa/src/concurrency/monitor.cfa

@@ -13 +13 @@
 // Update Count     : 9
 //
-
-#define __cforall_thread__
 
 #include "monitor.hfa"

libcfa/src/concurrency/mutex.cfa

@@ -15 +15 @@
 // Update Count     : 0
 //
-
-#define __cforall_thread__
 
 #include "mutex.hfa"

libcfa/src/concurrency/preemption.cfa

@@ -13 +13 @@
 // Update Count     : 37
 //
-
-#define __cforall_thread__
 
 #include "preemption.hfa"

libcfa/src/concurrency/thread.cfa

@@ -13 +13 @@
 // Update Count     : 8
 //
-
-#define __cforall_thread__
 
 #include "thread.hfa"

libcfa/src/stdlib.cfa

@@ -252 +252 @@
 long double _Complex random( void ) { return (long double)drand48() + (long double _Complex)(drand48() * _Complex_I); }
 
-//---------------------------------------
-
-bool threading_enabled(void) __attribute__((weak)) {
-        return false;
-}
 
 // Local Variables: //

libcfa/src/stdlib.hfa

@@ -15 +15 @@
 
 #pragma once
-
-#include "bits/defs.hfa"
 
 #include <stdlib.h>                                                                             // *alloc, strto*, ato*
@@ -248 +246 @@
 #include "common.hfa"
 
-//---------------------------------------
-
-extern bool threading_enabled(void) OPTIONAL_THREAD;
-
 // Local Variables: //
 // mode: c //