summaryrefslogtreecommitdiff
path: root/usr/src/cmd/csh
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/cmd/csh')
-rw-r--r--usr/src/cmd/csh/i386/Makefile7
-rw-r--r--usr/src/cmd/csh/mapfile-intf34
-rw-r--r--usr/src/cmd/csh/sparc/Makefile7
3 files changed, 44 insertions, 4 deletions
diff --git a/usr/src/cmd/csh/i386/Makefile b/usr/src/cmd/csh/i386/Makefile
index 9b86d08e0f..462c692306 100644
--- a/usr/src/cmd/csh/i386/Makefile
+++ b/usr/src/cmd/csh/i386/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T
@@ -31,6 +31,9 @@ LAZYLIBS = $(ZLAZYLOAD) -lsecdb $(ZNOLAZYLOAD)
lint := LAZYLIBS = -lsecdb
LDLIBS += -lcurses $(LAZYLIBS)
+MAPFILES = ../mapfile-intf $(MAPFILE.NGB)
+LDFLAGS += $(MAPFILES:%=-M%)
+
PFOBJS = sh_policy.o
HDDEP = sh.o sh.dir.o sh.dol.o sh.err.o sh.exec.o sh.exp.o sh.file.o \
@@ -63,7 +66,7 @@ all: $(PROG)
$(COMPILE.c) $<
$(POST_PROCESS_O)
-$(CSH_PROG): $(COMMONOBJS) $(PFOBJS) $(LOCALOBJS)
+$(CSH_PROG): $(COMMONOBJS) $(PFOBJS) $(LOCALOBJS) $(MAPFILES)
$(LINK.c) $(COMMONOBJS) $(PFOBJS) $(LOCALOBJS) -o $@ $(LDLIBS)
$(POST_PROCESS)
diff --git a/usr/src/cmd/csh/mapfile-intf b/usr/src/cmd/csh/mapfile-intf
new file mode 100644
index 0000000000..15ef2478cd
--- /dev/null
+++ b/usr/src/cmd/csh/mapfile-intf
@@ -0,0 +1,34 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# 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.
+# 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 2007 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# ident "%Z%%M% %I% %E% SMI"
+#
+
+# csh interposes on a couple of libc functions (printf and signal).
+{
+ global:
+ printf = INTERPOSE;
+ signal = INTERPOSE;
+};
diff --git a/usr/src/cmd/csh/sparc/Makefile b/usr/src/cmd/csh/sparc/Makefile
index 9b634d23c5..5096a15cc7 100644
--- a/usr/src/cmd/csh/sparc/Makefile
+++ b/usr/src/cmd/csh/sparc/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
# Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T
@@ -31,6 +31,9 @@ LAZYLIBS = $(ZLAZYLOAD) -lsecdb $(ZNOLAZYLOAD)
lint := LAZYLIBS = -lsecdb
LDLIBS += -lcurses $(LAZYLIBS)
+MAPFILES = ../mapfile-intf $(MAPFILE.NGB)
+LDFLAGS += $(MAPFILES:%=-M%)
+
PFOBJS = sh_policy.o
HDDEP = sh.o sh.dir.o sh.dol.o sh.err.o sh.exec.o sh.exp.o sh.file.o \
@@ -63,7 +66,7 @@ all: $(PROG)
$(COMPILE.c) $<
$(POST_PROCESS_O)
-$(CSH_PROG): $(COMMONOBJS) $(PFOBJS) $(LOCALOBJS)
+$(CSH_PROG): $(COMMONOBJS) $(PFOBJS) $(LOCALOBJS) $(MAPFILES)
$(LINK.c) $(COMMONOBJS) $(PFOBJS) $(LOCALOBJS) -o $@ $(LDLIBS)
$(POST_PROCESS)