[obvious?] Fix incorrect reference to source files

Message ID 1481064953-31780-1-git-send-email-lgustavo@codesourcery.com
State New, archived
Headers

Commit Message

Luis Machado Dec. 6, 2016, 10:55 p.m. UTC
  How about the following? I also fixed another occurrences of the same mistake
in another source file.

----

gdb/gdbserver/ChangeLog:

2016-12-06  Luis Machado  <lgustavo@codesourcery.com>

	* win32-i386-low.c: Fix incorrect reference to a couple source files.
	* nto-x86-low.c: Likewise.
---
 gdb/gdbserver/nto-x86-low.c    | 2 +-
 gdb/gdbserver/win32-i386-low.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
  

Comments

Simon Marchi Dec. 6, 2016, 11:02 p.m. UTC | #1
On 2016-12-06 17:55, Luis Machado wrote:
> How about the following? I also fixed another occurrences of the same 
> mistake
> in another source file.
> 
> ----
> 
> gdb/gdbserver/ChangeLog:
> 
> 2016-12-06  Luis Machado  <lgustavo@codesourcery.com>
> 
> 	* win32-i386-low.c: Fix incorrect reference to a couple source files.
> 	* nto-x86-low.c: Likewise.
> ---
>  gdb/gdbserver/nto-x86-low.c    | 2 +-
>  gdb/gdbserver/win32-i386-low.c | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/gdb/gdbserver/nto-x86-low.c b/gdb/gdbserver/nto-x86-low.c
> index da77c54..c7303ab 100644
> --- a/gdb/gdbserver/nto-x86-low.c
> +++ b/gdb/gdbserver/nto-x86-low.c
> @@ -25,7 +25,7 @@
>  #include <x86/context.h>
> 
> 
> -/* Definition auto generated from reg-i386.dep.  */
> +/* Defined in auto-generated build-time file gdb/gdbserver/i386.c.  */
>  extern void init_registers_i386 ();
>  extern struct reg *regs_i386;
>  extern const struct target_desc *tdesc_i386;
> diff --git a/gdb/gdbserver/win32-i386-low.c 
> b/gdb/gdbserver/win32-i386-low.c
> index 5daa863..dc20d68 100644
> --- a/gdb/gdbserver/win32-i386-low.c
> +++ b/gdb/gdbserver/win32-i386-low.c
> @@ -29,11 +29,11 @@
>  #define FLAG_TRACE_BIT 0x100
> 
>  #ifdef __x86_64__
> -/* Defined in auto-generated file reg-amd64.c.  */
> +/* Defined in auto-generated build-time file gdb/gdbserver/amd64.c.  
> */
>  void init_registers_amd64 (void);
>  extern const struct target_desc *tdesc_amd64;
>  #else
> -/* Defined in auto-generated file reg-i386.c.  */
> +/* Defined in auto-generated build-time file gdb/gdbserver/i386.c.  */
>  void init_registers_i386 (void);
>  extern const struct target_desc *tdesc_i386;
>  #endif

You used the wrong directory :).

gdb/gdbserver -> gdb/features/i386
  
Luis Machado Dec. 6, 2016, 11:06 p.m. UTC | #2
On 12/06/2016 05:02 PM, Simon Marchi wrote:
> On 2016-12-06 17:55, Luis Machado wrote:
>> How about the following? I also fixed another occurrences of the same
>> mistake
>> in another source file.
>>
>> ----
>>
>> gdb/gdbserver/ChangeLog:
>>
>> 2016-12-06  Luis Machado  <lgustavo@codesourcery.com>
>>
>>     * win32-i386-low.c: Fix incorrect reference to a couple source files.
>>     * nto-x86-low.c: Likewise.
>> ---
>>  gdb/gdbserver/nto-x86-low.c    | 2 +-
>>  gdb/gdbserver/win32-i386-low.c | 4 ++--
>>  2 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/gdb/gdbserver/nto-x86-low.c b/gdb/gdbserver/nto-x86-low.c
>> index da77c54..c7303ab 100644
>> --- a/gdb/gdbserver/nto-x86-low.c
>> +++ b/gdb/gdbserver/nto-x86-low.c
>> @@ -25,7 +25,7 @@
>>  #include <x86/context.h>
>>
>>
>> -/* Definition auto generated from reg-i386.dep.  */
>> +/* Defined in auto-generated build-time file gdb/gdbserver/i386.c.  */
>>  extern void init_registers_i386 ();
>>  extern struct reg *regs_i386;
>>  extern const struct target_desc *tdesc_i386;
>> diff --git a/gdb/gdbserver/win32-i386-low.c
>> b/gdb/gdbserver/win32-i386-low.c
>> index 5daa863..dc20d68 100644
>> --- a/gdb/gdbserver/win32-i386-low.c
>> +++ b/gdb/gdbserver/win32-i386-low.c
>> @@ -29,11 +29,11 @@
>>  #define FLAG_TRACE_BIT 0x100
>>
>>  #ifdef __x86_64__
>> -/* Defined in auto-generated file reg-amd64.c.  */
>> +/* Defined in auto-generated build-time file gdb/gdbserver/amd64.c.  */
>>  void init_registers_amd64 (void);
>>  extern const struct target_desc *tdesc_amd64;
>>  #else
>> -/* Defined in auto-generated file reg-i386.c.  */
>> +/* Defined in auto-generated build-time file gdb/gdbserver/i386.c.  */
>>  void init_registers_i386 (void);
>>  extern const struct target_desc *tdesc_i386;
>>  #endif
>
> You used the wrong directory :).
>
> gdb/gdbserver -> gdb/features/i386
>

