From 38c8361559fe649b40eaef1245c794787847a29d Mon Sep 17 00:00:00 2001 From: Marc Abramowitz Date: Wed, 29 Feb 2012 12:03:14 -0800 Subject: [PATCH 1/4] Prepend "./" to mkerrtags.sh and mknames.sh commands. Fixes GH-2. --- libdtrace/makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libdtrace/makefile b/libdtrace/makefile index b51c39b..d936e0e 100644 --- a/libdtrace/makefile +++ b/libdtrace/makefile @@ -79,9 +79,9 @@ $(LIB): \ $(LIB)(stubs.o) dt_errtags.c: dt_errtags.h mkerrtags.sh - mkerrtags.sh dt_errtags.c + ./mkerrtags.sh dt_errtags.c dt_names.c: mknames.sh - mknames.sh <../../uts/common/sys/dtrace.h | sed -e 's/\\n/\n/g' > dt_names.c + ./mknames.sh <../../uts/common/sys/dtrace.h | sed -e 's/\\n/\n/g' > dt_names.c $(BINDIR)/dt_grammar.h $(LIB)(dt_grammar.o): dt_grammar.y $(H) ../tools/yacc.pl -d dt_grammar.y From 19bd999942dcd0047d9d0a02b8f72c729ee476cf Mon Sep 17 00:00:00 2001 From: Marc Abramowitz Date: Wed, 29 Feb 2012 12:17:30 -0800 Subject: [PATCH 2/4] Replace references to ctf*.o files with ../libctf.a Fixes GH-7. --- driver/Makefile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/driver/Makefile b/driver/Makefile index a6a80c6..ea7453f 100644 --- a/driver/Makefile +++ b/driver/Makefile @@ -1,13 +1,6 @@ dtracedrv-objs := \ - ctf_hash.o \ - ctf_lookup.o \ - ctf_mod.o \ - ctf_open.o \ - ctf_struct.o \ - ctf_subr.o \ - ctf_types.o \ - ctf_util.o \ + ../libctf.a \ ctl.o \ cpu_x86.o \ cyclic_linux.o \ From a680dfb6d51eba9dcb71cfff012b0e45ac5eb0c0 Mon Sep 17 00:00:00 2001 From: Marc Abramowitz Date: Wed, 29 Feb 2012 12:45:33 -0800 Subject: [PATCH 3/4] Revert dmutex_init code in driver/mutex.c back to the old code in 30fc39c8 without DEFINE_SEMAPHORE. Fixes GH-11. --- driver/mutex.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/driver/mutex.c b/driver/mutex.c index a5381da..ba8b0cf 100644 --- a/driver/mutex.c +++ b/driver/mutex.c @@ -45,11 +45,8 @@ static const int disable_ints; void dmutex_init(mutex_t *mp) { -static DEFINE_SEMAPHORE(null_sema); - memset(mp, 0, sizeof *mp); - mp->m_sem = null_sema; -// sema_init(&mp->m_sem, 1); + sema_init(&mp->m_sem, 1); mp->m_initted = TRUE; } From 16991559c3cf637e194184a1138cb997fcf7a327 Mon Sep 17 00:00:00 2001 From: Marc Abramowitz Date: Wed, 29 Feb 2012 13:11:36 -0800 Subject: [PATCH 4/4] Remove reference to uncompress.o which has been folded into libctf.a Fixes GH-13. --- driver/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/driver/Makefile b/driver/Makefile index ea7453f..5ca38f8 100644 --- a/driver/Makefile +++ b/driver/Makefile @@ -32,7 +32,6 @@ dtracedrv-objs := \ tcp.o \ toxic.o \ instr_size.o \ - uncompress.o \ vminfo.o \ x_call.o ifdef BUILD_i386