Module Name: src Committed By: christos Date: Fri Jul 20 20:50:34 UTC 2018
Modified Files: src/external/bsd/libproc/dist: proc_bkpt.c src/external/bsd/libproc/dist/tests: proc_test.c Log Message: unbreak aarch64 To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libproc/dist/proc_bkpt.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libproc/dist/tests/proc_test.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/bsd/libproc/dist/proc_bkpt.c diff -u src/external/bsd/libproc/dist/proc_bkpt.c:1.5 src/external/bsd/libproc/dist/proc_bkpt.c:1.6 --- src/external/bsd/libproc/dist/proc_bkpt.c:1.5 Fri Dec 8 08:36:22 2017 +++ src/external/bsd/libproc/dist/proc_bkpt.c Fri Jul 20 16:50:34 2018 @@ -31,7 +31,7 @@ #ifdef __FBSDID __FBSDID("$FreeBSD: head/lib/libproc/proc_bkpt.c 287106 2015-08-24 12:17:15Z andrew $"); #else -__RCSID("$NetBSD: proc_bkpt.c,v 1.5 2017/12/08 13:36:22 rin Exp $"); +__RCSID("$NetBSD: proc_bkpt.c,v 1.6 2018/07/20 20:50:34 christos Exp $"); #endif #include <sys/types.h> @@ -218,10 +218,12 @@ proc_bkptexec(struct proc_handle *phdl, * set up by proc_bkptdel(). */ proc_regset(phdl, REG_PC, pc); +#ifdef PT_STEP if (ptrace(PT_STEP, proc_getpid(phdl), (void *)(intptr_t)1, 0) < 0) { DPRINTFX("ERROR: ptrace step failed"); return (-1); } +#endif proc_wstatus(phdl); status = proc_getwstat(phdl); if (!WIFSTOPPED(status)) { Index: src/external/bsd/libproc/dist/tests/proc_test.c diff -u src/external/bsd/libproc/dist/tests/proc_test.c:1.5 src/external/bsd/libproc/dist/tests/proc_test.c:1.6 --- src/external/bsd/libproc/dist/tests/proc_test.c:1.5 Fri Sep 25 15:08:33 2015 +++ src/external/bsd/libproc/dist/tests/proc_test.c Fri Jul 20 16:50:34 2018 @@ -28,7 +28,7 @@ #ifdef __FBSDID __FBSDID("$FreeBSD: head/lib/libproc/tests/proc_test.c 286863 2015-08-17 23:19:36Z emaste $"); #endif -__RCSID("$NetBSD: proc_test.c,v 1.5 2015/09/25 19:08:33 christos Exp $"); +__RCSID("$NetBSD: proc_test.c,v 1.6 2018/07/20 20:50:34 christos Exp $"); #include <sys/types.h> #include <sys/wait.h> @@ -49,13 +49,11 @@ static const char *r_debug_state = "_rtl static const char *r_debug_state = "r_debug_state"; #endif -#if !defined(__aarch64__) #if defined(__NetBSD__) static const char *ldelf_object = "ld.elf_so"; #elif defined(__FreeBSD__) static const char *ldelf_object = "ld-elf.so.1"; #endif -#endif static const char *target_prog_file = "target_prog"; #ifdef __NetBSD__ @@ -100,7 +98,6 @@ start_prog(const struct atf_tc *tc, bool return (phdl); } -#if !defined(__aarch64__) static void set_bkpt(struct proc_handle *phdl, uintptr_t addr, proc_breakpoint_t *saved) { @@ -178,7 +175,6 @@ verify_bkpt(struct proc_handle *phdl, GE ATF_REQUIRE_EQ_MSG(strcmp(mapname, mapbname), 0, "expected map name '%s' doesn't match '%s'", mapname, mapbname); } -#endif ATF_TC(map_alias_obj2map); ATF_TC_HEAD(map_alias_obj2map, tc) @@ -283,7 +279,6 @@ ATF_TC_BODY(map_alias_name2sym, tc) proc_free(phdl); } -#if !defined(__aarch64__) ATF_TC(symbol_lookup); ATF_TC_HEAD(symbol_lookup, tc) { @@ -360,7 +355,6 @@ ATF_TC_BODY(symbol_lookup_fail, tc) proc_free(phdl); } -#endif ATF_TC(signal_forward); ATF_TC_HEAD(signal_forward, tc) @@ -409,11 +403,8 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, map_alias_obj2map); ATF_TP_ADD_TC(tp, map_alias_name2map); ATF_TP_ADD_TC(tp, map_alias_name2sym); -/* On arm64 triggers panic ARM64TODO: pmap_sync_icache (PR202305). */ -#if !defined(__aarch64__) ATF_TP_ADD_TC(tp, symbol_lookup); ATF_TP_ADD_TC(tp, symbol_lookup_fail); -#endif ATF_TP_ADD_TC(tp, signal_forward); return (atf_no_error());