From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1366 invoked by alias); 25 Oct 2002 15:59:22 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 1257 invoked from network); 25 Oct 2002 15:59:21 -0000 Received: from unknown (HELO localhost.redhat.com) (216.138.202.10) by sources.redhat.com with SMTP; 25 Oct 2002 15:59:21 -0000 Received: from redhat.com (localhost [127.0.0.1]) by localhost.redhat.com (Postfix) with ESMTP id 067623D74; Fri, 25 Oct 2002 11:59:20 -0400 (EDT) Message-ID: <3DB96A57.6050209@redhat.com> Date: Fri, 25 Oct 2002 08:59:00 -0000 From: Andrew Cagney User-Agent: Mozilla/5.0 (X11; U; NetBSD macppc; en-US; rv:1.0.0) Gecko/20020824 X-Accept-Language: en-us, en MIME-Version: 1.0 To: Kevin Buettner , gdb-patches@sources.redhat.com Subject: [patch] Fix build probs; change address_class* to pure multi-arch Content-Type: multipart/mixed; boundary="------------080302050001060306030409" X-SW-Source: 2002-10/txt/msg00544.txt.bz2 This is a multi-part message in MIME format. --------------080302050001060306030409 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-length: 196 Hello, Per my suggestion to Kevin, this patch fixes the current build problems with the non multi-arch targets. http://sources.redhat.com/ml/gdb-patches/2002-10/msg00391.html Commited. Andrew --------------080302050001060306030409 Content-Type: text/plain; name="diffs" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="diffs" Content-length: 2987 2002-10-25 Andrew Cagney * gdbtypes.c (address_space_name_to_int): Update. (address_space_int_to_name): Update. * gdbarch.sh (address_class_type_flags_to_name): Change to a pure multi-arch predicate. (address_class_name_to_type_flags): Ditto. * gdbarch.h, gdbarch.c: Re-generate. Index: gdbarch.sh =================================================================== RCS file: /cvs/src/src/gdb/gdbarch.sh,v retrieving revision 1.165 diff -u -r1.165 gdbarch.sh --- gdbarch.sh 16 Oct 2002 20:50:21 -0000 1.165 +++ gdbarch.sh 25 Oct 2002 15:52:21 -0000 @@ -665,8 +665,8 @@ v::CANNOT_STEP_BREAKPOINT:int:cannot_step_breakpoint::::0:0::0 v::HAVE_NONSTEPPABLE_WATCHPOINT:int:have_nonsteppable_watchpoint::::0:0::0 F:2:ADDRESS_CLASS_TYPE_FLAGS:int:address_class_type_flags:int byte_size, int dwarf2_addr_class:byte_size, dwarf2_addr_class -F:2:ADDRESS_CLASS_TYPE_FLAGS_TO_NAME:char *:address_class_type_flags_to_name:int type_flags:type_flags -F:2:ADDRESS_CLASS_NAME_TO_TYPE_FLAGS:int:address_class_name_to_type_flags:char *name, int *type_flags_ptr:name, type_flags_ptr +M:2:ADDRESS_CLASS_TYPE_FLAGS_TO_NAME:char *:address_class_type_flags_to_name:int type_flags:type_flags: +M:2:ADDRESS_CLASS_NAME_TO_TYPE_FLAGS:int:address_class_name_to_type_flags:char *name, int *type_flags_ptr:name, type_flags_ptr EOF } Index: gdbtypes.c =================================================================== RCS file: /cvs/src/src/gdb/gdbtypes.c,v retrieving revision 1.60 diff -u -r1.60 gdbtypes.c --- gdbtypes.c 16 Oct 2002 20:50:22 -0000 1.60 +++ gdbtypes.c 25 Oct 2002 15:52:22 -0000 @@ -397,14 +397,17 @@ extern int address_space_name_to_int (char *space_identifier) { + struct gdbarch *gdbarch = current_gdbarch; int type_flags; /* Check for known address space delimiters. */ if (!strcmp (space_identifier, "code")) return TYPE_FLAG_CODE_SPACE; else if (!strcmp (space_identifier, "data")) return TYPE_FLAG_DATA_SPACE; - else if (ADDRESS_CLASS_NAME_TO_TYPE_FLAGS_P () - && ADDRESS_CLASS_NAME_TO_TYPE_FLAGS (space_identifier, &type_flags)) + else if (gdbarch_address_class_name_to_type_flags_p (gdbarch) + && gdbarch_address_class_name_to_type_flags (gdbarch, + space_identifier, + &type_flags)) return type_flags; else error ("Unknown address space specifier: \"%s\"", space_identifier); @@ -416,13 +419,14 @@ extern char * address_space_int_to_name (int space_flag) { + struct gdbarch *gdbarch = current_gdbarch; if (space_flag & TYPE_FLAG_CODE_SPACE) return "code"; else if (space_flag & TYPE_FLAG_DATA_SPACE) return "data"; else if ((space_flag & TYPE_FLAG_ADDRESS_CLASS_ALL) - && ADDRESS_CLASS_TYPE_FLAGS_TO_NAME_P ()) - return ADDRESS_CLASS_TYPE_FLAGS_TO_NAME (space_flag); + && gdbarch_address_class_type_flags_to_name_p (gdbarch)) + return gdbarch_address_class_type_flags_to_name (gdbarch, space_flag); else return NULL; } --------------080302050001060306030409--