Clean up DOMULTI for libm and add more files blocked earlier by syscall problem to libpthread

libm/Makefile.in

@@ -26,8 +26,6 @@ CFLAGS+=-D_IEEE_LIBM -D_ISOC99_SOURCE -D_SVID_SOURCE
 
 CFLAGS-s_lib_version.c=-D_POSIX_MODE
 
-#DOMULTI=n
-
 LIB_NAME:=libm
 
 ifeq ($(HAS_FPU),y)
@@ -110,11 +108,6 @@ libm_MOBJ:=$(patsubst %.o,$(libm_OUT)/%.o,$(FL_MOBJ))
 libm_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(libm_MOBJ))))
 
 libm_OBJS:=$(libm_OBJ) $(libm_MOBJ)
-ifneq ($(DOMULTI),n)
-ifeq ($(DO_C99_MATH),y)
-libm_OBJS+=$(patsubst %.c,$(libm_OUT)/%.o,$(LIBM_NO_MULTI))
-endif
-endif
 
 $(libm_MOBJ): $(libm_MSRC)
 	$(compile.m)

libpthread/linuxthreads/Makefile.in

@@ -22,8 +22,6 @@ ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
 STRIP_FLAGS:=-X --strip-debug -R .note -R .comment
 endif
 
-#DOMULTI=n
-
 LIB_NAME:=libpthread
 
 libpthread_DIR:=$(top_srcdir)libpthread/linuxthreads
@@ -39,9 +37,7 @@ libpthread_SRC:=$(filter-out $(libpthread_DIR)/locale.c,$(libpthread_SRC))
 endif
 
 ifneq ($(DOMULTI),n)
-# full list, we added the biggest one to IMA
-#libpthread_NO_MULTI:=cancel.c condvar.c join.c manager.c mutex.c oldsemaphore.c pt-machine.c pthread.c rwlock.c semaphore.c specific.c spinlock.c
-libpthread_NO_MULTI:=cancel.c condvar.c join.c manager.c mutex.c oldsemaphore.c pt-machine.c rwlock.c semaphore.c specific.c spinlock.c
+libpthread_NO_MULTI:=manager.c pt-machine.c
 libpthread_SRC:=$(filter-out $(patsubst %.c,$(libpthread_DIR)/%.c,$(libpthread_NO_MULTI)),$(libpthread_SRC))
 endif