[AArch64] Include asm/ptrace.h in aarch64-linux-nat.c

Message ID 537F00EB.5090601@arm.com
State New
Headers show

Commit Message

Ramana Radhakrishnan May 23, 2014, 8:03 a.m.
On 05/22/14 13:49, Joel Brobecker wrote:
>> 	A recent change to glibc removed asm/ptrace.h from user.h for
>> AArch64. This meant that cross-native builds of gdb using trunk
>> glibc broke because aarch64-linux-nat.c because user_hwdebug_state
>> couldn't be found.
>>
>> Fixed by including asm/ptrace.h like other ports.
>
> Thanks for the explanation. Can you make sure you include that
> in the revision history of your commit?
>
>> 2014-05-22  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
>>
>>         * aarch64-linux-nat.c (asm/ptrace.h): Include.
>>
>
> OK to push.  Thank you.
>
>

Thanks - I've got a similar one in gdbserver which I somehow managed to 
miss yesterday.

Ok to push ?

regards
Ramana
commit e9dae05e9c32efda9724330c6d5ade3ca848591d
Author: Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>
Date:   Fri May 23 09:01:14 2014 +0100

    Include asm/ptrace.h for linux-aarch64-low.c
    
    A recent change to glibc removed asm/ptrace.h from user.h for AArch64.
    This meant that cross-native builds of gdbserver using trunk glibc broke
    because linux-aarch64-low.c because user_hwdebug_state couldn't be found.
    
    This is like commit #036cd38182bde32d8297b630cd5c861d53b8949e
    
    2014-05-23  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
    
            * linux-aarch64-low.c (asm/ptrace.h): Include.

Comments

Richard Earnshaw May 23, 2014, 12:17 p.m. | #1
On 23/05/14 09:03, Ramana Radhakrishnan wrote:
> On 05/22/14 13:49, Joel Brobecker wrote:
>>> 	A recent change to glibc removed asm/ptrace.h from user.h for
>>> AArch64. This meant that cross-native builds of gdb using trunk
>>> glibc broke because aarch64-linux-nat.c because user_hwdebug_state
>>> couldn't be found.
>>>
>>> Fixed by including asm/ptrace.h like other ports.
>>
>> Thanks for the explanation. Can you make sure you include that
>> in the revision history of your commit?
>>
>>> 2014-05-22  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
>>>
>>>         * aarch64-linux-nat.c (asm/ptrace.h): Include.
>>>
>>
>> OK to push.  Thank you.
>>
>>
> 
> Thanks - I've got a similar one in gdbserver which I somehow managed to 
> miss yesterday.
> 
> Ok to push ?
> 

I'd be inclined to consider this as obvious after yesterday's approval.

R.

> regards
> Ramana
> 
> 
> 
> p1.txt
> 
> 
> commit e9dae05e9c32efda9724330c6d5ade3ca848591d
> Author: Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>
> Date:   Fri May 23 09:01:14 2014 +0100
> 
>     Include asm/ptrace.h for linux-aarch64-low.c
>     
>     A recent change to glibc removed asm/ptrace.h from user.h for AArch64.
>     This meant that cross-native builds of gdbserver using trunk glibc broke
>     because linux-aarch64-low.c because user_hwdebug_state couldn't be found.
>     
>     This is like commit #036cd38182bde32d8297b630cd5c861d53b8949e
>     
>     2014-05-23  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
>     
>             * linux-aarch64-low.c (asm/ptrace.h): Include.
> 
> diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
> index 81bd30e..e591108 100644
> --- a/gdb/gdbserver/ChangeLog
> +++ b/gdb/gdbserver/ChangeLog
> @@ -1,3 +1,7 @@
> +2014-05-23  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
> +
> +	* linux-aarch64-low.c (asm/ptrace.h): Include.
> +
>  2014-05-21  Jan Kratochvil  <jan.kratochvil@redhat.com>
>  
>  	Fix TLS access for -static -pthread.
> diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c
> index 033e79e..6066e15 100644
> --- a/gdb/gdbserver/linux-aarch64-low.c
> +++ b/gdb/gdbserver/linux-aarch64-low.c
> @@ -26,6 +26,7 @@
>  #include <signal.h>
>  #include <sys/user.h>
>  #include <sys/ptrace.h>
> +#include <asm/ptrace.h>
>  #include <sys/uio.h>
>  
>  #include "gdb_proc_service.h"
>
Joel Brobecker May 23, 2014, 12:45 p.m. | #2
> >>> 2014-05-22  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
> >>>
> >>>         * aarch64-linux-nat.c (asm/ptrace.h): Include.
> >>>
> >>
> >> OK to push.  Thank you.
> >>
> >>
> > 
> > Thanks - I've got a similar one in gdbserver which I somehow managed to 
> > miss yesterday.
> > 
> > Ok to push ?

Yep!

> I'd be inclined to consider this as obvious after yesterday's approval.

I agree.

Patch

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 81bd30e..e591108 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@ 
+2014-05-23  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
+
+	* linux-aarch64-low.c (asm/ptrace.h): Include.
+
 2014-05-21  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	Fix TLS access for -static -pthread.
diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c
index 033e79e..6066e15 100644
--- a/gdb/gdbserver/linux-aarch64-low.c
+++ b/gdb/gdbserver/linux-aarch64-low.c
@@ -26,6 +26,7 @@ 
 #include <signal.h>
 #include <sys/user.h>
 #include <sys/ptrace.h>
+#include <asm/ptrace.h>
 #include <sys/uio.h>
 
 #include "gdb_proc_service.h"