summaryrefslogtreecommitdiff
path: root/usr/src/cmd/mdb
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2020-01-17 09:49:43 -0800
committerToomas Soome <tsoome@me.com>2020-02-05 19:00:00 +0200
commit5801b0f01c3c34499a929ed96164a5a68b470945 (patch)
tree50e06e6f9eb27ea820f4f4e711c485499aad6e86 /usr/src/cmd/mdb
parent948761701ebc8a0cf820a973780b2fbb931c4390 (diff)
downloadillumos-joyent-5801b0f01c3c34499a929ed96164a5a68b470945.tar.gz
12217 add ld assert-deflib and guidance to gate build
Reviewed by: Robert Mustacchi <rm@fingolfin.org> Reviewed by: Gergő Mihály Doma <domag02@gmail.com> Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/cmd/mdb')
-rw-r--r--usr/src/cmd/mdb/tools/Makefile2
-rw-r--r--usr/src/cmd/mdb/tools/findfp/Makefile.com12
-rw-r--r--usr/src/cmd/mdb/tools/setdynflag/Makefile2
-rw-r--r--usr/src/cmd/mdb/tools/setdynflag/Makefile.com13
4 files changed, 5 insertions, 24 deletions
diff --git a/usr/src/cmd/mdb/tools/Makefile b/usr/src/cmd/mdb/tools/Makefile
index fd687be167..3ed9c7ad7d 100644
--- a/usr/src/cmd/mdb/tools/Makefile
+++ b/usr/src/cmd/mdb/tools/Makefile
@@ -23,8 +23,6 @@
# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/Makefile.master
diff --git a/usr/src/cmd/mdb/tools/findfp/Makefile.com b/usr/src/cmd/mdb/tools/findfp/Makefile.com
index 6ac7877527..16e692d598 100644
--- a/usr/src/cmd/mdb/tools/findfp/Makefile.com
+++ b/usr/src/cmd/mdb/tools/findfp/Makefile.com
@@ -45,7 +45,8 @@ include ../../common/Makefile.util
CPPFLAGS = -I../../common -I../common
CFLAGS += $(CCVERBOSE)
CERRWARN += $(CNOWARN_UNINIT)
-LDFLAGS =
+LDFLAGS = $(ZLAZYLOAD) $(BDIRECT)
+LDFLAGS += $(ZASSERTDEFLIB)=libelf.so $(ZASSERTDEFLIB)=libc.so
LDLIBS = -lelf
LINTFILES = $(SRCS:%.c=%.ln)
@@ -55,9 +56,6 @@ install all: $(PROG)
clobber clean:
$(RM) $(OBJS) $(LINTFILES) $(PROG)
-lint: $(LINTFILES)
- $(LINT) $(LINTFLAGS) $(LINTFILES) $(LDLIBS)
-
$(PROG): $(OBJS)
$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
$(POST_PROCESS)
@@ -69,9 +67,3 @@ $(PROG): $(OBJS)
%.o: ../common/%.c
$(COMPILE.c) $<
$(POST_PROCESS_O)
-
-%.ln: %.c
- $(LINT.c) -c $<
-
-%.ln: ../common/%.c
- $(LINT.c) -c $<
diff --git a/usr/src/cmd/mdb/tools/setdynflag/Makefile b/usr/src/cmd/mdb/tools/setdynflag/Makefile
index f6314b84d6..67d07e8490 100644
--- a/usr/src/cmd/mdb/tools/setdynflag/Makefile
+++ b/usr/src/cmd/mdb/tools/setdynflag/Makefile
@@ -23,8 +23,6 @@
# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
include ../../../Makefile.cmd
diff --git a/usr/src/cmd/mdb/tools/setdynflag/Makefile.com b/usr/src/cmd/mdb/tools/setdynflag/Makefile.com
index 02807d7089..f7eb93fb8f 100644
--- a/usr/src/cmd/mdb/tools/setdynflag/Makefile.com
+++ b/usr/src/cmd/mdb/tools/setdynflag/Makefile.com
@@ -44,18 +44,14 @@ include ../../common/Makefile.util
CPPFLAGS = -I../../common
CFLAGS += $(CCVERBOSE)
CERRWARN += $(CNOWARN_UNINIT)
-LDFLAGS =
+LDFLAGS = $(ZLAZYLOAD) $(BDIRECT)
LDLIBS = -lelf
-
-LINTFILES = $(SRCS:%.c=%.ln)
+NATIVE_LIBS += libelf.so libc.so
install all: $(PROG)
clobber clean:
- $(RM) $(OBJS) $(LINTFILES) $(PROG)
-
-lint: $(LINTFILES)
- $(LINT) $(LINTFLAGS) $(LINTFILES) $(LDLIBS)
+ $(RM) $(OBJS) $(PROG)
$(PROG): $(OBJS)
$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
@@ -64,6 +60,3 @@ $(PROG): $(OBJS)
%.o: ../common/%.c
$(COMPILE.c) $<
$(POST_PROCESS_O)
-
-%.ln: ../common/%.c
- $(LINT.c) -c $<