[PATCH][gdb/tdep] Support catch syscall pipe2 for i386

[Tom de Vries via Gdb-patches <gdb-patches@sourceware.org>]

[-- Attachment #1: Type: text/plain, Size: 1336 bytes --]

[ was: Re: [PATCH, v2][gdb/testsuite] Handle pipe2 syscall in 
gdb.base/catch-syscall.exp ]

On 5/5/22 13:47, Tom de Vries wrote:
> On 5/3/22 16:57, Tom de Vries wrote:
>> Hi,
>>
>> When running test-case gdb.reverse/pipe-reverse.exp on openSUSE 
>> Tumbleweed,
>> I run into:
>> ...
>> (gdb) continue^M
>> Continuing.^M
>> ^M
>> Catchpoint 2 (returned from syscall pipe2), in pipe () from 
>> /lib64/libc.so.6^M
>> (gdb) FAIL: gdb.base/catch-syscall.exp: without arguments: \
>>    syscall pipe has returned
>> ...
>>
>> The current glibc on Tumbleweed is 2.35, which contains commit
>> "linux: Implement pipe in terms of __NR_pipe2", and consequently 
>> syscall pipe2
>> is used in stead of syscall pipe.
>>
>> Fix this by detecting whether syscall pipe or pipe2 is used before 
>> running the tests.
>>
>> Tested on x86_64-linux, specifically on:
>> - openSUSE Tumbleweed (with glibc 2.35), and
>> - openSUSE Leap 15.3 (with glibc 2.31).
>>
>> Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29056
>>
>> Any comments?
>>
> 
> I'm submitting a v2.  I found out that with target board unix/-m32, 
> pipe2 is not recognized as syscall name (which I'll fix in a follow-up 
> patch), so I made the test robust against this, by using the syscall 
> number instead.

And this is that follow-up patch.

Any comments?

Thanks,
- Tom

[-- Attachment #2: 0009-gdb-tdep-Support-catch-syscall-pipe2-for-i386.patch --]
[-- Type: text/x-patch, Size: 1585 bytes --]

[gdb/tdep] Support catch syscall pipe2 for i386

With test-case gdb.base/catch-syscall.exp and target board unix/-m32, we run
into:
...
(gdb) catch syscall pipe2^M
Unknown syscall name 'pipe2'.^M
(gdb) FAIL: gdb.base/catch-syscall.exp: determine pipe syscall: catch syscall pipe2
...

Fix this by:
- adding a pipe2 entry in gdb/syscalls/i386-linux.xml.in, and
- regenerating gdb/syscalls/i386-linux.xml using
  "xsltproc --output i386-linux.xml apply-defaults.xsl i386-linux.xml.in".

Tested on x86_64-linux with native and unix/-m32.

Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29056

---
 gdb/syscalls/i386-linux.xml    | 1 +
 gdb/syscalls/i386-linux.xml.in | 1 +
 2 files changed, 2 insertions(+)

diff --git a/gdb/syscalls/i386-linux.xml b/gdb/syscalls/i386-linux.xml
index a783dd10af3..4a7a2345186 100644
--- a/gdb/syscalls/i386-linux.xml
+++ b/gdb/syscalls/i386-linux.xml
@@ -334,4 +334,5 @@
   <syscall name="eventfd" number="323" groups="descriptor"/>
   <syscall name="fallocate" number="324" groups="descriptor"/>
   <syscall name="timerfd_settime" number="325" groups="descriptor"/>
+  <syscall name="pipe2" number="331" groups="descriptor"/>
 </syscalls_info>
diff --git a/gdb/syscalls/i386-linux.xml.in b/gdb/syscalls/i386-linux.xml.in
index e778ab54043..13c4d1d99d4 100644
--- a/gdb/syscalls/i386-linux.xml.in
+++ b/gdb/syscalls/i386-linux.xml.in
@@ -337,4 +337,5 @@
   <syscall name="eventfd" number="323"/>
   <syscall name="fallocate" number="324"/>
   <syscall name="timerfd_settime" number="325"/>
+  <syscall name="pipe2" number="331"/>
 </syscalls_info>