diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index ed7bc27f1..7273efe5d 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-14  Christopher Faylor  <cgf@redhat.com>
+
+	* profile/Makefile.in (mcount.o): Use ALL_CFLAGS for compilation to
+	ensure -mno-cygwin where appropriate.  Filter out -O2.
+
 2003-02-13  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* profile/Makefile.in (mcount.o): Use -O1 optimization
diff --git a/winsup/mingw/profile/Makefile.in b/winsup/mingw/profile/Makefile.in
index 3fe9170de..f18bfe44a 100644
--- a/winsup/mingw/profile/Makefile.in
+++ b/winsup/mingw/profile/Makefile.in
@@ -92,7 +92,7 @@ gcrt2.o: gcrt0.c
 #FIXME: Optimizing at higher than -O1 tweaks a bug in gcc 3.2.2
 # and earlier
 mcount.o: mcount.c
-	$(CC)  -c -o $@ $(CPPFLAGS) $(CFLAGS) -O1 $?
+	$(CC)  -D__MSVCRT__ -c -o $@ $(CPPFLAGS) ${filter-out -O%,$(ALL_CFLAGS)} -O1 $?
 
 Makefile: Makefile.in config.status configure
 	$(SHELL) config.status