13269 esc needs a native build

Reviewed by: Andy Fiddaman <andy@omniosce.org>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Gordon Ross <gordon.w.ross@gmail.com>

8 files changed, 165 insertions, 18 deletions

diff --git a/usr/src/cmd/fm/eversholt/Makefile b/usr/src/cmd/fm/eversholt/Makefile
index 5280f19c5c..c1b10c3939 100644
--- a/usr/src/cmd/fm/eversholt/Makefile
+++ b/usr/src/cmd/fm/eversholt/Makefile
@@ -23,14 +23,13 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 debug := TARGET += debug
 
-SUBDIRS = esc eftinfo files
+SUBDIRS = esc eftinfo native files
 
 include ../Makefile.subdirs
 
 debug: $(SUBDIRS)
 
-files: esc
+files: native
diff --git a/usr/src/cmd/fm/eversholt/Makefile.esc.com b/usr/src/cmd/fm/eversholt/Makefile.esc.com
index ffda5bbe11..b7a947f4b7 100644
--- a/usr/src/cmd/fm/eversholt/Makefile.esc.com
+++ b/usr/src/cmd/fm/eversholt/Makefile.esc.com
@@ -39,12 +39,9 @@ CMNOBJS = alloc.o check.o eftread.o esclex.o io.o literals.o lut.o \
 COMMONOBJS = escparse.o $(CMNOBJS)
 COMMONSRCS = $(COMMONOBJS:%.o=$(EVERCMNSRC)/%.c)
 
-LINTSRCS = $(CMNOBJS:%.o=$(EVERCMNSRC)/%.c)
-LINTFLAGS = -mnux
-
-$(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
-
-CPPFLAGS += -I$(EVERCMNSRC) -I.
+BASECPPFLAGS = -I$(EVERCMNSRC) -I.
+$(NOT_RELEASE_BUILD)BASECPPFLAGS += -DDEBUG
+CPPFLAGS += $(BASECPPFLAGS)
 CFLAGS += $(CCVERBOSE)
 CERRWARN += $(CNOWARN_UNINIT)
 CERRWARN += -_gcc=-Wno-unused-label
@@ -62,13 +59,8 @@ debug := COPTFLAG64 =
 ROOTPDIR = $(ROOT)/usr/lib/fm
 ROOTPROG = $(ROOTPDIR)/$(PROG)
 
-install: $(PROG) $(ROOTPROG)
-
 install_h: $(ROOTHDIR) $(ROOTHDRS)
 
-lint:	$(LINTSRCS)
-	$(LINT.c) $(LINTSRCS) $(LDLIBS)
-
 %.o: %.c
 	$(COMPILE.c) $<
 	$(CTFCONVO)
@@ -87,4 +79,3 @@ $(ROOTPDIR):
 
 $(ROOTPDIR)/%: % $(ROOTPDIR)
 	$(INS.file)
-
diff --git a/usr/src/cmd/fm/eversholt/esc/Makefile.com b/usr/src/cmd/fm/eversholt/esc/Makefile.com
index 73980a9f87..61a394c382 100644
--- a/usr/src/cmd/fm/eversholt/esc/Makefile.com
+++ b/usr/src/cmd/fm/eversholt/esc/Makefile.com
@@ -43,8 +43,6 @@ all debug: $(PROG)
 
 install: all $(ROOTPROG)
 
-LINTSRCS += $(LOCALOBJS:%.o=../common/%.c)
-
 $(PROG): $(OBJS)
 	$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
 	$(CTFMRG)
diff --git a/usr/src/cmd/fm/eversholt/files/Makefile.com b/usr/src/cmd/fm/eversholt/files/Makefile.com
index 928ea34284..706beeaea7 100644
--- a/usr/src/cmd/fm/eversholt/files/Makefile.com
+++ b/usr/src/cmd/fm/eversholt/files/Makefile.com
@@ -25,7 +25,7 @@
 
 .SUFFIXES: .eft .esc
 
-ESC=$(SRC)/cmd/fm/eversholt/esc/$(MACH)/esc
+ESC=$(SRC)/cmd/fm/eversholt/native/$(MACH)/esc
 
 include $(SRC)/cmd/Makefile.cmd
 
diff --git a/usr/src/cmd/fm/eversholt/native/Makefile b/usr/src/cmd/fm/eversholt/native/Makefile
new file mode 100644
index 0000000000..7c16b47a3e
--- /dev/null
+++ b/usr/src/cmd/fm/eversholt/native/Makefile
@@ -0,0 +1,34 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+SUBDIRS = $(MACH)
+
+#
+# We don't currently support the debug target for the native build.
+#
+debug:
+
+include ../../Makefile.subdirs
diff --git a/usr/src/cmd/fm/eversholt/native/Makefile.com b/usr/src/cmd/fm/eversholt/native/Makefile.com
new file mode 100644
index 0000000000..1f6481f699
--- /dev/null
+++ b/usr/src/cmd/fm/eversholt/native/Makefile.com
@@ -0,0 +1,69 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+.KEEP_STATE:
+
+PROG = esc
+
+include $(SRC)/cmd/fm/eversholt/Makefile.esc.com
+
+#
+# This is a version of esc we're going to use in the build. Change most
+# things to be their native counterparts.
+#
+CC = $(NATIVECC)
+LD = $(NATIVELD)
+
+EFTCLASS = writer
+LOCALOBJS = escmain.o
+OBJS = $(LOCALOBJS) $(COMMONOBJS)
+SRCS = $(LOCALOBJS:.o=.c) $(COMMONSRCS)
+
+CPPFLAGS = $(NATIVE_CPPFLAGS) $(BASECPPFLAGS) -I../../esc/common
+CFLAGS = $(NATIVE_CFLAGS) -DESC $(CTF_FLAGS)
+LDLIBS = -lumem
+NATIVE_LIBS = libumem.so libc.so
+
+all: $(PROG)
+
+install: all
+
+$(PROG): $(OBJS)
+	$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
+	$(CTFMRG)
+	$(POST_PROCESS)
+
+clean:
+	$(RM) $(OBJS) y.output y.tab.c y.tab.h
+
+clobber: clean
+	$(RM) $(PROG)
+
+esclex.o: escparse.o
+
+%.o: ../../esc/common/%.c
+	$(COMPILE.c) $<
+	$(CTFCONVO)
diff --git a/usr/src/cmd/fm/eversholt/native/i386/Makefile b/usr/src/cmd/fm/eversholt/native/i386/Makefile
new file mode 100644
index 0000000000..9af309e868
--- /dev/null
+++ b/usr/src/cmd/fm/eversholt/native/i386/Makefile
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+include ../../../../Makefile.cmd
+include ../Makefile.com
diff --git a/usr/src/cmd/fm/eversholt/native/sparc/Makefile b/usr/src/cmd/fm/eversholt/native/sparc/Makefile
new file mode 100644
index 0000000000..9af309e868
--- /dev/null
+++ b/usr/src/cmd/fm/eversholt/native/sparc/Makefile
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+include ../../../../Makefile.cmd
+include ../Makefile.com