modula-2, libm2min: Declare abort and exit as expected.

Message ID 20230107154545.93295-1-iain@sandoe.co.uk
State Committed
Commit 2d2edf108026b7e2591900f995bc558ce8d45c6d
Headers
Series modula-2, libm2min: Declare abort and exit as expected. |

Commit Message

Iain Sandoe Jan. 7, 2023, 3:45 p.m. UTC
  Tested with a build on x86_64-darwin21, the build warnings are gone and
the build completed as normal.
OK for master?
thanks
Iain

--- 8< ---

The build is currently emitting a warning that abort() is declared differently
from the built-in.  This updates the declaration to match expectations.

Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>

gcc/m2/ChangeLog:

	* gm2-libs-min/libc.c (abort): Update declaration to match the
	expected form, add no-return attribute.
	(exit): Add no-return attribute.
---
 gcc/m2/gm2-libs-min/libc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
  

Comments

Gaius Mulley Jan. 7, 2023, 5:34 p.m. UTC | #1
Iain Sandoe <iains.gcc@gmail.com> writes:

> Tested with a build on x86_64-darwin21, the build warnings are gone and
> the build completed as normal.
> OK for master?
> thanks
> Iain
>
> --- 8< ---
>
> The build is currently emitting a warning that abort() is declared differently
> from the built-in.  This updates the declaration to match expectations.
>
> Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>
>
> gcc/m2/ChangeLog:
>
> 	* gm2-libs-min/libc.c (abort): Update declaration to match the
> 	expected form, add no-return attribute.
> 	(exit): Add no-return attribute.
> ---
>  gcc/m2/gm2-libs-min/libc.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/gcc/m2/gm2-libs-min/libc.c b/gcc/m2/gm2-libs-min/libc.c
> index b39bfffb65c..8cddb5dd7b4 100644
> --- a/gcc/m2/gm2-libs-min/libc.c
> +++ b/gcc/m2/gm2-libs-min/libc.c
> @@ -24,10 +24,10 @@ a copy of the GCC Runtime Library Exception along with this program;
>  see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
>  <http://www.gnu.org/licenses/>.  */
>  
> -void abort (int);
> -void exit (int);
> +extern void abort (void)  __attribute__ ((__noreturn__));
> +extern void exit (int) __attribute__ ((__noreturn__));
>  
> -void abort (int i)
> +void abort (void)
>  {
>    while (1)
>      ;

yes LGTM, thanks!

regards,
Gaius
  

Patch

diff --git a/gcc/m2/gm2-libs-min/libc.c b/gcc/m2/gm2-libs-min/libc.c
index b39bfffb65c..8cddb5dd7b4 100644
--- a/gcc/m2/gm2-libs-min/libc.c
+++ b/gcc/m2/gm2-libs-min/libc.c
@@ -24,10 +24,10 @@  a copy of the GCC Runtime Library Exception along with this program;
 see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 <http://www.gnu.org/licenses/>.  */
 
-void abort (int);
-void exit (int);
+extern void abort (void)  __attribute__ ((__noreturn__));
+extern void exit (int) __attribute__ ((__noreturn__));
 
-void abort (int i)
+void abort (void)
 {
   while (1)
     ;