commit:     f19a5caaad02f5a85cf48eb0b5830562a8787ce1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  8 03:15:47 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 03:15:55 2023 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=f19a5caa

12.2.0: drop upstream patches

Now merged upstream.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 ..._all_libsanitizer-implicit-function-decls.patch |  35 -------
 ...7_all_libiberty-fix-c89-isms-in-configure.patch | 105 ---------------------
 12.2.0/gentoo/README.history                       |   4 +
 3 files changed, 4 insertions(+), 140 deletions(-)

diff --git a/12.2.0/gentoo/76_all_libsanitizer-implicit-function-decls.patch 
b/12.2.0/gentoo/76_all_libsanitizer-implicit-function-decls.patch
deleted file mode 100644
index 8131cf8..0000000
--- a/12.2.0/gentoo/76_all_libsanitizer-implicit-function-decls.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=6be2672e4ee41c566a9e072088cccca263bab5f7
-
-From 942a325c81136138c4c199f8ab3e89a1945c3790 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <[email protected]>
-Date: Tue, 18 Oct 2022 16:58:48 +0200
-Subject: [PATCH 1/2] libsanitizer: Avoid implicit function declaration in
- configure test
-
-libsanitizer/
-
-       * configure.ac (sanitizer_supported): Include <unistd.h> for
-       syscall prototype.
-       * configure: Regenerate.
---- a/libsanitizer/configure
-+++ b/libsanitizer/configure
-@@ -16028,6 +16028,7 @@ case "$target" in
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <sys/syscall.h>
-+#include <unistd.h>
- int
- main ()
- {
---- a/libsanitizer/configure.ac
-+++ b/libsanitizer/configure.ac
-@@ -161,7 +161,8 @@ case "$target" in
-   *-*-linux*)
-     # Some old Linux distributions miss required syscalls.
-     sanitizer_supported=no
--    AC_TRY_COMPILE([#include <sys/syscall.h>],[
-+    AC_TRY_COMPILE([#include <sys/syscall.h>
-+#include <unistd.h>],[
-       syscall (__NR_gettid);
-       syscall (__NR_futex);
-       syscall (__NR_exit_group);

diff --git a/12.2.0/gentoo/77_all_libiberty-fix-c89-isms-in-configure.patch 
b/12.2.0/gentoo/77_all_libiberty-fix-c89-isms-in-configure.patch
deleted file mode 100644
index ed13d2c..0000000
--- a/12.2.0/gentoo/77_all_libiberty-fix-c89-isms-in-configure.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=885b6660c17fb91980b5682514ef54668e544b02
-
-From 9a43d0e406c05d2d7136721443192bb6588c3113 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <[email protected]>
-Date: Tue, 18 Oct 2022 16:58:48 +0200
-Subject: [PATCH 2/2] libiberty: Fix C89-isms in configure tests
-
-libiberty/
-
-       * acinclude.m4 (ac_cv_func_strncmp_works): Add missing
-       int return type and parameter list to the definition of main.
-       Include <stdlib.h> and <string.h> for prototypes.
-       (ac_cv_c_stack_direction): Add missing
-       int return type and parameter list to the definitions of
-       main, find_stack_direction.  Include <stdlib.h> for exit
-       prototype.
-       * configure: Regenerate.
---- a/libiberty/acinclude.m4
-+++ b/libiberty/acinclude.m4
-@@ -24,6 +24,8 @@ AC_CACHE_CHECK([for working strncmp], 
ac_cv_func_strncmp_works,
- [AC_TRY_RUN([
- /* Test by Jim Wilson and Kaveh Ghazi.
-    Check whether strncmp reads past the end of its string parameters. */
-+#include <stdlib.h>
-+#include <string.h>
- #include <sys/types.h>
- 
- #ifdef HAVE_FCNTL_H
-@@ -51,7 +53,8 @@ AC_CACHE_CHECK([for working strncmp], 
ac_cv_func_strncmp_works,
- 
- #define MAP_LEN 0x10000
- 
--main ()
-+int
-+main (void)
- {
- #if defined(HAVE_MMAP) || defined(HAVE_MMAP_ANYWHERE)
-   char *p;
-@@ -157,7 +160,10 @@ if test $ac_cv_os_cray = yes; then
- fi
- 
- AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
--[AC_TRY_RUN([find_stack_direction ()
-+[AC_TRY_RUN([#include <stdlib.h>
-+
-+int
-+find_stack_direction (void)
- {
-   static char *addr = 0;
-   auto char dummy;
-@@ -169,7 +175,9 @@ AC_CACHE_CHECK(stack direction for C alloca, 
ac_cv_c_stack_direction,
-   else
-     return (&dummy > addr) ? 1 : -1;
- }
--main ()
-+
-+int
-+main (void)
- {
-   exit (find_stack_direction() < 0);
- }],
---- a/libiberty/configure
-+++ b/libiberty/configure
-@@ -6780,7 +6780,10 @@ else
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--find_stack_direction ()
-+#include <stdlib.h>
-+
-+int
-+find_stack_direction (void)
- {
-   static char *addr = 0;
-   auto char dummy;
-@@ -6792,7 +6795,9 @@ find_stack_direction ()
-   else
-     return (&dummy > addr) ? 1 : -1;
- }
--main ()
-+
-+int
-+main (void)
- {
-   exit (find_stack_direction() < 0);
- }
-@@ -7617,6 +7622,8 @@ else
- 
- /* Test by Jim Wilson and Kaveh Ghazi.
-    Check whether strncmp reads past the end of its string parameters. */
-+#include <stdlib.h>
-+#include <string.h>
- #include <sys/types.h>
- 
- #ifdef HAVE_FCNTL_H
-@@ -7644,7 +7651,8 @@ else
- 
- #define MAP_LEN 0x10000
- 
--main ()
-+int
-+main (void)
- {
- #if defined(HAVE_MMAP) || defined(HAVE_MMAP_ANYWHERE)
-   char *p;

diff --git a/12.2.0/gentoo/README.history b/12.2.0/gentoo/README.history
index 713d788..d71d136 100644
--- a/12.2.0/gentoo/README.history
+++ b/12.2.0/gentoo/README.history
@@ -1,3 +1,7 @@
+9              8 Jan 2022
+       - 76_all_libsanitizer-implicit-function-decls.patch
+       - 77_all_libiberty-fix-c89-isms-in-configure.patch
+
 8              28 Dec 2022
        U 01_all_default-fortify-source.patch
        + 15_all_DEF_GENTOO_GLIBCXX_ASSERTIONS.patch

Reply via email to