6117 Many small bugs prevent a clean build on SPARC

@@ -17,16 +17,16 @@
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
+# Copyright 2015 Gary Mills
 # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 LIBRARY=        libelf.a
 VERS=           .1
-M4=             m4
 
 MACHOBJS=
 COMOBJS=        ar.o            begin.o         cntl.o          cook.o \
                 data.o          end.o           fill.o          flag.o \
                 getarhdr.o      getarsym.o      getbase.o       getdata.o \

@@ -48,10 +48,12 @@
 
 OBJECTS=        $(BLTOBJS)  $(MACHOBJS)  $(COMOBJS)  $(CLASSOBJS) $(MISCOBJS)
 
 include $(SRC)/lib/Makefile.lib
 
+# Use the value of M4 set in Makefile.master via Makefile.lib
+
 DEMOFILES=      Makefile        00README        acom.c          dcom.c \
                 pcom.c          tpcom.c         dispsyms.c
 DEMOFILESRCDIR= ../demo
 ROOTDEMODIRBASE=$(ROOT)/usr/demo/ELF
 ROOTDEMODIRS=   $(ROOTDEMODIRBASE)