diff options
| author | rie <none@none> | 2007-05-17 16:27:31 -0700 |
|---|---|---|
| committer | rie <none@none> | 2007-05-17 16:27:31 -0700 |
| commit | 24da5b34f49324ed742a340010ed5bd3d4e06625 (patch) | |
| tree | d634cc86da07688eb2048c7bfeed71bedea99c80 /usr/src/cmd/csh | |
| parent | 3230aa086e19b239f0306ae02bd82e788031cfef (diff) | |
| download | illumos-joyent-24da5b34f49324ed742a340010ed5bd3d4e06625.tar.gz | |
6455532 OSNet cleanup required in preparation for direct bindings
--HG--
rename : usr/src/cmd/bnu/strecpy.c => deleted_files/usr/src/cmd/bnu/strecpy.c
rename : usr/src/cmd/fs.d/ufs/mount/realpath.c => deleted_files/usr/src/cmd/fs.d/ufs/mount/realpath.c
rename : usr/src/cmd/lp/lib/lp/tinames.c => deleted_files/usr/src/cmd/lp/lib/lp/tinames.c
rename : usr/src/cmd/sgs/crle/common/mapfile-vers => deleted_files/usr/src/cmd/sgs/crle/common/mapfile-vers
rename : usr/src/cmd/sgs/elfdump/common/mapfile-vers => deleted_files/usr/src/cmd/sgs/elfdump/common/mapfile-vers
rename : usr/src/cmd/sgs/ldd/common/mapfile-vers => deleted_files/usr/src/cmd/sgs/ldd/common/mapfile-vers
rename : usr/src/cmd/sgs/moe/common/mapfile-vers => deleted_files/usr/src/cmd/sgs/moe/common/mapfile-vers
rename : usr/src/cmd/sgs/pvs/common/mapfile-vers => deleted_files/usr/src/cmd/sgs/pvs/common/mapfile-vers
rename : usr/src/lib/libsocket/amd64/byteorder.s => deleted_files/usr/src/lib/libsocket/amd64/byteorder.s
rename : usr/src/lib/libsocket/i386/byteorder.s => deleted_files/usr/src/lib/libsocket/i386/byteorder.s
rename : usr/src/cmd/sgs/ld/common/mapfile-vers => usr/src/cmd/sgs/ld/common/mapfile-intf
rename : usr/src/cmd/sgs/mapfiles/Makefile => usr/src/common/mapfiles/Makefile
rename : usr/src/cmd/sgs/mapfiles/amd64/Makefile => usr/src/common/mapfiles/amd64/Makefile
rename : usr/src/cmd/sgs/mapfiles/amd64/map.above4G => usr/src/common/mapfiles/amd64/map.above4G
rename : usr/src/cmd/sgs/mapfiles/amd64/map.below4G => usr/src/common/mapfiles/amd64/map.below4G
rename : usr/src/cmd/sgs/mapfiles/common/Makefile => usr/src/common/mapfiles/common/Makefile
rename : usr/src/cmd/mapfile_bssalign => usr/src/common/mapfiles/common/map.bssalign
rename : usr/src/cmd/mapfile_execdata => usr/src/common/mapfiles/common/map.execdata
rename : usr/src/lib/common/mapfile-filter => usr/src/common/mapfiles/common/map.filter
rename : usr/src/cmd/mapfile_noexstk => usr/src/common/mapfiles/common/map.noexstk
rename : usr/src/cmd/sgs/mapfiles/i386/Makefile => usr/src/common/mapfiles/i386/Makefile
rename : usr/src/cmd/sgs/mapfiles/i386/map.default => usr/src/common/mapfiles/i386/map.default
rename : usr/src/cmd/mapfile_noexdata => usr/src/common/mapfiles/i386/map.noexdata
rename : usr/src/cmd/sgs/mapfiles/i386/map.pagealign => usr/src/common/mapfiles/i386/map.pagealign
rename : usr/src/cmd/sgs/mapfiles/sparc/Makefile => usr/src/common/mapfiles/sparc/Makefile
rename : usr/src/cmd/sgs/mapfiles/sparc/map.default => usr/src/common/mapfiles/sparc/map.default
rename : usr/src/cmd/sgs/mapfiles/sparc/map.pagealign => usr/src/common/mapfiles/sparc/map.pagealign
rename : usr/src/cmd/sgs/mapfiles/sparcv9/Makefile => usr/src/common/mapfiles/sparcv9/Makefile
rename : usr/src/cmd/sgs/mapfiles/sparcv9/map.above4G => usr/src/common/mapfiles/sparcv9/map.above4G
rename : usr/src/cmd/sgs/mapfiles/sparcv9/map.below4G => usr/src/common/mapfiles/sparcv9/map.below4G
rename : usr/src/lib/libsocket/inet/byteorder.c => usr/src/lib/libc/sparc/gen/byteorder.c
Diffstat (limited to 'usr/src/cmd/csh')
| -rw-r--r-- | usr/src/cmd/csh/i386/Makefile | 7 | ||||
| -rw-r--r-- | usr/src/cmd/csh/mapfile-intf | 34 | ||||
| -rw-r--r-- | usr/src/cmd/csh/sparc/Makefile | 7 |
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) |
