[PATCH/committed,2/2] sim: mn10300: enable -Werror

Message ID 20210615034733.28752-2-vapier@gentoo.org
State New
Headers show
Series
  • [PATCH/committed,1/2] sim: mn10300: switch abort to sim_engine_abort
Related show

Commit Message

Eli Zaretskii via Gdb-patches June 15, 2021, 3:47 a.m.
Now that all warnings are fixed in this port, enable -Werror by default.
---
 sim/mn10300/ChangeLog    |   5 +
 sim/mn10300/configure    | 213 ++++++++++++++++++++-------------------
 sim/mn10300/configure.ac |   1 -
 3 files changed, 113 insertions(+), 106 deletions(-)

-- 
2.31.1

Comments

Eli Zaretskii via Gdb-patches June 16, 2021, 3:35 p.m. | #1
On 2021-06-14 11:47 p.m., Mike Frysinger via Gdb-patches wrote:
> Now that all warnings are fixed in this port, enable -Werror by default.


Hi Mike,

I get:

$ gcc --version
gcc (GCC) 11.1.0
$ ccache gcc  -DHAVE_CONFIG_H  -DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=31 -DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_LITTLE  -DWITH_HW=1 -DHAVE_DV_SOCKSER -DDEFAULT_INLINE=0 -DWITH_RESERVED_BITS=1  -Wall -Wdeclaration-after-statement -Wpointer-arith -Wpointer-sign -Wno-unused -Wunused-value -Wunused-function -Wno-switch -Wno-char-subscripts -Wmissing-prototypes -Wdeclaration-after-statement -Wempty-body -Wmissing-parameter-type -Wold-style-declaration -Werror  -I. -I/home/simark/src/binutils-gdb/sim/mn10300 -I../common -I/home/simark/src/binutils-gdb/sim/mn10300/../common -I../../include -I/home/simark/src/binutils-gdb/sim/mn10300/../../include -I../../bfd -I/home/simark/src/binutils-gdb/sim/mn10300/../../bfd -I../../opcodes -I/home/simark/src/binutils-gdb/sim/mn10300/../../opcodes -I../..  -I/home/simark/src/binutils-gdb/sim/mn10300/../../gnulib/import -I../../gnulib/import -DPOLL_QUIT_INTERVAL=0x20 -g3 -O0 -fsanitize=address -fmax-errors=1 -fdiagnostics-color=always   -c -o idecode.o -MT idecode.o -MMD -MP -MF .deps/idecode.Tpo idecode.c
In file included from /home/simark/src/binutils-gdb/sim/mn10300/sim-main.h:47,
                 from /home/simark/src/binutils-gdb/sim/mn10300/../common/sim-inline.c:33,
                 from idecode.c:26:
/home/simark/src/binutils-gdb/sim/mn10300/mn10300_sim.h:189:1: error: ‘dw2u64’ defined but not used [-Werror=unused-function]
  189 | dw2u64 (dword data)
      | ^~~~~~

Simon
Eli Zaretskii via Gdb-patches June 16, 2021, 3:47 p.m. | #2
On 2021-06-16 11:35 a.m., Simon Marchi via Gdb-patches wrote:
> On 2021-06-14 11:47 p.m., Mike Frysinger via Gdb-patches wrote:

>> Now that all warnings are fixed in this port, enable -Werror by default.

> 

> Hi Mike,

> 

> I get:

> 

> $ gcc --version

> gcc (GCC) 11.1.0

> $ ccache gcc  -DHAVE_CONFIG_H  -DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=31 -DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_LITTLE  -DWITH_HW=1 -DHAVE_DV_SOCKSER -DDEFAULT_INLINE=0 -DWITH_RESERVED_BITS=1  -Wall -Wdeclaration-after-statement -Wpointer-arith -Wpointer-sign -Wno-unused -Wunused-value -Wunused-function -Wno-switch -Wno-char-subscripts -Wmissing-prototypes -Wdeclaration-after-statement -Wempty-body -Wmissing-parameter-type -Wold-style-declaration -Werror  -I. -I/home/simark/src/binutils-gdb/sim/mn10300 -I../common -I/home/simark/src/binutils-gdb/sim/mn10300/../common -I../../include -I/home/simark/src/binutils-gdb/sim/mn10300/../../include -I../../bfd -I/home/simark/src/binutils-gdb/sim/mn10300/../../bfd -I../../opcodes -I/home/simark/src/binutils-gdb/sim/mn10300/../../opcodes -I../..  -I/home/simark/src/binutils-gdb/sim/mn10300/../../gnulib/import -I../../gnulib/import -DPOLL_QUIT_INTERVAL=0x20 -g3 -O0 -fsanitize=address -fmax-errors=1 -fdiagnostics-color=always   -c -o idecode.o -MT idecode.o -MMD -MP -MF .deps/idecode.Tpo idecode.c