The files don't live inside gdb/features/, they are auto-generated based 
on the .dat files from gdb/regformats/ and put inside 
<build>/gdb/gdbserver/, no?
  
Simon Marchi Dec. 6, 2016, 11:14 p.m. UTC | #3
On 2016-12-06 18:06, Luis Machado wrote:
> The files don't live inside gdb/features/, they are auto-generated
> based on the .dat files from gdb/regformats/ and put inside
> <build>/gdb/gdbserver/, no?

Oh ok I got confused with the other files named the same way, sorry.  
Then if they're all in the same directory, my initial comment may not 
apply, it might be obvious enough.
  
Luis Machado Dec. 7, 2016, 6:57 p.m. UTC | #4
On 12/06/2016 05:14 PM, Simon Marchi wrote:
> On 2016-12-06 18:06, Luis Machado wrote:
>> The files don't live inside gdb/features/, they are auto-generated
>> based on the .dat files from gdb/regformats/ and put inside
>> <build>/gdb/gdbserver/, no?
>
> Oh ok I got confused with the other files named the same way, sorry.
> Then if they're all in the same directory, my initial comment may not
> apply, it might be obvious enough.

I'm still happy with the last patch. I think it clarifies things a bit 
or at least points the user toward the right direction (build directory).

Does anyone have objections?
  
Pedro Alves Dec. 9, 2016, 5:02 p.m. UTC | #5
On 12/07/2016 06:57 PM, Luis Machado wrote:
> On 12/06/2016 05:14 PM, Simon Marchi wrote:
>> On 2016-12-06 18:06, Luis Machado wrote:
>>> The files don't live inside gdb/features/, they are auto-generated
>>> based on the .dat files from gdb/regformats/ and put inside
>>> <build>/gdb/gdbserver/, no?
>>
>> Oh ok I got confused with the other files named the same way, sorry.
>> Then if they're all in the same directory, my initial comment may not
>> apply, it might be obvious enough.
> 
> I'm still happy with the last patch. I think it clarifies things a bit
> or at least points the user toward the right direction (build directory).
> 
> Does anyone have objections?

Fine with me.

Thanks,
Pedro Alves
  
Luis Machado Dec. 23, 2016, 4:57 p.m. UTC | #6
On 12/09/2016 11:02 AM, Pedro Alves wrote:
> On 12/07/2016 06:57 PM, Luis Machado wrote:
>> On 12/06/2016 05:14 PM, Simon Marchi wrote:
>>> On 2016-12-06 18:06, Luis Machado wrote:
>>>> The files don't live inside gdb/features/, they are auto-generated
>>>> based on the .dat files from gdb/regformats/ and put inside
>>>> <build>/gdb/gdbserver/, no?
>>>
>>> Oh ok I got confused with the other files named the same way, sorry.
>>> Then if they're all in the same directory, my initial comment may not
>>> apply, it might be obvious enough.
>>
>> I'm still happy with the last patch. I think it clarifies things a bit
>> or at least points the user toward the right direction (build directory).
>>
>> Does anyone have objections?
>
> Fine with me.
>
> Thanks,
> Pedro Alves
>
>

Thanks. Pushed now.
  

Patch

diff --git a/gdb/gdbserver/nto-x86-low.c b/gdb/gdbserver/nto-x86-low.c
index da77c54..c7303ab 100644
--- a/gdb/gdbserver/nto-x86-low.c
+++ b/gdb/gdbserver/nto-x86-low.c
@@ -25,7 +25,7 @@ 
 #include <x86/context.h>
 
 
-/* Definition auto generated from reg-i386.dep.  */
+/* Defined in auto-generated build-time file gdb/gdbserver/i386.c.  */
 extern void init_registers_i386 ();
 extern struct reg *regs_i386;
 extern const struct target_desc *tdesc_i386;
diff --git a/gdb/gdbserver/win32-i386-low.c b/gdb/gdbserver/win32-i386-low.c
index 5daa863..dc20d68 100644
--- a/gdb/gdbserver/win32-i386-low.c
+++ b/gdb/gdbserver/win32-i386-low.c
@@ -29,11 +29,11 @@ 
 #define FLAG_TRACE_BIT 0x100
 
 #ifdef __x86_64__
-/* Defined in auto-generated file reg-amd64.c.  */
+/* Defined in auto-generated build-time file gdb/gdbserver/amd64.c.  */
 void init_registers_amd64 (void);
 extern const struct target_desc *tdesc_amd64;
 #else
-/* Defined in auto-generated file reg-i386.c.  */
+/* Defined in auto-generated build-time file gdb/gdbserver/i386.c.  */
 void init_registers_i386 (void);
 extern const struct target_desc *tdesc_i386;
 #endif