[PATCH] m68k: Fix build with -mcpu=68040 or higher (BZ 30740)

[PATCH] m68k: Fix build with -mcpu=68040 or higher (BZ 30740)

[Adhemerval Zanella]

GCC currently does not define __mc68020__ for -mcpu=68040 or higher,
which memcpy/memmove assumptions.  Since this memory copy optimization
seems only intended for m68020, disable for other m680X0 variants.

Checked on a build for m68k-linux-gnu target mc68020 and mc68040.
---
 sysdeps/m68k/m680x0/m68020/wordcopy.S |  1 -
 sysdeps/m68k/wordcopy.c               | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 delete mode 100644 sysdeps/m68k/m680x0/m68020/wordcopy.S
 create mode 100644 sysdeps/m68k/wordcopy.c

diff --git a/sysdeps/m68k/m680x0/m68020/wordcopy.S b/sysdeps/m68k/m680x0/m68020/wordcopy.S
deleted file mode 100644
index 4fb1a4518f..0000000000
--- a/sysdeps/m68k/m680x0/m68020/wordcopy.S
+++ /dev/null
@@ -1 +0,0 @@
-/* Empty, not needed.  */
diff --git a/sysdeps/m68k/wordcopy.c b/sysdeps/m68k/wordcopy.c
new file mode 100644
index 0000000000..f12d5b7803
--- /dev/null
+++ b/sysdeps/m68k/wordcopy.c
@@ -0,0 +1,21 @@
+/* Definitions for memory copy functions.  Motorola 680X0 version
+   Copyright (C) 2023 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library.  If not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#ifndef __mc68020__
+# include <string/wordcopy.c>
+#endif
-- 
2.34.1

Re: [PATCH] m68k: Fix build with -mcpu=68040 or higher (BZ 30740)

[Adhemerval Zanella Netto]

This is a straightforward build fix, I will install it if no one opposes it.

On 18/08/23 15:35, Adhemerval Zanella wrote:
> GCC currently does not define __mc68020__ for -mcpu=68040 or higher,
> which memcpy/memmove assumptions.  Since this memory copy optimization
> seems only intended for m68020, disable for other m680X0 variants.
> 
> Checked on a build for m68k-linux-gnu target mc68020 and mc68040.
> ---
>  sysdeps/m68k/m680x0/m68020/wordcopy.S |  1 -
>  sysdeps/m68k/wordcopy.c               | 21 +++++++++++++++++++++
>  2 files changed, 21 insertions(+), 1 deletion(-)
>  delete mode 100644 sysdeps/m68k/m680x0/m68020/wordcopy.S
>  create mode 100644 sysdeps/m68k/wordcopy.c
> 
> diff --git a/sysdeps/m68k/m680x0/m68020/wordcopy.S b/sysdeps/m68k/m680x0/m68020/wordcopy.S
> deleted file mode 100644
> index 4fb1a4518f..0000000000
> --- a/sysdeps/m68k/m680x0/m68020/wordcopy.S
> +++ /dev/null
> @@ -1 +0,0 @@
> -/* Empty, not needed.  */
> diff --git a/sysdeps/m68k/wordcopy.c b/sysdeps/m68k/wordcopy.c
> new file mode 100644
> index 0000000000..f12d5b7803
> --- /dev/null
> +++ b/sysdeps/m68k/wordcopy.c
> @@ -0,0 +1,21 @@
> +/* Definitions for memory copy functions.  Motorola 680X0 version
> +   Copyright (C) 2023 Free Software Foundation, Inc.
> +   This file is part of the GNU C Library.
> +
> +   The GNU C Library is free software; you can redistribute it and/or
> +   modify it under the terms of the GNU Lesser General Public
> +   License as published by the Free Software Foundation; either
> +   version 2.1 of the License, or (at your option) any later version.
> +
> +   The GNU C Library is distributed in the hope that it will be useful,
> +   but WITHOUT ANY WARRANTY; without even the implied warranty of
> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> +   Lesser General Public License for more details.
> +
> +   You should have received a copy of the GNU Lesser General Public
> +   License along with the GNU C Library.  If not, see
> +   <https://www.gnu.org/licenses/>.  */
> +
> +#ifndef __mc68020__
> +# include <string/wordcopy.c>
> +#endif