changeset 3983:5179f49636a5

6542480 fix for 6534991 broke the nightly build with gcc
author raf
date Fri, 06 Apr 2007 11:23:51 -0700
parents 531293c8439f
children 10d407109a7a
files usr/src/cmd/dtrace/test/cmd/baddof/baddof.c usr/src/cmd/dtrace/test/cmd/badioctl/badioctl.c usr/src/cmd/dtrace/test/tst/i386/Makefile usr/src/cmd/dtrace/test/tst/sparc/Makefile
diffstat 4 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/dtrace/test/cmd/baddof/baddof.c	Fri Apr 06 09:45:18 2007 -0700
+++ b/usr/src/cmd/dtrace/test/cmd/baddof/baddof.c	Fri Apr 06 11:23:51 2007 -0700
@@ -152,7 +152,7 @@
 	}
 }
 
-void
+int
 main(int argc, char **argv)
 {
 	char *filename = argv[1];
@@ -203,4 +203,7 @@
 		corrupt(fd, copy, len);
 		close(fd);
 	}
+
+	/* NOTREACHED */
+	return (0);
 }
--- a/usr/src/cmd/dtrace/test/cmd/badioctl/badioctl.c	Fri Apr 06 09:45:18 2007 -0700
+++ b/usr/src/cmd/dtrace/test/cmd/badioctl/badioctl.c	Fri Apr 06 11:23:51 2007 -0700
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -111,7 +111,7 @@
 	}
 }
 
-void
+int
 main()
 {
 	pid_t child, parent = getpid();
@@ -139,4 +139,7 @@
 		    WTERMSIG(status));
 		fflush(stdout);
 	}
+
+	/* NOTREACHED */
+	return (0);
 }
--- a/usr/src/cmd/dtrace/test/tst/i386/Makefile	Fri Apr 06 09:45:18 2007 -0700
+++ b/usr/src/cmd/dtrace/test/tst/i386/Makefile	Fri Apr 06 11:23:51 2007 -0700
@@ -28,7 +28,7 @@
 
 include ../Makefile.com
 
-ASFLAGS += -D_ASM -P $(CPPFLAGS)
+ASFLAGS += -P -D_ASM $(CPPFLAGS)
 CLOBBER_FILES += helper_helper.o annotated_helper.o
 
 # For the helper test we require an executable data section.
--- a/usr/src/cmd/dtrace/test/tst/sparc/Makefile	Fri Apr 06 09:45:18 2007 -0700
+++ b/usr/src/cmd/dtrace/test/tst/sparc/Makefile	Fri Apr 06 11:23:51 2007 -0700
@@ -28,7 +28,7 @@
 
 include ../Makefile.com
 
-ASFLAGS += -D_ASM -P
+ASFLAGS += -P -D_ASM
 
 pid/tst.br.o := ASFLAGS += -xarch=v8plus