Skip to content

Commit

Permalink
OS-4458 lxbrand complete moving ptrace to IKE
Browse files Browse the repository at this point in the history
OS-4038 lxbrand PTRACE_PEEKUSER debugregs offset incorrect on 64bit
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Joshua M. Clulow <jmc@joyent.com>
  • Loading branch information
pfmooney committed Aug 31, 2015
1 parent 6fb0bf8 commit 9fb41d7
Show file tree
Hide file tree
Showing 14 changed files with 1,184 additions and 1,634 deletions.
11 changes: 1 addition & 10 deletions usr/src/lib/brand/lx/lx_brand/amd64/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
# Copyright 2014 Joyent, Inc. All rights reserved.
# Copyright 2015 Joyent, Inc.
#
#
# lib/brand/lx/amd64/Makefile
Expand All @@ -32,15 +32,6 @@ MSGFILES= $(CSRCS)

ASSYMDEP_OBJS = lx_handler.o

$(ASSYMDEP_OBJS:%=pics/%): assym.h

OFFSETS = ../$(MACH64)/offsets.in

assym.h: $(OFFSETS)
$(OFFSETS_CREATE) $(CTF_FLAGS) < $(OFFSETS) > $@

CLOBBERFILES += assym.h

install: all $(ROOTLIBS64)

$(POFILE): $(MSGFILES)
Expand Down
43 changes: 0 additions & 43 deletions usr/src/lib/brand/lx/lx_brand/amd64/offsets.in

This file was deleted.

6 changes: 2 additions & 4 deletions usr/src/lib/brand/lx/lx_brand/common/lx_brand.c
Original file line number Diff line number Diff line change
Expand Up @@ -663,8 +663,6 @@ lx_init(int argc, char *argv[], char *envp[])
if (lx_statfs_init() != 0)
lx_err_fatal("failed to setup the statfs translator");

lx_ptrace_init();

#if defined(_LP64)
vdso_hdr = map_vdso();
edp.ed_vdso = (uintptr_t)vdso_hdr;
Expand Down Expand Up @@ -1031,7 +1029,7 @@ static lx_syscall_handler_t lx_handlers[] = {
lx_getrusage, /* 98: getrusage */
NULL, /* 99: sysinfo */
lx_times, /* 100: times */
lx_ptrace, /* 101: ptrace */
NULL, /* 101: ptrace */
lx_getuid, /* 102: getuid */
lx_syslog, /* 103: syslog */
lx_getgid, /* 104: getgid */
Expand Down Expand Up @@ -1287,7 +1285,7 @@ static lx_syscall_handler_t lx_handlers[] = {
lx_setuid16, /* 23: setuid16 */
lx_getuid16, /* 24: getuid16 */
lx_stime, /* 25: stime */
lx_ptrace, /* 26: ptrace */
NULL, /* 26: ptrace */
lx_alarm, /* 27: alarm */
NULL, /* 28: fstat */
lx_pause, /* 29: pause */
Expand Down

0 comments on commit 9fb41d7

Please sign in to comment.