From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1474) id CAD5D385AC11; Thu, 25 Aug 2022 16:39:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CAD5D385AC11 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1661445550; bh=zLYWgZn1ND/beyPwlTt7pL2bqHSmSFixirRxwlSgtds=; h=From:To:Subject:Date:From; b=Ug0/1ZOCVHOhi87zQAnTo8KjUsh3DfI4S48yRJvyYbcJF+egnwIY1a0XQBQWU2/1S G8l+MxM17oxnvxZVxfd4QNq+zTYPOrn7E/oQuF9ClxfFRWGiX+mlj7lT3rB1qdyAsx 4fT7H+uC8i9VonwKGT5l+4uilzZ61KNhcw8QZi6k= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Jan-Benedict Glaw To: gdb-cvs@sourceware.org Subject: [binutils-gdb] sim/aarch64: Fix aarch64_get_CPSR_bits() declaration X-Act-Checkin: binutils-gdb X-Git-Author: Jan-Benedict Glaw X-Git-Refname: refs/heads/master X-Git-Oldrev: 2c43d202aefb2b6f202a44bbb8a0baf251aae845 X-Git-Newrev: 8b1a24e546fb68d3ea59e10939b32328947cdb99 Message-Id: <20220825163910.CAD5D385AC11@sourceware.org> Date: Thu, 25 Aug 2022 16:39:10 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D8b1a24e546fb= 68d3ea59e10939b32328947cdb99 commit 8b1a24e546fb68d3ea59e10939b32328947cdb99 Author: Jan-Benedict Glaw Date: Thu Aug 25 18:34:27 2022 +0200 sim/aarch64: Fix aarch64_get_CPSR_bits() declaration =20 Noticed while doing mass builds with a very recent GCC: =20 /usr/lib/gcc-snapshot/bin/gcc -DHAVE_CONFIG_H -DWITH_HW=3D1 -DHAVE_D= V_SOCKSER -DDEFAULT_INLINE=3D0 -Wall -Wdeclaration-after-statement -Wpointe= r-arith -Wno-unused -Wunused-value -Wunused-function -Wno-switch -Wno-char-= subscripts -Wempty-body -Wunused-but-set-parameter -Wno-error=3Dmaybe-unini= tialized -Wmissing-declarations -Wmissing-prototypes -Wdeclaration-after-st= atement -Wmissing-parameter-type -Wpointer-sign -Wold-style-declaration -We= rror -I. -I/var/lib/laminar/run/gdb-aarch64-elf/1/binutils-gdb/sim/aarch64= -I../common -I/var/lib/laminar/run/gdb-aarch64-elf/1/binutils-gdb/sim/aarc= h64/../common -I../../include -I/var/lib/laminar/run/gdb-aarch64-elf/1/binu= tils-gdb/sim/aarch64/../../include -I../../bfd -I/var/lib/laminar/run/gdb-a= arch64-elf/1/binutils-gdb/sim/aarch64/../../bfd -I../../opcodes -I/var/lib/= laminar/run/gdb-aarch64-elf/1/binutils-gdb/sim/aarch64/../../opcodes -I../.= . -I/var/lib/laminar/run/gdb-aarch64-elf/1/binutils-gdb/sim/aarch64/../../= gnulib/import -I../../gnulib/import -g -O2 -c -o cpustate.o -MT cpustate= .o -MMD -MP -MF .deps/cpustate.Tpo cpustate.c cpustate.c:270:1: error: conflicting types for 'aarch64_get_CPSR_bits' = due to enum/integer mismatch; have 'uint32_t(sim_cpu *, FlagMask)' {aka 'un= signed int(struct _sim_cpu *, FlagMask)'} [-Werror=3Denum-int-mismatch] 270 | aarch64_get_CPSR_bits (sim_cpu *cpu, FlagMask mask) | ^~~~~~~~~~~~~~~~~~~~~ In file included from sim-main.h:30, from cpustate.c:28: cpustate.h:310:20: note: previous declaration of 'aarch64_get_CPSR_bits= ' with type 'uint32_t(sim_cpu *, uint32_t)' {aka 'unsigned int(struct _sim_= cpu *, unsigned int)'} 310 | extern uint32_t aarch64_get_CPSR_bits (sim_cpu *, uint32_t); | ^~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors Diff: --- sim/aarch64/cpustate.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim/aarch64/cpustate.h b/sim/aarch64/cpustate.h index 1d25b3af15a..94e0bc80333 100644 --- a/sim/aarch64/cpustate.h +++ b/sim/aarch64/cpustate.h @@ -307,7 +307,7 @@ extern void aarch64_save_LR (sim_cpu *); /* Flag register accessors. */ extern uint32_t aarch64_get_CPSR (sim_cpu *); extern void aarch64_set_CPSR (sim_cpu *, uint32_t); -extern uint32_t aarch64_get_CPSR_bits (sim_cpu *, uint32_t); +extern uint32_t aarch64_get_CPSR_bits (sim_cpu *, FlagMask); extern void aarch64_set_CPSR_bits (sim_cpu *, uint32_t, uint32_t); extern uint32_t aarch64_test_CPSR_bit (sim_cpu *, FlagMask); extern void aarch64_set_CPSR_bit (sim_cpu *, FlagMask);