> In file included from /home/simark/src/binutils-gdb/sim/mn10300/sim-main.h:47,

>                  from /home/simark/src/binutils-gdb/sim/mn10300/../common/sim-inline.c:33,

>                  from idecode.c:26:

> /home/simark/src/binutils-gdb/sim/mn10300/mn10300_sim.h:189:1: error: ‘dw2u64’ defined but not used [-Werror=unused-function]

>   189 | dw2u64 (dword data)

>       | ^~~~~~

> 

> Simon

> 


This fixes it for me, I guess that INLINE is undefined at this point.
I don't see any reason not to use "inline".


diff --git a/sim/mn10300/mn10300_sim.h b/sim/mn10300/mn10300_sim.h
index c63efaa6c769..b2ed70ecfe1d 100644
--- a/sim/mn10300/mn10300_sim.h
+++ b/sim/mn10300/mn10300_sim.h
@@ -158,7 +158,7 @@ sim_core_read_unaligned_4 (STATE_CPU (simulator, 0), PC, read_map, (ADDR))
 u642dw (sim_core_read_unaligned_8 (STATE_CPU (simulator, 0), \
                                   PC, read_map, (ADDR)))
 
-static INLINE dword
+static inline dword
 u642dw (unsigned64 dw)
 {
   dword r;
@@ -185,7 +185,7 @@ sim_core_write_unaligned_4 (STATE_CPU (simulator, 0), \
 sim_core_write_unaligned_8 (STATE_CPU (simulator, 0), \
                            PC, write_map, (ADDR), dw2u64 (DATA))
 
-static INLINE unsigned64
+static inline unsigned64
 dw2u64 (dword data)
 {
   return data.low | (((unsigned64)data.high) << 32);


Simon
Eli Zaretskii via Gdb-patches June 16, 2021, 5:52 p.m. | #3
On 16 Jun 2021 11:47, Simon Marchi wrote:
> On 2021-06-16 11:35 a.m., Simon Marchi via Gdb-patches wrote:

> > On 2021-06-14 11:47 p.m., Mike Frysinger via Gdb-patches wrote:

> >> Now that all warnings are fixed in this port, enable -Werror by default.

> > 

> > I get:

> > 

> > $ gcc --version

> > gcc (GCC) 11.1.0

> > $ ccache gcc  -DHAVE_CONFIG_H  -DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=31 -DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_LITTLE  -DWITH_HW=1 -DHAVE_DV_SOCKSER -DDEFAULT_INLINE=0 -DWITH_RESERVED_BITS=1  -Wall -Wdeclaration-after-statement -Wpointer-arith -Wpointer-sign -Wno-unused -Wunused-value -Wunused-function -Wno-switch -Wno-char-subscripts -Wmissing-prototypes -Wdeclaration-after-statement -Wempty-body -Wmissing-parameter-type -Wold-style-declaration -Werror  -I. -I/home/simark/src/binutils-gdb/sim/mn10300 -I../common -I/home/simark/src/binutils-gdb/sim/mn10300/../common -I../../include -I/home/simark/src/binutils-gdb/sim/mn10300/../../include -I../../bfd -I/home/simark/src/binutils-gdb/sim/mn10300/../../bfd -I../../opcodes -I/home/simark/src/binutils-gdb/sim/mn10300/../../opcodes -I../..  -I/home/simark/src/binutils-gdb/sim/mn10300/../../gnulib/import -I../../gnulib/import -DPOLL_QUIT_INTERVAL=0x20 -g3 -O0 -fsanitize=address -fmax-errors=1 -fdiagnostics-color=always   -c -o idecode.o -MT idecode.o -MMD -MP -MF .deps/idecode.Tpo idecode.c

> > In file included from /home/simark/src/binutils-gdb/sim/mn10300/sim-main.h:47,

> >                  from /home/simark/src/binutils-gdb/sim/mn10300/../common/sim-inline.c:33,

> >                  from idecode.c:26:

> > /home/simark/src/binutils-gdb/sim/mn10300/mn10300_sim.h:189:1: error: ‘dw2u64’ defined but not used [-Werror=unused-function]

> >   189 | dw2u64 (dword data)

> >       | ^~~~~~

> 

> This fixes it for me, I guess that INLINE is undefined at this point.

> I don't see any reason not to use "inline".


looks like the failure only comes up with -O0:

#if defined (__GNUC__) && defined (__OPTIMIZE__)
#define INLINE __inline__
#else           
#define INLINE /*inline*/
#endif

we could use INLINE2 here instead as it doesn't check OPTIMIZE.
-mike
Eli Zaretskii via Gdb-patches June 16, 2021, 6:01 p.m. | #4
On 2021-06-16 1:52 p.m., Mike Frysinger wrote:
> On 16 Jun 2021 11:47, Simon Marchi wrote:

>> On 2021-06-16 11:35 a.m., Simon Marchi via Gdb-patches wrote:

>>> On 2021-06-14 11:47 p.m., Mike Frysinger via Gdb-patches wrote:

>>>> Now that all warnings are fixed in this port, enable -Werror by default.

>>>

>>> I get:

>>>

>>> $ gcc --version

>>> gcc (GCC) 11.1.0

>>> $ ccache gcc  -DHAVE_CONFIG_H  -DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=31 -DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_LITTLE  -DWITH_HW=1 -DHAVE_DV_SOCKSER -DDEFAULT_INLINE=0 -DWITH_RESERVED_BITS=1  -Wall -Wdeclaration-after-statement -Wpointer-arith -Wpointer-sign -Wno-unused -Wunused-value -Wunused-function -Wno-switch -Wno-char-subscripts -Wmissing-prototypes -Wdeclaration-after-statement -Wempty-body -Wmissing-parameter-type -Wold-style-declaration -Werror  -I. -I/home/simark/src/binutils-gdb/sim/mn10300 -I../common -I/home/simark/src/binutils-gdb/sim/mn10300/../common -I../../include -I/home/simark/src/binutils-gdb/sim/mn10300/../../include -I../../bfd -I/home/simark/src/binutils-gdb/sim/mn10300/../../bfd -I../../opcodes -I/home/simark/src/binutils-gdb/sim/mn10300/../../opcodes -I../..  -I/home/simark/src/binutils-gdb/sim/mn10300/../../gnulib/import -I../../gnulib/import -DPOLL_QUIT_INTERVAL=0x20 -g3 -O0 -fsanitize=address -fmax-errors=1 -fdiagnostics-color=always   -c -o idecode.o -MT idecode.o -MMD -MP -MF .deps/idecode.Tpo idecode.c

>>> In file included from /home/simark/src/binutils-gdb/sim/mn10300/sim-main.h:47,

>>>                  from /home/simark/src/binutils-gdb/sim/mn10300/../common/sim-inline.c:33,

>>>                  from idecode.c:26:

>>> /home/simark/src/binutils-gdb/sim/mn10300/mn10300_sim.h:189:1: error: ‘dw2u64’ defined but not used [-Werror=unused-function]

>>>   189 | dw2u64 (dword data)

>>>       | ^~~~~~

>>

>> This fixes it for me, I guess that INLINE is undefined at this point.

>> I don't see any reason not to use "inline".

> 

> looks like the failure only comes up with -O0:

> 

> #if defined (__GNUC__) && defined (__OPTIMIZE__)

> #define INLINE __inline__

> #else           

> #define INLINE /*inline*/

> #endif

> 

> we could use INLINE2 here instead as it doesn't check OPTIMIZE.

> -mike

> 


OK, I'll let you fix it.

Simon

Patch

diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index ff7d6c18f117..0083c1a433cb 100644
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,8 @@ 
+2021-06-14  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac: Delete all to SIM_AC_OPTION_WARNINGS.
+	* configure: Regenerate.
+
 2021-06-14  Mike Frysinger  <vapier@gentoo.org>
 
 	* mn10300.igen: Change abort to sim_engine_abort.
diff --git a/sim/mn10300/configure.ac b/sim/mn10300/configure.ac
index b09159d7d47f..6754136f6d96 100644
--- a/sim/mn10300/configure.ac
+++ b/sim/mn10300/configure.ac
@@ -5,7 +5,6 @@  AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 SIM_AC_COMMON
 
 SIM_AC_OPTION_ENDIAN(LITTLE)
-SIM_AC_OPTION_WARNINGS(no)
 SIM_AC_OPTION_RESERVED_BITS
 SIM_AC_OPTION_BITSIZE(32,31)
 SIM_AC_OPTION_HARDWARE(mn103cpu mn103int mn103tim mn103ser mn103iop)