flambda-backend: To upstream: remove threadUnix

ocamldoc/Makefile.docfiles

@@ -23,7 +23,7 @@ STR_MLIS = $(addprefix $(SRC)/otherlibs/str/, str.mli)
 UNIX_MLIS = $(addprefix $(SRC)/otherlibs/unix/, unix.mli unixLabels.mli)
 DYNLINK_MLIS = $(addprefix $(SRC)/otherlibs/dynlink/, dynlink.mli)
 THREAD_MLIS = $(addprefix $(SRC)/otherlibs/systhreads/, \
-  thread.mli condition.mli mutex.mli event.mli semaphore.mli threadUnix.mli)
+  thread.mli condition.mli mutex.mli event.mli semaphore.mli)
 DRIVER_MLIS = $(SRC)/driver/pparse.mli
 
 

otherlibs/systhreads/.depend

@@ -34,10 +34,3 @@ thread.cmo : \
 thread.cmx : \
     thread.cmi
 thread.cmi :
-threadUnix.cmo : \
-    thread.cmi \
-    threadUnix.cmi
-threadUnix.cmx : \
-    thread.cmx \
-    threadUnix.cmi
-threadUnix.cmi :

otherlibs/systhreads/Makefile

@@ -52,14 +52,12 @@ LIBNAME=threads
 BYTECODE_C_OBJS=st_stubs.b.$(O)
 NATIVECODE_C_OBJS=st_stubs.n.$(O)
 
-THREADS_SOURCES = thread.ml mutex.ml condition.ml event.ml threadUnix.ml \
-  semaphore.ml
+THREADS_SOURCES = thread.ml mutex.ml condition.ml event.ml semaphore.ml
 
 THREADS_BCOBJS = $(THREADS_SOURCES:.ml=.cmo)
 THREADS_NCOBJS = $(THREADS_SOURCES:.ml=.cmx)
 
-MLIFILES=thread.mli mutex.mli condition.mli event.mli threadUnix.mli \
-  semaphore.mli
+MLIFILES=thread.mli mutex.mli condition.mli event.mli semaphore.mli
 
 CMIFILES=$(MLIFILES:.mli=.cmi)
 
@@ -75,12 +73,8 @@ lib$(LIBNAME)nat.$(A): $(NATIVECODE_C_OBJS)
 
 $(LIBNAME).cma: $(THREADS_BCOBJS)
 ifeq "$(UNIX_OR_WIN32)" "unix"
-	$(MKLIB) -o $(LIBNAME) -ocamlc '$(CAMLC)' -cclib -lunix -linkall \
+	$(MKLIB) -o $(LIBNAME) -ocamlc '$(CAMLC)' -linkall \
 	  $(PTHREAD_CAML_LINK) $^
-# TODO: Figure out why -cclib -lunix is used here.
-# It may be because of the threadsUnix module which is deprecated.
-# It may hence be good to figure out whether this module shouldn't be
-# removed, and then -cclib -lunix arguments.
 else # Windows
 	$(MKLIB) -o $(LIBNAME) -ocamlc "$(CAMLC)" -linkall \
 	  $(PTHREAD_CAML_LINK) $^