diff options
Diffstat (limited to 'usr/src/tools/ctf')
| -rw-r--r-- | usr/src/tools/ctf/Makefile | 25 | ||||
| -rw-r--r-- | usr/src/tools/ctf/Makefile.ctf | 2 | ||||
| -rw-r--r-- | usr/src/tools/ctf/common/utils.h | 3 | ||||
| -rw-r--r-- | usr/src/tools/ctf/dwarf/Makefile.com | 4 |
4 files changed, 26 insertions, 8 deletions
diff --git a/usr/src/tools/ctf/Makefile b/usr/src/tools/ctf/Makefile index 172509dc2f..b8346d3eff 100644 --- a/usr/src/tools/ctf/Makefile +++ b/usr/src/tools/ctf/Makefile @@ -23,7 +23,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# Copyright 2019 Joyent, Inc. +# Copyright 2020 Joyent, Inc. # include ../Makefile.tools @@ -36,7 +36,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint .KEEP_STATE: @@ -45,9 +44,29 @@ ctfdiff: libctf ctfdump: libctf ctfconvert: libctf -all clean clobber install lint: dwarf .WAIT $(SUBDIRS) +all clean clobber install: dwarf .WAIT $(SUBDIRS) dwarf $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) +# +# This is a somewhat arbitrary list. +# +CTFTOOLS_FILES = \ + bin/i386/ctfconvert \ + bin/i386/ctfdiff \ + bin/i386/ctfdump \ + bin/i386/ctfstabs \ + bin/i386/ctfstrip \ + lib/i386/libctf.so \ + lib/i386/libctf.so.1 \ + lib/i386/libdwarf.so \ + lib/i386/libdwarf.so.1 \ + lib/i386/libelf.so \ + lib/i386/libelf.so.1 + +# CTFTOOLS_TARBALL should be set in the environment +ctftools: install + cd $(ROOTONBLD) && $(TAR) cvzf $(CTFTOOLS_TARBALL) $(CTFTOOLS_FILES) + FRC: diff --git a/usr/src/tools/ctf/Makefile.ctf b/usr/src/tools/ctf/Makefile.ctf index c07310eddf..1fc0b707db 100644 --- a/usr/src/tools/ctf/Makefile.ctf +++ b/usr/src/tools/ctf/Makefile.ctf @@ -22,7 +22,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# Copyright (c) 2018, Joyent, Inc. +# Copyright (c) 2019, Joyent, Inc. include ../../../Makefile.tools diff --git a/usr/src/tools/ctf/common/utils.h b/usr/src/tools/ctf/common/utils.h index 9b07361a53..4ae2dd0917 100644 --- a/usr/src/tools/ctf/common/utils.h +++ b/usr/src/tools/ctf/common/utils.h @@ -27,9 +27,8 @@ #ifndef _UTILS_H #define _UTILS_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdarg.h> +#include <ctf_headers.h> #ifdef __cplusplus extern "C" { diff --git a/usr/src/tools/ctf/dwarf/Makefile.com b/usr/src/tools/ctf/dwarf/Makefile.com index 3f043681cb..886be7d853 100644 --- a/usr/src/tools/ctf/dwarf/Makefile.com +++ b/usr/src/tools/ctf/dwarf/Makefile.com @@ -96,7 +96,7 @@ FILEMODE = 0755 SRCDIR = $(SRC)/lib/libdwarf/common/ SRCS = $(PICS:%.o=$(SRCDIR)/%.c) -CPPFLAGS += -I$(SRCDIR) -DELF_TARGET_ALL=1 +CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include -I$(SRCDIR) -DELF_TARGET_ALL=1 CERRWARN += -_gcc=-Wno-unused CERRWARN += -_gcc=-Wno-implicit-function-declaration @@ -104,7 +104,7 @@ CERRWARN += -_gcc=-Wno-implicit-function-declaration SMATCH=off DYNFLAGS += '-R$$ORIGIN/../../lib/$(MACH)' -LDLIBS = -lelf -lc -lz +LDLIBS = -L$(ADJUNCT_PROTO)/lib -R$(ADJUNCT_PROTO)/lib -lelf -lc -lz NATIVE_LIBS += libelf.so libc.so libz.so .KEEP_STATE: |