From 44c245b3ed9e82cc44a5ade4a941c99f63174021 Mon Sep 17 00:00:00 2001 From: rpj Date: Sat, 2 Mar 2002 01:53:08 +0000 Subject: * errno.c: Compiler directive was incorrectly including code. * pthread.h: Conditionally added some #defines from config.h needed when not building the library. e.g. NEED_ERRNO, NEED_SEM. (PTW32_DLLPORT): Now only defined if _DLL defined. (_errno): Compiler directive was incorrectly including prototype. * sched.h: Conditionally added some #defines from config.h needed when not building the library. * semaphore.h: Replace an instance of NEED_SEM that should have been NEED_ERRNO. This change currently has nil effect. * GNUmakefile: Correct some recent changes. * Makefile: Add rule to generate pre-processor output. --- GNUmakefile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'GNUmakefile') diff --git a/GNUmakefile b/GNUmakefile index 46558fd..c205458 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -432,30 +432,31 @@ tests: .c.o:; $(CC) -c -o $@ $(CFLAGS) $(CLEANUP_FLAGS) $< -$(PTHREAD_DEF): $(OBJS) - dlltool -z pthread.def $(DLL_INLINED_OBJS) - -$(GC_DLL): $(DLL_OBJS) $(PTHREAD_DEF) +$(GC_DLL): $(DLL_OBJS) $(CC) $(OPT) -shared -o $(GC_DLL) $(DLL_OBJS) $(LFLAGS) + dlltool -z pthread.def $(DLL_OBJS) dlltool -k --dllname $@ --output-lib $(GC_LIB) --def $(PTHREAD_DEF) -$(GCE_DLL): $(DLL_OBJS) $(PTHREAD_DEF) +$(GCE_DLL): $(DLL_OBJS) $(CXX) $(OPT) -mthreads -shared -o $(GCE_DLL) $(DLL_OBJS) $(LFLAGS) + dlltool -z pthread.def $(DLL_OBJS) dlltool -k --dllname $@ --output-lib $(GCE_LIB) --def $(PTHREAD_DEF) -$(GC_INLINED_STAMP): $(DLL_INLINED_OBJS) $(PTHREAD_DEF) +$(GC_INLINED_STAMP): $(DLL_INLINED_OBJS) $(CC) $(OPT) -shared -o $(GC_DLL) $(DLL_INLINED_OBJS) $(LFLAGS) + dlltool -z pthread.def $(DLL_INLINED_OBJS) dlltool -k --dllname $(GC_DLL) --output-lib $(GC_LIB) --def $(PTHREAD_DEF) echo touched > $(GC_INLINED_STAMP) -$(GCE_INLINED_STAMP): $(DLL_INLINED_OBJS) $(PTHREAD_DEF) +$(GCE_INLINED_STAMP): $(DLL_INLINED_OBJS) $(CXX) $(OPT) -mthreads -shared -o $(GCE_DLL) $(DLL_INLINED_OBJS) $(LFLAGS) + dlltool -z pthread.def $(DLL_INLINED_OBJS) dlltool -k --dllname $(GCE_DLL) --output-lib $(GCE_LIB) --def $(PTHREAD_DEF) echo touched > $(GCE_INLINED_STAMP) clean: -$(RM) *~ - -$(RM) *.pre + -$(RM) *.i -$(RM) *.o -$(RM) *.exe -$(RM) $(PTHREAD_DEF) -- cgit v1.2.3