|
 |
fe0466 |
diff -rup a/sysdeps/linux-gnu/aarch64/fetch.c b/sysdeps/linux-gnu/aarch64/fetch.c
|
|
|
fe0466 |
--- a/sysdeps/linux-gnu/aarch64/fetch.c 2018-07-05 16:06:10.066626252 -0400
|
|
|
fe0466 |
+++ b/sysdeps/linux-gnu/aarch64/fetch.c 2018-07-05 16:17:17.659748481 -0400
|
|
|
fe0466 |
@@ -308,12 +308,9 @@ arch_fetch_arg_init(enum tof type, struc
|
|
|
fe0466 |
struct fetch_script how = pass_arg(context, proc, ret_info);
|
|
|
fe0466 |
if (how.c == CVT_ERR)
|
|
|
fe0466 |
goto fail;
|
|
|
fe0466 |
- if (how.c == CVT_NOP && how.f == FETCH_STACK) {
|
|
|
fe0466 |
+ if (how.c == CVT_BYREF && how.f == FETCH_GPR) {
|
|
|
fe0466 |
/* XXX double cast. */
|
|
|
fe0466 |
context->x8 = (arch_addr_t) (uintptr_t) context->gregs.regs[8];
|
|
|
fe0466 |
- /* See the comment above about the assert. */
|
|
|
fe0466 |
- assert(! "Unexpected: first argument passed on stack.");
|
|
|
fe0466 |
- abort();
|
|
|
fe0466 |
}
|
|
|
fe0466 |
|
|
|
fe0466 |
return context;
|
|
|
fe0466 |
diff -rup a/testsuite/ltrace.main/system_call_params.exp b/testsuite/ltrace.main/system_call_params.exp
|
|
|
fe0466 |
--- a/testsuite/ltrace.main/system_call_params.exp 2018-07-05 16:06:10.516624926 -0400
|
|
|
fe0466 |
+++ b/testsuite/ltrace.main/system_call_params.exp 2018-07-05 16:58:01.549830643 -0400
|
|
|
fe0466 |
@@ -61,13 +61,13 @@ set conf [ltraceNamedSource "$dir/syscal
|
|
|
fe0466 |
# doesn't list readdir, that would be taken from somelib.conf with a
|
|
|
fe0466 |
# wrong prototype.
|
|
|
fe0466 |
|
|
|
fe0466 |
-ltraceMatch1 [ltraceRun -L -S -F $conf -- $bin] {^open@SYS\("/some/path"} == 0
|
|
|
fe0466 |
+ltraceMatch1 [ltraceRun -L -S -F $conf -- $bin] {^open@SYS\("/some/path", 0\)} == 0
|
|
|
fe0466 |
|
|
|
fe0466 |
# On the other hand, if -F somedir/ is given, we want to accept
|
|
|
fe0466 |
# syscalls.conf found there.
|
|
|
fe0466 |
|
|
|
fe0466 |
ltraceMatch [ltraceRun -L -S -F $dir -- $bin] {
|
|
|
fe0466 |
- {{^open@SYS\("/some/path"} == 1}
|
|
|
fe0466 |
+ {{^open@SYS\("/some/path", 0\)} == 1}
|
|
|
fe0466 |
{{^write@SYS\(1, "something", 10\)} == 1}
|
|
|
fe0466 |
{{^mount@SYS\("source", "target", "filesystemtype"} == 1}
|
|
|
fe0466 |
}
|
|
|
fe0466 |
Only in b/testsuite/ltrace.main: system_call_params.exp~
|