diff options
Diffstat (limited to 'usr/src/tools/ctf')
| -rw-r--r-- | usr/src/tools/ctf/cvt/Makefile.targ | 5 | ||||
| -rw-r--r-- | usr/src/tools/ctf/cvt/mapfile-vers | 53 |
2 files changed, 1 insertions, 57 deletions
diff --git a/usr/src/tools/ctf/cvt/Makefile.targ b/usr/src/tools/ctf/cvt/Makefile.targ index 81a9260e85..fba7b168e9 100644 --- a/usr/src/tools/ctf/cvt/Makefile.targ +++ b/usr/src/tools/ctf/cvt/Makefile.targ @@ -29,11 +29,8 @@ ctfconvert: $(CVTOBJS) $(LINK.c) -o $@ $(CVTOBJS) $(LDLIBS) $(POST_PROCESS) -# Remove this after build snv_126 -CTFMERGE_VERSION=-M../mapfile-vers - ctfmerge: $(MRGOBJS) - $(LINK.c) $(CTFMERGE_VERSION) -o $@ $(MRGOBJS) $(LDLIBS) + $(LINK.c) -o $@ $(MRGOBJS) $(LDLIBS) $(POST_PROCESS) %.o: ../%.c diff --git a/usr/src/tools/ctf/cvt/mapfile-vers b/usr/src/tools/ctf/cvt/mapfile-vers deleted file mode 100644 index 8ca590bb44..0000000000 --- a/usr/src/tools/ctf/cvt/mapfile-vers +++ /dev/null @@ -1,53 +0,0 @@ -# -# 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 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -# -# MAPFILE HEADER START -# -# WARNING: STOP NOW. DO NOT MODIFY THIS FILE. -# Object versioning must comply with the rules detailed in -# -# usr/src/lib/README.mapfiles -# -# You should not be making modifications here until you've read the most current -# copy of that file. If you need help, contact a gatekeeper for guidance. -# -# MAPFILE HEADER END -# - -# Work around the versioning fix resulting from -# -# 6869478 getpagesizes2 is assigned to wrong ELF version in libc -# in s10u8b3 -# -# integrated into Nevada with -# -# 6866605 SUNWonbld ELF analysis tools need overhaul -# -# This mapfile can be safely removed after the close of snv_126 -# - -libc.so - $ADDVERS=SUNW_1.23; |