* libltp/lib/parse_opts.c: Deal with C warnings.

* winsup.api/pthread/cancel12.c: Ditto.
* winsup.api/winsup.exp: Don't use -g3.

5 files changed, 29 insertions, 21 deletions

diff --git a/winsup/testsuite/ChangeLog b/winsup/testsuite/ChangeLog
index e3906d23c..beb33c200 100644
--- a/winsup/testsuite/ChangeLog
+++ b/winsup/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-07  Christopher Faylor  <cgf@redhat.com>
+
+	* libltp/lib/parse_opts.c: Deal with C warnings.
+	* winsup.api/pthread/cancel12.c: Ditto.
+	* winsup.api/winsup.exp: Don't use -g3.
+
 2003-02-04  Thomas Pfaff  <tpfaff@gmx.net>
 
 	* winsup.api/pthread/cancel11.c: New test.
diff --git a/winsup/testsuite/Makefile.in b/winsup/testsuite/Makefile.in
index bb3d5c9c9..14b6ab256 100644
--- a/winsup/testsuite/Makefile.in
+++ b/winsup/testsuite/Makefile.in
@@ -56,7 +56,6 @@ else
   CFLAGS:=@CFLAGS@ -MD $(TESTSUP_INCLUDES)
 endif
 CXXFLAGS:=@CXXFLAGS@
-export ALL_CFLAGS
 
 AR:=@AR@
 AR_FLAGS:=qv
@@ -92,6 +91,10 @@ RUNTIME=$(cygwin_build)/new-cygwin1.dll $(cygwin_build)/new-libcygwin.a
 TESTSUP_LIB_NAME:=libltp.a
 TESTSUP_OFILES:=${sort ${addsuffix .o,${basename ${notdir ${wildcard $(libltp_srcdir)/lib/*.c}}}}}
 
+override ALL_CFLAGS:=${filter-out -O%,$(ALL_CFLAGS)}
+override COMPILE_CC:=${filter-out -O%,$(COMPILE_CC)}
+override CFLAGS:=${filter-out -O%,$(CFLAGS)}
+
 .PHONY: all force dll_ofiles install all_target install_target all_host install_host
 
 .SUFFIXES:
diff --git a/winsup/testsuite/libltp/lib/parse_opts.c b/winsup/testsuite/libltp/lib/parse_opts.c
index e4da236e6..4a8058938 100644
--- a/winsup/testsuite/libltp/lib/parse_opts.c
+++ b/winsup/testsuite/libltp/lib/parse_opts.c
@@ -100,6 +100,24 @@
 #define DEBUG	0
 #endif
 
+/*
+ * Code from usctest.h that not part of this file since we are the library.
+ */
+
+struct usc_errno_t TEST_VALID_ENO[USC_MAX_ERRNO];
+
+  /***********************************************************************
+   * Globals for returning the return code and errno from the system call
+   * test macros.
+   ***********************************************************************/
+int TEST_RETURN;
+int TEST_ERRNO;
+
+  /***********************************************************************
+   * temporary variables for determining max and min times in TEST macro
+   ***********************************************************************/
+long btime, etime, tmptime;
+
 /* The timing information block. */
 struct tblock tblock={0,((long) -1)>>1,0,0};
 
@@ -808,24 +826,6 @@ int Help = 0;
 int Help2 = 0;
 char *ptr;
 
-/*
- * Code from usctest.h that not part of this file since we are the library.
- */
-
-struct usc_errno_t TEST_VALID_ENO[USC_MAX_ERRNO];
-
-  /***********************************************************************
-   * Globals for returning the return code and errno from the system call
-   * test macros.
-   ***********************************************************************/
-int TEST_RETURN;
-int TEST_ERRNO;
-
-  /***********************************************************************
-   * temporary variables for determining max and min times in TEST macro
-   ***********************************************************************/
-long btime, etime, tmptime;
-
 
 
 /* for test specific parse_opts options */
diff --git a/winsup/testsuite/winsup.api/pthread/cancel12.c b/winsup/testsuite/winsup.api/pthread/cancel12.c
index f1c64e39c..12273d676 100644
--- a/winsup/testsuite/winsup.api/pthread/cancel12.c
+++ b/winsup/testsuite/winsup.api/pthread/cancel12.c
@@ -58,7 +58,6 @@ static void *Thread(void *punused)
 
 int main (void)
 {
-  void *old_sigh;
   void * result;
   pthread_t t;
 
diff --git a/winsup/testsuite/winsup.api/winsup.exp b/winsup/testsuite/winsup.api/winsup.exp
index c79889ec5..86064661b 100644
--- a/winsup/testsuite/winsup.api/winsup.exp
+++ b/winsup/testsuite/winsup.api/winsup.exp
@@ -48,7 +48,7 @@ foreach src [glob -nocomplain $srcdir/$subdir/*.c $srcdir/$subdir/*/*.c] {
 	clear_xfail
     }
 
-    ws_spawn "$CC -g3 -nodefaultlibs -mwin32 $CFLAGS $src $add_includes $add_libs $runtime_root/binmode.o -lgcc $runtime_root/new-libcygwin.a -lkernel32 -luser32 -o $base.exe"
+    ws_spawn "$CC -nodefaultlibs -mwin32 $CFLAGS $src $add_includes $add_libs $runtime_root/binmode.o -lgcc $runtime_root/new-libcygwin.a -lkernel32 -luser32 -o $base.exe"
     if { $rv != "" } {
 	verbose -log "$rv"
 	fail "$testcase (compile)"