summaryrefslogtreecommitdiff
path: root/usr/src/psm
diff options
context:
space:
mode:
authorBill Moore <Bill.Moore@Sun.COM>2009-01-29 15:50:22 -0800
committerBill Moore <Bill.Moore@Sun.COM>2009-01-29 15:50:22 -0800
commit91178d6b2e96007b6d678c96297eb48fae04f437 (patch)
treedb60485a9fba33ff7db4d63daee72b68132b03ce /usr/src/psm
parentb08adf18081a3f141071a9e5f4e45779e9ad63d5 (diff)
downloadillumos-joyent-91178d6b2e96007b6d678c96297eb48fae04f437.tar.gz
6798733 Ancient Makefile work-arounds anger modern shells
Diffstat (limited to 'usr/src/psm')
-rw-r--r--usr/src/psm/stand/bootblks/Makefile.com12
-rw-r--r--usr/src/psm/stand/lib/Makefile.lib20
2 files changed, 8 insertions, 24 deletions
diff --git a/usr/src/psm/stand/bootblks/Makefile.com b/usr/src/psm/stand/bootblks/Makefile.com
index fd485be357..dfcb433931 100644
--- a/usr/src/psm/stand/bootblks/Makefile.com
+++ b/usr/src/psm/stand/bootblks/Makefile.com
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# psm/stand/bootblks/Makefile.com
#
TOPDIR = ../../../$(BASEDIR)
@@ -70,14 +68,6 @@ OWNER = root
GROUP = sys
#
-# Lint rules (adapted from Makefile.uts)
-#
-LHEAD = ( $(ECHO) "\n$@";
-LGREP = grep -v "pointer cast may result in improper alignment"
-LTAIL = ) 2>&1 | $(LGREP)
-LINT_DEFS += -Dlint
-
-#
# For building lint objects
#
LINTFLAGS.c = -nsxum
diff --git a/usr/src/psm/stand/lib/Makefile.lib b/usr/src/psm/stand/lib/Makefile.lib
index 3c55bdbc2d..148e0f12b1 100644
--- a/usr/src/psm/stand/lib/Makefile.lib
+++ b/usr/src/psm/stand/lib/Makefile.lib
@@ -2,9 +2,8 @@
# 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.
+# Common Development and Distribution License (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.
@@ -19,11 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 1994, 2003 Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# psm/stand/lib/Makefile.lib
@@ -45,17 +40,16 @@ PSMPROMLIBDIR = $(PSMSTANDDIR)/lib/promif/$(MACH)
#
# Lint rules (adapted from Makefile.uts)
#
-LHEAD = ( $(ECHO) "\n$@";
-LGREP = grep -v "pointer cast may result in improper alignment"
-LTAIL = ) 2>&1 | $(LGREP)
+LHEAD = $(ECHO) "\n$@";
+LTAIL =
LINT_DEFS += -Dlint
#
# For building lint objects
#
-LINTFLAGS.c = -nsxum
+LINTFLAGS.c = -nsxum -erroff=E_BAD_PTR_CAST_ALIGN
LINTFLAGS.c += $(ALWAYS_LINT_DEFS)
-LINTFLAGS64.c = -nsxum
+LINTFLAGS64.c = -nsxum -erroff=E_BAD_PTR_CAST_ALIGN
LINTFLAGS64.c += $(ALWAYS_LINT_DEFS)
LINT64.c = $(LINT) $(LINTFLAGS64.c) $(LINT_DEFS) $(CPPFLAGS) -c
LINT.c = $(LINT) $(LINTFLAGS.c) $(LINT_DEFS) $(CPPFLAGS) -c