[7/7] string: Remove string_private.h

Message ID 20230213135558.3328727-8-adhemerval.zanella@linaro.org
State Committed
Commit a9b3b770f596c9f9fd059f5a90a4e1db3c4f3835
Headers
Series Remove _STRING_ARCH_unaligned |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent
dj/TryBot-32bit success Build for i686

Commit Message

Adhemerval Zanella Netto Feb. 13, 2023, 1:55 p.m. UTC
  Now that _STRING_ARCH_unaligned is not used anymore.
---
 include/string.h                            |  3 ---
 sysdeps/aarch64/string_private.h            | 20 --------------------
 sysdeps/generic/string_private.h            | 21 ---------------------
 sysdeps/m68k/m680x0/m68020/string_private.h | 21 ---------------------
 sysdeps/s390/string_private.h               | 20 --------------------
 sysdeps/x86/string_private.h                | 20 --------------------
 6 files changed, 105 deletions(-)
 delete mode 100644 sysdeps/aarch64/string_private.h
 delete mode 100644 sysdeps/generic/string_private.h
 delete mode 100644 sysdeps/m68k/m680x0/m68020/string_private.h
 delete mode 100644 sysdeps/s390/string_private.h
 delete mode 100644 sysdeps/x86/string_private.h
  

Comments

Wilco Dijkstra Feb. 15, 2023, 7:04 p.m. UTC | #1
Hi Adhemerval,

LGTM.

Reviewed-by: Wilco Dijkstra  <Wilco.Dijkstra@arm.com>


diff --git a/include/string.h b/include/string.h
index a9120ff37c..673cfd7272 100644
--- a/include/string.h
+++ b/include/string.h
@@ -55,9 +55,6 @@ extern char *__strerror_l (int __errnum, locale_t __loc);
 
 extern const char *__sigdescr_np (int __errnum);
 libc_hidden_proto (__sigdescr_np)
-
-/* Get _STRING_ARCH_unaligned.  */
-#include <string_private.h>
 #endif
 
 #include <string/string.h>
diff --git a/sysdeps/aarch64/string_private.h b/sysdeps/aarch64/string_private.h
deleted file mode 100644
index 8fdfcdf44b..0000000000
--- a/sysdeps/aarch64/string_private.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Define _STRING_ARCH_unaligned.  AArch64 version.
-   Copyright (C) 2016-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/>.  */
-
-/* AArch64 implementations support efficient unaligned access.  */
-#define _STRING_ARCH_unaligned 1

OK

diff --git a/sysdeps/generic/string_private.h b/sysdeps/generic/string_private.h
deleted file mode 100644
index a1a62b3a46..0000000000
--- a/sysdeps/generic/string_private.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Define _STRING_ARCH_unaligned.  Generic version.
-   Copyright (C) 2016-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/>.  */
-
-/* Define to 1 if architecture can access unaligned multi-byte
-   variables.  */
-#define _STRING_ARCH_unaligned   0
diff --git a/sysdeps/m68k/m680x0/m68020/string_private.h b/sysdeps/m68k/m680x0/m68020/string_private.h
deleted file mode 100644
index 04c4800244..0000000000
--- a/sysdeps/m68k/m680x0/m68020/string_private.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Define _STRING_ARCH_unaligned.  m680x0 version, x >= 2.
-   Copyright (C) 2016-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/>.  */
-
-/* Tell the generic inline macros that unaligned memory access is
-   possible.  */
-#define _STRING_ARCH_unaligned   1
diff --git a/sysdeps/s390/string_private.h b/sysdeps/s390/string_private.h
deleted file mode 100644
index 3591f83878..0000000000
--- a/sysdeps/s390/string_private.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Define _STRING_ARCH_unaligned.  S/390 version.
-   Copyright (C) 2016-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/>.  */
-
-/* The s390 processors can access unaligned multi-byte variables.  */
-#define _STRING_ARCH_unaligned   1
diff --git a/sysdeps/x86/string_private.h b/sysdeps/x86/string_private.h
deleted file mode 100644
index c6a9d9bef9..0000000000
--- a/sysdeps/x86/string_private.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Define _STRING_ARCH_unaligned.  i486/x86-64 version.
-   Copyright (C) 2016-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/>.  */
-
-/* The ix86 processors can access unaligned multi-byte variables.  */
-#define _STRING_ARCH_unaligned   1

OK
  

Patch

diff --git a/include/string.h b/include/string.h
index a9120ff37c..673cfd7272 100644
--- a/include/string.h
+++ b/include/string.h
@@ -55,9 +55,6 @@  extern char *__strerror_l (int __errnum, locale_t __loc);
 
 extern const char *__sigdescr_np (int __errnum);
 libc_hidden_proto (__sigdescr_np)
-
-/* Get _STRING_ARCH_unaligned.  */
-#include <string_private.h>
 #endif
 
 #include <string/string.h>
diff --git a/sysdeps/aarch64/string_private.h b/sysdeps/aarch64/string_private.h
deleted file mode 100644
index 8fdfcdf44b..0000000000
--- a/sysdeps/aarch64/string_private.h
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* Define _STRING_ARCH_unaligned.  AArch64 version.
-   Copyright (C) 2016-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/>.  */
-
-/* AArch64 implementations support efficient unaligned access.  */
-#define _STRING_ARCH_unaligned 1
diff --git a/sysdeps/generic/string_private.h b/sysdeps/generic/string_private.h
deleted file mode 100644
index a1a62b3a46..0000000000
--- a/sysdeps/generic/string_private.h
+++ /dev/null
@@ -1,21 +0,0 @@ 
-/* Define _STRING_ARCH_unaligned.  Generic version.
-   Copyright (C) 2016-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/>.  */
-
-/* Define to 1 if architecture can access unaligned multi-byte
-   variables.  */
-#define _STRING_ARCH_unaligned   0
diff --git a/sysdeps/m68k/m680x0/m68020/string_private.h b/sysdeps/m68k/m680x0/m68020/string_private.h
deleted file mode 100644
index 04c4800244..0000000000
--- a/sysdeps/m68k/m680x0/m68020/string_private.h
+++ /dev/null
@@ -1,21 +0,0 @@ 
-/* Define _STRING_ARCH_unaligned.  m680x0 version, x >= 2.
-   Copyright (C) 2016-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/>.  */
-
-/* Tell the generic inline macros that unaligned memory access is
-   possible.  */
-#define _STRING_ARCH_unaligned   1
diff --git a/sysdeps/s390/string_private.h b/sysdeps/s390/string_private.h
deleted file mode 100644
index 3591f83878..0000000000
--- a/sysdeps/s390/string_private.h
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* Define _STRING_ARCH_unaligned.  S/390 version.
-   Copyright (C) 2016-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/>.  */
-
-/* The s390 processors can access unaligned multi-byte variables.  */
-#define _STRING_ARCH_unaligned   1
diff --git a/sysdeps/x86/string_private.h b/sysdeps/x86/string_private.h
deleted file mode 100644
index c6a9d9bef9..0000000000
--- a/sysdeps/x86/string_private.h
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* Define _STRING_ARCH_unaligned.  i486/x86-64 version.
-   Copyright (C) 2016-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/>.  */
-
-/* The ix86 processors can access unaligned multi-byte variables.  */
-#define _STRING_ARCH_unaligned   1