From 556e073a0e1f9d71521d153e3516c184dd046bf3 Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Fri, 30 Nov 2018 14:34:33 -0500 Subject: [PATCH] tools: stop building tools version of ctf{diff,dump,convert,merge} --- kernel/mk/defines.mk | 4 +-- usr/src/.gitignore | 4 --- usr/src/Makefile.master | 6 ++-- usr/src/pkg/manifests/developer-build-onbld.mf | 4 --- usr/src/tools/ctf/Makefile | 7 +--- usr/src/tools/ctf/ctfconvert/Makefile | 43 ------------------------ usr/src/tools/ctf/ctfconvert/Makefile.com | 43 ------------------------ usr/src/tools/ctf/ctfconvert/i386/Makefile | 27 ---------------- usr/src/tools/ctf/ctfdiff/Makefile | 43 ------------------------ usr/src/tools/ctf/ctfdiff/Makefile.com | 43 ------------------------ usr/src/tools/ctf/ctfdiff/i386/Makefile | 16 --------- usr/src/tools/ctf/ctfdump/Makefile | 32 ------------------ usr/src/tools/ctf/ctfdump/Makefile.com | 43 ------------------------ usr/src/tools/ctf/ctfdump/i386/Makefile | 16 --------- usr/src/tools/ctf/ctfmerge/Makefile | 43 ------------------------ usr/src/tools/ctf/ctfmerge/Makefile.com | 45 -------------------------- usr/src/tools/ctf/ctfmerge/i386/Makefile | 27 ---------------- 17 files changed, 6 insertions(+), 440 deletions(-) delete mode 100644 usr/src/tools/ctf/ctfconvert/Makefile delete mode 100644 usr/src/tools/ctf/ctfconvert/Makefile.com delete mode 100644 usr/src/tools/ctf/ctfconvert/i386/Makefile delete mode 100644 usr/src/tools/ctf/ctfdiff/Makefile delete mode 100644 usr/src/tools/ctf/ctfdiff/Makefile.com delete mode 100644 usr/src/tools/ctf/ctfdiff/i386/Makefile delete mode 100644 usr/src/tools/ctf/ctfdump/Makefile delete mode 100644 usr/src/tools/ctf/ctfdump/Makefile.com delete mode 100644 usr/src/tools/ctf/ctfdump/i386/Makefile delete mode 100644 usr/src/tools/ctf/ctfmerge/Makefile delete mode 100644 usr/src/tools/ctf/ctfmerge/Makefile.com delete mode 100644 usr/src/tools/ctf/ctfmerge/i386/Makefile diff --git a/kernel/mk/defines.mk b/kernel/mk/defines.mk index 639b47e60d..7d9aef7ca7 100644 --- a/kernel/mk/defines.mk +++ b/kernel/mk/defines.mk @@ -120,8 +120,8 @@ KERNEL_LDFLAGS = \ # CC=/opt/gcc/4.4.4/bin/gcc LD=/usr/bin/ld -CTFCONVERT=/opt/onbld/bin/i386/ctfconvert -CTFMERGE=/opt/onbld/bin/i386/ctfmerge +CTFCONVERT=/usr/bin/ctfconvert +CTFMERGE=/usr/bin/ctfmerge # # Verbosity diff --git a/usr/src/.gitignore b/usr/src/.gitignore index 82996e42f9..7878d32351 100644 --- a/usr/src/.gitignore +++ b/usr/src/.gitignore @@ -4613,10 +4613,6 @@ test/zfs-tests/tests/functional/libzfs/many_fds test/zfs-tests/tests/functional/threadsappend/threadsappend tools/btxld/btxld tools/codereview/codereview -tools/ctf/ctfconvert/i386/ctfconvert -tools/ctf/ctfdiff/i386/ctfdiff -tools/ctf/ctfdump/i386/ctfdump -tools/ctf/ctfmerge/i386/ctfmerge tools/ctf/ctfstrip/ctfstrip tools/ctf/dwarf/i386/libdwarf.so.1 tools/ctf/dwarf/i386/pics/ diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index 1d5c0e769f..c5dfa08c4d 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -122,9 +122,9 @@ FLEX= /usr/bin/flex YACC= /usr/bin/yacc CPP= $(GNUC_ROOT)/cpp ANSI_CPP= $(GNUC_ROOT)/bin/cpp -CTFCONVERT= $(ONBLD_TOOLS)/bin/$(MACH)/ctfconvert -CTFDIFF= $(ONBLD_TOOLS)/bin/$(MACH)/ctfdiff -CTFMERGE= $(ONBLD_TOOLS)/bin/$(MACH)/ctfmerge +CTFCONVERT= /usr/bin/ctfconvert +CTFDIFF= /usr/bin/ctfdiff +CTFMERGE= /usr/bin/ctfmerge CTFSTABS= $(ONBLD_TOOLS)/bin/$(MACH)/ctfstabs CTFSTRIP= $(ONBLD_TOOLS)/bin/$(MACH)/ctfstrip NDRGEN= $(ONBLD_TOOLS)/bin/$(MACH)/ndrgen diff --git a/usr/src/pkg/manifests/developer-build-onbld.mf b/usr/src/pkg/manifests/developer-build-onbld.mf index 7139c4a012..79d1d60911 100644 --- a/usr/src/pkg/manifests/developer-build-onbld.mf +++ b/usr/src/pkg/manifests/developer-build-onbld.mf @@ -57,10 +57,6 @@ dir path=opt/onbld/man dir path=opt/onbld/man/man1 file path=opt/onbld/bin/$(ARCH)/btxld mode=0555 file path=opt/onbld/bin/$(ARCH)/codereview mode=0555 -file path=opt/onbld/bin/$(ARCH)/ctfconvert mode=0555 -file path=opt/onbld/bin/$(ARCH)/ctfdiff mode=0555 -file path=opt/onbld/bin/$(ARCH)/ctfdump mode=0555 -file path=opt/onbld/bin/$(ARCH)/ctfmerge mode=0555 file path=opt/onbld/bin/$(ARCH)/ctfstabs mode=0555 file path=opt/onbld/bin/$(ARCH)/ctfstrip mode=0555 file path=opt/onbld/bin/$(ARCH)/elfextract mode=0555 diff --git a/usr/src/tools/ctf/Makefile b/usr/src/tools/ctf/Makefile index f9d827bb09..a699eac989 100644 --- a/usr/src/tools/ctf/Makefile +++ b/usr/src/tools/ctf/Makefile @@ -26,7 +26,7 @@ include ../Makefile.tools -SUBDIRS = stabs ctfstrip libctf ctfdiff ctfmerge ctfdump ctfconvert +SUBDIRS = stabs ctfstrip libctf .PARALLEL: $(SUBDIRS) @@ -37,11 +37,6 @@ clobber := TARGET= clobber .KEEP_STATE: -ctfmerge: libctf -ctfdiff: libctf -ctfdump: libctf -ctfconvert: libctf - all clean clobber install: dwarf .WAIT $(SUBDIRS) dwarf $(SUBDIRS): FRC diff --git a/usr/src/tools/ctf/ctfconvert/Makefile b/usr/src/tools/ctf/ctfconvert/Makefile deleted file mode 100644 index a40d099ade..0000000000 --- a/usr/src/tools/ctf/ctfconvert/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# -# 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. -# -# 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 (c) 2001 by Sun Microsystems, Inc. -# All rights reserved. -# - -include ../../Makefile.tools - -SUBDIRS = $(MACH) - -all := TARGET= all -install := TARGET= install -clean := TARGET= clean -clobber := TARGET= clobber - -.KEEP_STATE: - -install all clean clobber: $(SUBDIRS) - -$(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(TARGET) - -FRC: diff --git a/usr/src/tools/ctf/ctfconvert/Makefile.com b/usr/src/tools/ctf/ctfconvert/Makefile.com deleted file mode 100644 index d1690df67b..0000000000 --- a/usr/src/tools/ctf/ctfconvert/Makefile.com +++ /dev/null @@ -1,43 +0,0 @@ -# -# This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL"), version 1.0. -# You may only use this file in accordance with the terms of version -# 1.0 of the CDDL. -# -# A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at -# http://www.illumos.org/license/CDDL. -# - -PROG = ctfconvert -SRCS = ctfconvert.c - -include ../../Makefile.ctf - -LDLIBS += -lctf -lelf - -LDFLAGS = \ - -L$(ROOTONBLDLIBMACH) \ - '-R$$ORIGIN/../../lib/$(MACH)' \ - -CPPFLAGS += -include ../../common/ctf_headers.h - -OBJS = $(SRCS:%.c=%.o) - -all: $(PROG) - -$(PROG): $(OBJS) - $(LINK.c) $(OBJS) -o $@ $(LDLIBS) - $(POST_PROCESS) - -%.o: $(SRC)/cmd/ctfconvert/%.c - $(COMPILE.c) $< - -$(ROOTONBLDMACHPROG): $(PROG) - -install: $(ROOTONBLDMACHPROG) - -clean: - $(RM) $(OBJS) - -include $(SRC)/tools/Makefile.targ diff --git a/usr/src/tools/ctf/ctfconvert/i386/Makefile b/usr/src/tools/ctf/ctfconvert/i386/Makefile deleted file mode 100644 index cd5462bee3..0000000000 --- a/usr/src/tools/ctf/ctfconvert/i386/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# -# 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. -# -# 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 (c) 2001 by Sun Microsystems, Inc. -# All rights reserved. -# - -include ../Makefile.com diff --git a/usr/src/tools/ctf/ctfdiff/Makefile b/usr/src/tools/ctf/ctfdiff/Makefile deleted file mode 100644 index a40d099ade..0000000000 --- a/usr/src/tools/ctf/ctfdiff/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# -# 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. -# -# 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 (c) 2001 by Sun Microsystems, Inc. -# All rights reserved. -# - -include ../../Makefile.tools - -SUBDIRS = $(MACH) - -all := TARGET= all -install := TARGET= install -clean := TARGET= clean -clobber := TARGET= clobber - -.KEEP_STATE: - -install all clean clobber: $(SUBDIRS) - -$(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(TARGET) - -FRC: diff --git a/usr/src/tools/ctf/ctfdiff/Makefile.com b/usr/src/tools/ctf/ctfdiff/Makefile.com deleted file mode 100644 index b1f1185ee0..0000000000 --- a/usr/src/tools/ctf/ctfdiff/Makefile.com +++ /dev/null @@ -1,43 +0,0 @@ -# -# This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL"), version 1.0. -# You may only use this file in accordance with the terms of version -# 1.0 of the CDDL. -# -# A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at -# http://www.illumos.org/license/CDDL. -# - -PROG = ctfdiff -SRCS = ctfdiff.c - -include ../../Makefile.ctf - -LDLIBS += -lctf - -LDFLAGS = \ - -L$(ROOTONBLDLIBMACH) \ - '-R$$ORIGIN/../../lib/$(MACH)' \ - -CPPFLAGS += -include ../../common/ctf_headers.h - -OBJS = $(SRCS:%.c=%.o) - -all: $(PROG) - -$(PROG): $(OBJS) - $(LINK.c) $(OBJS) -o $@ $(LDLIBS) - $(POST_PROCESS) - -%.o: $(SRC)/cmd/ctfdiff/%.c - $(COMPILE.c) $< - -$(ROOTONBLDMACHPROG): $(PROG) - -install: $(ROOTONBLDMACHPROG) - -clean: - $(RM) $(OBJS) - -include $(SRC)/tools/Makefile.targ diff --git a/usr/src/tools/ctf/ctfdiff/i386/Makefile b/usr/src/tools/ctf/ctfdiff/i386/Makefile deleted file mode 100644 index 92c756cb42..0000000000 --- a/usr/src/tools/ctf/ctfdiff/i386/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# -# This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL"), version 1.0. -# You may only use this file in accordance with the terms of version -# 1.0 of the CDDL. -# -# A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at -# http://www.illumos.org/license/CDDL. -# - -# -# Copyright (c) 2015, Joyent, Inc. -# - -include ../Makefile.com diff --git a/usr/src/tools/ctf/ctfdump/Makefile b/usr/src/tools/ctf/ctfdump/Makefile deleted file mode 100644 index bd18f9442e..0000000000 --- a/usr/src/tools/ctf/ctfdump/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# -# This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL"), version 1.0. -# You may only use this file in accordance with the terms of version -# 1.0 of the CDDL. -# -# A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at -# http://www.illumos.org/license/CDDL. -# - -# -# Copyright (c) 2015, Joyent, Inc. -# - -include ../../Makefile.tools - -SUBDIRS = $(MACH) - -all := TARGET= all -install := TARGET= install -clean := TARGET= clean -clobber := TARGET= clobber - -.KEEP_STATE: - -install all clean clobber: $(SUBDIRS) - -$(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(TARGET) - -FRC: diff --git a/usr/src/tools/ctf/ctfdump/Makefile.com b/usr/src/tools/ctf/ctfdump/Makefile.com deleted file mode 100644 index ea91551475..0000000000 --- a/usr/src/tools/ctf/ctfdump/Makefile.com +++ /dev/null @@ -1,43 +0,0 @@ -# -# This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL"), version 1.0. -# You may only use this file in accordance with the terms of version -# 1.0 of the CDDL. -# -# A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at -# http://www.illumos.org/license/CDDL. -# - -PROG = ctfdump -SRCS = ctfdump.c - -include ../../Makefile.ctf - -LDLIBS += -lctf - -LDFLAGS = \ - -L$(ROOTONBLDLIBMACH) \ - '-R$$ORIGIN/../../lib/$(MACH)' \ - -CPPFLAGS += -include ../../common/ctf_headers.h - -OBJS = $(SRCS:%.c=%.o) - -all: $(PROG) - -$(PROG): $(OBJS) - $(LINK.c) $(OBJS) -o $@ $(LDLIBS) - $(POST_PROCESS) - -%.o: $(SRC)/cmd/ctfdump/%.c - $(COMPILE.c) $< - -$(ROOTONBLDMACHPROG): $(PROG) - -install: $(ROOTONBLDMACHPROG) - -clean: - $(RM) $(OBJS) - -include $(SRC)/tools/Makefile.targ diff --git a/usr/src/tools/ctf/ctfdump/i386/Makefile b/usr/src/tools/ctf/ctfdump/i386/Makefile deleted file mode 100644 index 92c756cb42..0000000000 --- a/usr/src/tools/ctf/ctfdump/i386/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# -# This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL"), version 1.0. -# You may only use this file in accordance with the terms of version -# 1.0 of the CDDL. -# -# A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at -# http://www.illumos.org/license/CDDL. -# - -# -# Copyright (c) 2015, Joyent, Inc. -# - -include ../Makefile.com diff --git a/usr/src/tools/ctf/ctfmerge/Makefile b/usr/src/tools/ctf/ctfmerge/Makefile deleted file mode 100644 index a40d099ade..0000000000 --- a/usr/src/tools/ctf/ctfmerge/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# -# 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. -# -# 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 (c) 2001 by Sun Microsystems, Inc. -# All rights reserved. -# - -include ../../Makefile.tools - -SUBDIRS = $(MACH) - -all := TARGET= all -install := TARGET= install -clean := TARGET= clean -clobber := TARGET= clobber - -.KEEP_STATE: - -install all clean clobber: $(SUBDIRS) - -$(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(TARGET) - -FRC: diff --git a/usr/src/tools/ctf/ctfmerge/Makefile.com b/usr/src/tools/ctf/ctfmerge/Makefile.com deleted file mode 100644 index c32994e3e2..0000000000 --- a/usr/src/tools/ctf/ctfmerge/Makefile.com +++ /dev/null @@ -1,45 +0,0 @@ -# -# This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL"), version 1.0. -# You may only use this file in accordance with the terms of version -# 1.0 of the CDDL. -# -# A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at -# http://www.illumos.org/license/CDDL. -# - -PROG = ctfmerge -SRCS = ctfmerge.c - -include ../../Makefile.ctf - -LDLIBS += -lctf -lelf - -LDFLAGS += \ - -L$(ROOTONBLDLIBMACH) \ - '-R$$ORIGIN/../../lib/$(MACH)' \ - -CPPFLAGS += -include ../../common/ctf_headers.h -CERRWARN += -Wno-unused-variable -CERRWARN += -Wno-uninitialized - -OBJS = $(SRCS:%.c=%.o) - -all: $(PROG) - -$(PROG): $(OBJS) - $(LINK.c) $(OBJS) -o $@ $(LDLIBS) - $(POST_PROCESS) - -%.o: $(SRC)/cmd/ctfmerge/%.c - $(COMPILE.c) $< - -$(ROOTONBLDMACHPROG): $(PROG) - -install: $(ROOTONBLDMACHPROG) - -clean: - $(RM) $(OBJS) - -include $(SRC)/tools/Makefile.targ diff --git a/usr/src/tools/ctf/ctfmerge/i386/Makefile b/usr/src/tools/ctf/ctfmerge/i386/Makefile deleted file mode 100644 index cd5462bee3..0000000000 --- a/usr/src/tools/ctf/ctfmerge/i386/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# -# 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. -# -# 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 (c) 2001 by Sun Microsystems, Inc. -# All rights reserved. -# - -include ../Makefile.com -- 2.11.4.GIT