Illumos sync

7 files changed, 15 insertions, 4 deletions

diff --git a/usr/src/tools/ctf/Makefile.ctf b/usr/src/tools/ctf/Makefile.ctf
index e8fee40a21..7c5b041746 100644
--- a/usr/src/tools/ctf/Makefile.ctf
+++ b/usr/src/tools/ctf/Makefile.ctf
@@ -22,8 +22,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../../../Makefile.tools
 
@@ -47,3 +45,4 @@ HDRDIRS= \
 
 CPPFLAGS += $(HDRDIRS)
 CFLAGS += $(CCVERBOSE)
+CERRWARN += -_gcc=-Wno-parentheses
diff --git a/usr/src/tools/ctf/ctfstrip/Makefile b/usr/src/tools/ctf/ctfstrip/Makefile
index d28a9e925e..dee8591408 100644
--- a/usr/src/tools/ctf/ctfstrip/Makefile
+++ b/usr/src/tools/ctf/ctfstrip/Makefile
@@ -13,10 +13,11 @@
 
 PROG = ctfstrip
 SRCS = \
-	ctfstrip.c 
+	ctfstrip.c
 
 CFLAGS += $(CCVERBOSE)
 include $(SRC)/tools/Makefile.tools
+CERRWARN += -_gcc=-Wno-unused-variable
 
 OBJS = $(SRCS:%.c=%.o)
 LINTFILES = $(SRCS:%.c=%.ln)
diff --git a/usr/src/tools/ctf/ctfstrip/ctfstrip.c b/usr/src/tools/ctf/ctfstrip/ctfstrip.c
index a14e8d5957..60180c6921 100644
--- a/usr/src/tools/ctf/ctfstrip/ctfstrip.c
+++ b/usr/src/tools/ctf/ctfstrip/ctfstrip.c
@@ -126,7 +126,8 @@ fix_file(const char *filename, mode_t mode)
 	}
 
 	cmd[4] = filename;
-	if ((rc = posix_spawn(&pid, MCS, NULL, &attr, (char *const *)cmd, environ)) != 0) {
+	if ((rc = posix_spawn(&pid, MCS, NULL, &attr,
+	    (char *const *)cmd, environ)) != 0) {
 		warnx("could not exec mcs: %s", strerror(rc));
 		return (B_FALSE);
 	}
diff --git a/usr/src/tools/ctf/cvt/Makefile.com b/usr/src/tools/ctf/cvt/Makefile.com
index 43b507bb3e..5385b3769f 100644
--- a/usr/src/tools/ctf/cvt/Makefile.com
+++ b/usr/src/tools/ctf/cvt/Makefile.com
@@ -79,6 +79,10 @@ CPPFLAGS	+= -D_REENTRANT
 CFLAGS		+= $(CTF_FLAGS)
 LINTFLAGS	+= -mnux
 
+CERRWARN	+= -_gcc=-Wno-unused
+CERRWARN	+= -_gcc=-Wno-uninitialized
+CERRWARN	+= -_gcc=-Wno-switch
+
 C99MODE		= $(C99_ENABLE)
 
 ctfconvert	:= LDFLAGS += $(DWARFLDFLAGS)
diff --git a/usr/src/tools/ctf/dump/Makefile.com b/usr/src/tools/ctf/dump/Makefile.com
index 3aa6caf47c..9877fa06a3 100644
--- a/usr/src/tools/ctf/dump/Makefile.com
+++ b/usr/src/tools/ctf/dump/Makefile.com
@@ -37,6 +37,8 @@ LDLIBS += -lelf -lz
 OBJS = $(SRCS:%.c=%.o)
 LINTFILES = $(SRCS:%.c=%.ln)
 
+CERRWARN += -_gcc=-Wno-uninitialized
+
 .NO_PARALLEL:
 .PARALLEL: $(OBJS) $(LINTFILES)
 
diff --git a/usr/src/tools/ctf/dwarf/Makefile.com b/usr/src/tools/ctf/dwarf/Makefile.com
index 4c25cdda1d..51e788ff04 100644
--- a/usr/src/tools/ctf/dwarf/Makefile.com
+++ b/usr/src/tools/ctf/dwarf/Makefile.com
@@ -74,6 +74,8 @@ FILEMODE	= 0755
 SRCDIR = ../common/
 
 CPPFLAGS +=	-I$(SRCDIR) -DELF_TARGET_ALL=1
+CERRWARN +=	-_gcc=-Wno-unused
+CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 
 LDLIBS = -lelf -lc
 
diff --git a/usr/src/tools/ctf/stabs/Makefile.com b/usr/src/tools/ctf/stabs/Makefile.com
index e3f8e9689a..6703c34f06 100644
--- a/usr/src/tools/ctf/stabs/Makefile.com
+++ b/usr/src/tools/ctf/stabs/Makefile.com
@@ -44,6 +44,8 @@ OBJS = $(SRCS:%.c=%.o)
 LINTFILES = $(SRCS:%.c=%.ln)
 
 LINTFLAGS = -mnux -L$(ROOT)/usr/lib
+CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += -_gcc=-Wno-unused
 
 .NO_PARALLEL:
 .PARALLEL: $(OBJS) $(LINTFILES)