From 9d6ac548749cbdab1a5200656ecae34fce78673f Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sun, 7 Jul 2002 00:42:09 +0000 Subject: [PATCH] * Makefile.common (MINGW_INCLUDES): Simplify. (MINGW_CFLAGS): New. (MINGW_CXXFLAGS): Ditto. --- winsup/ChangeLog | 45 ++++-------------------------------------- winsup/Makefile.common | 4 +++- 2 files changed, 7 insertions(+), 42 deletions(-) diff --git a/winsup/ChangeLog b/winsup/ChangeLog index da4792d41..5c981a50a 100644 --- a/winsup/ChangeLog +++ b/winsup/ChangeLog @@ -1,45 +1,8 @@ -2002-06-25 Thomas Pfaff +2002-07-06 Christopher Faylor - * include/pthread.h (PTHREAD_CANCELED): Defined a reasonable - value. - * pthread.cc (pthread_exit): Call method instead of function. - (pthread_setcancelstate): Ditto. - (pthread_setcanceltype): Ditto. - (pthread_testcancel): Ditto. - * thread.h (pthread::cancel_event): New member. - (__pthread_cancel_self): New prototype. - (pthread::exit): New Method. - (pthread::cancel): Ditto. - (pthread::testcancel): Ditto. - (pthread::cancel_self): Ditto. - (pthread::static_cancel_self): Ditto. - (pthread::setcancelstate): Ditto. - (pthread::setcanceltype): Ditto. - (__pthread_cancel): Give c++ linkage. - (__pthread_exit): Remove. - (__pthread_setcancelstate): Ditto. - (__pthread_setcanceltype): Ditto. - (__pthread_testcancel): Ditto. - * thread.cc (pthread::pthread): Inititialize cancel_event. - (pthread::~pthread): Close cancel_event if needed. - (pthread::create): Create cancel_event. - (pthread::exit): New method. Replacement for __pthread_exit. - (pthread::cancel): New method. - (pthread::testcancel): Ditto. - (pthread::static_cancel_self); New static method. - (pthread::setcancelstate): New method. Replacement for - __pthread_setcancelstate. - (pthread::setcanceltype): New method. Replacement for - __pthread_setcanceltype. - (pthread::pop_cleanup_handler): Added lock for async cancel safe - cancellation. - (pthread::thread_init_wrapper): Change __pthread_exit to - thread->exit(). - (__pthread_cancel): Call method thread->cancel(). - (__pthread_exit): Remove. - (__pthread_setcancelstate): Ditto. - (__pthread_setcanceltype): Ditto. - (__pthread_testcancel): Ditto. + * Makefile.common (MINGW_INCLUDES): Simplify. + (MINGW_CFLAGS): New. + (MINGW_CXXFLAGS): Ditto. 2002-06-02 Christopher Faylor diff --git a/winsup/Makefile.common b/winsup/Makefile.common index d80d9748f..b5bf09a7b 100644 --- a/winsup/Makefile.common +++ b/winsup/Makefile.common @@ -88,7 +88,9 @@ ifdef CONFIG_DIR INCLUDES+=-I$(CONFIG_DIR) endif -MINGW_INCLUDES:=-I$(updir)/mingw/include $(INCLUDES) +MINGW_INCLUDES:=-I$(updir)/mingw/include $(w32api_include) +MINGW_CFLAGS:=-mno-cygwin $(MINGW_INCLUDES) +MINGW_CXXFLAGS:=${filter-out $(newlib_source)/%,$(CXXFLAGS)} -mno-cygwin $(MINGW_INCLUDES) GCC_DEFAULT_OPTIONS:=$(CFLAGS_COMMON) $(CFLAGS_CONFIG) $(INCLUDES)