From patchwork Mon Aug 13 00:38:04 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Merge C++ conversion into trunk (6/6 - gdb tree macro support)
From: Diego Novillo <dnovillo@google.com>
X-Patchwork-Id: 176844
Message-Id: <50284C6C.4080101@google.com>
To: Andreas Schwab <schwab@linux-m68k.org>
Cc: gcc-patches@gcc.gnu.org, Lawrence Crowl <crowl@google.com>,
 Richard Guenther <rguenther@suse.de>, Richard Henderson <rth@redhat.com>
Date: Sun, 12 Aug 2012 20:38:04 -0400

On 12-08-12 16:40 , Andreas Schwab wrote:
> Diego Novillo <dnovillo@google.com> writes:
>
>> diff --git a/gcc/gdbinit.in b/gcc/gdbinit.in
>> index d1ae46d..858e490 100644
>> --- a/gcc/gdbinit.in
>> +++ b/gcc/gdbinit.in
>> @@ -182,6 +182,17 @@ document pbm
>>   Dump the bitmap that is in $ as a comma-separated list of numbers.
>>   end
>>
>> +# Define some macros helpful to gdb when it is expanding macros.
>> +macro define __FILE__ "gdb"
>> +macro define __LINE__ 1
>> +
>> +# Skip all inline functions in tree.h.
>> +# These are used in accessor macros.
>> +skip "tree.h"
>
> This command has only been added to the current gdb release.  Older
> versions will bail out at this point, so it should be moved down to the
> end of the file.

Fixed.  Thanks.


Diego.


diff --git a/gcc/gdbinit.in b/gcc/gdbinit.in
index 858e490..6432113 100644
--- a/gcc/gdbinit.in
+++ b/gcc/gdbinit.in
@@ -186,10 +186,6 @@ end
  macro define __FILE__ "gdb"
  macro define __LINE__ 1

-# Skip all inline functions in tree.h.
-# These are used in accessor macros.
-skip "tree.h"
-
  # Gracefully handle aborts in functions used from gdb.
  set unwindonsignal on

@@ -207,3 +203,9 @@ set complaints 0
  # USE_SYSTEM_ABORT is defined, so gdb may complain and bail out.
  b exit
  b abort
+
+# Skip all inline functions in tree.h.
+# These are used in accessor macros.
+# Note that this is added at the end because older gdb versions
+# do not understand the 'skip' command.
+skip "tree.h"