From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23254 invoked by alias); 15 Sep 2013 21:33:26 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 23245 invoked by uid 89); 15 Sep 2013 21:33:26 -0000 Received: from mailhost.u-strasbg.fr (HELO mailhost.u-strasbg.fr) (130.79.222.212) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 15 Sep 2013 21:33:26 +0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.6 required=5.0 tests=AWL,BAYES_00,KHOP_THREADED,MSGID_MULTIPLE_AT autolearn=no version=3.3.2 X-HELO: mailhost.u-strasbg.fr Received: from mailhost.u-strasbg.fr (localhost [127.0.0.1]) by antispam (Postfix) with ESMTP id 311BC14077C; Sun, 15 Sep 2013 23:33:22 +0200 (CEST) Received: from mailhost.u-strasbg.fr (localhost [127.0.0.1]) by antivirus (Postfix) with ESMTP id 1972E14086E; Sun, 15 Sep 2013 23:33:22 +0200 (CEST) Received: from md15.u-strasbg.fr (md15.u-strasbg.fr [130.79.200.204]) by mr2.u-strasbg.fr (Postfix) with ESMTP id B5A4F14077C; Sun, 15 Sep 2013 23:33:17 +0200 (CEST) Received: from ms11.u-strasbg.fr (ms11.u-strasbg.fr [130.79.204.111]) by md15.u-strasbg.fr (8.14.3/jtpda-5.5pre1) with ESMTP id r8FLXFbw020520 ; Sun, 15 Sep 2013 23:33:16 +0200 (envelope-from pierre.muller@ics-cnrs.unistra.fr) Received: from E6510Muller (lec67-4-82-230-53-140.fbx.proxad.net [82.230.53.140]) (Authenticated sender: mullerp) by ms11.u-strasbg.fr (Postfix) with ESMTPSA id 480011FD90; Sun, 15 Sep 2013 23:33:12 +0200 (CEST) From: "Pierre Muller" To: "'Jan Kratochvil'" , "'Ulrich Weigand'" Cc: "'Andreas Arnez'" , References: <87sixbfkb6.fsf@br87z6lw.de.ibm.com> <201309131242.r8DCg0r9020703@d06av02.portsmouth.uk.ibm.com> <20130915155211.GA20499@host2.jankratochvil.net> In-Reply-To: <20130915155211.GA20499@host2.jankratochvil.net> Subject: RFA: Fix build regression on 32-bit hosts [Re: [RFA][PATCH v5 2/2] S/390: Add TDB regset] Date: Sun, 15 Sep 2013 21:33:00 -0000 Message-ID: <002701ceb25b$2e880fc0$8b982f40$@muller@ics-cnrs.unistra.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-SW-Source: 2013-09/txt/msg00427.txt.bz2 The patch below fixes the two build failure reports due to last s390-tdep.c commit. This is done by replacing system elf.h header inclusion by use of GDB include/elf/common.h. This fixes my bug report. For Jan's problem of third parameter type, I simply change hwcap local variable type to CORE_ADDR as expected for target_auxv_search function. As and extra bonus, when looking for AT_HWCAP, I noticed that arm-linux-tdep.c had it's own definition instead of using the one from elf/common.h. (This could be split from that patch and submitted separately if requested...) Pierre Muller It also 2013-09-15 Pierre Muller * arm-linux-tdep.c: Add "elf/common.h" header. Remove AT_HWCAP macro definintion as it is provided in added include file. * s390-tdep.c: Remove system header Add "elf/common.h" header for AT_HWCAP definition. (s390_core_read_description): Use correct CORE_ADDR for hwcap local variable used as third parameter of function target_auxv_search. Index: src/gdb/arm-linux-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/arm-linux-tdep.c,v retrieving revision 1.96 diff -u -p -r1.96 arm-linux-tdep.c --- src/gdb/arm-linux-tdep.c 22 Aug 2013 20:32:54 -0000 1.96 +++ src/gdb/arm-linux-tdep.c 15 Sep 2013 21:23:40 -0000 @@ -49,12 +49,9 @@ #include "parser-defs.h" #include "user-regs.h" #include - +#include "elf/common.h" #include "gdb_string.h" -/* This is defined in on ARM GNU/Linux systems. */ -#define AT_HWCAP 16 - extern int arm_apcs_32; /* Under ARM GNU/Linux the traditional way of performing a breakpoint Index: src/gdb/s390-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/s390-tdep.c,v retrieving revision 1.215 diff -u -p -r1.215 s390-tdep.c --- src/gdb/s390-tdep.c 13 Sep 2013 14:17:29 -0000 1.215 +++ src/gdb/s390-tdep.c 15 Sep 2013 21:23:43 -0000 @@ -52,7 +52,7 @@ #include "user-regs.h" #include "cli/cli-utils.h" #include -#include +#include "elf/common.h" #include "features/s390-linux32.c" #include "features/s390-linux32v1.c" @@ -807,7 +807,7 @@ s390_core_read_description (struct gdbar asection *v1 = bfd_get_section_by_name (abfd, ".reg-s390-last-break"); asection *v2 = bfd_get_section_by_name (abfd, ".reg-s390-system-call"); asection *section = bfd_get_section_by_name (abfd, ".reg"); - unsigned long hwcap = 0; + CORE_ADDR hwcap = 0; target_auxv_search (target, AT_HWCAP, &hwcap); if (!section)