diff options
| author | Alexander Kanavin <alex@linutronix.de> | 2024-05-16 13:26:34 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-28 09:38:23 +0100 |
| commit | afe0ae0afca92be26a0322007733325905238f1d (patch) | |
| tree | 73b5864649a4f82ca83dacb77be6374a628dc41b /meta | |
| parent | b09396f08fc4b731b6e4a6cd68c7f70c75ed08e9 (diff) | |
| download | poky-afe0ae0afca92be26a0322007733325905238f1d.tar.gz | |
gdb: remove unneeded 0006-resolve-restrict-keyword-conflict.patch
Somewhere on the way the issue solved itself.
(From OE-Core rev: 541e31bcadaf08579109b332ad760d9924bb6ac5)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/gdb/gdb.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/gdb/gdb/0006-resolve-restrict-keyword-conflict.patch | 45 |
2 files changed, 0 insertions, 46 deletions
diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc index 81ac441462..c2fbcb2ac6 100644 --- a/meta/recipes-devtools/gdb/gdb.inc +++ b/meta/recipes-devtools/gdb/gdb.inc | |||
| @@ -10,7 +10,6 @@ SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ | |||
| 10 | file://0003-Dont-disable-libreadline.a-when-using-disable-static.patch \ | 10 | file://0003-Dont-disable-libreadline.a-when-using-disable-static.patch \ |
| 11 | file://0004-use-asm-sgidefs.h.patch \ | 11 | file://0004-use-asm-sgidefs.h.patch \ |
| 12 | file://0005-Change-order-of-CFLAGS.patch \ | 12 | file://0005-Change-order-of-CFLAGS.patch \ |
| 13 | file://0006-resolve-restrict-keyword-conflict.patch \ | ||
| 14 | file://0007-Fix-invalid-sigprocmask-call.patch \ | 13 | file://0007-Fix-invalid-sigprocmask-call.patch \ |
| 15 | file://0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \ | 14 | file://0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \ |
| 16 | " | 15 | " |
diff --git a/meta/recipes-devtools/gdb/gdb/0006-resolve-restrict-keyword-conflict.patch b/meta/recipes-devtools/gdb/gdb/0006-resolve-restrict-keyword-conflict.patch deleted file mode 100644 index 45388c5ac5..0000000000 --- a/meta/recipes-devtools/gdb/gdb/0006-resolve-restrict-keyword-conflict.patch +++ /dev/null | |||
| @@ -1,45 +0,0 @@ | |||
| 1 | From 477f1b2049c7f940b8e8fda4ac396cfe322b269f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Tue, 10 May 2016 08:47:05 -0700 | ||
| 4 | Subject: [PATCH] resolve restrict keyword conflict | ||
| 5 | |||
| 6 | GCC detects that we call 'restrict' as param name in function | ||
| 7 | signatures and complains since both params are called 'restrict' | ||
| 8 | therefore we use __restrict to denote the C99 keywork | ||
| 9 | |||
| 10 | Upstream-Status: Pending | ||
| 11 | |||
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 13 | --- | ||
| 14 | gnulib/import/sys_time.in.h | 8 ++++---- | ||
| 15 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/gnulib/import/sys_time.in.h b/gnulib/import/sys_time.in.h | ||
| 18 | index 87db1a88745..e6b98c7e467 100644 | ||
| 19 | --- a/gnulib/import/sys_time.in.h | ||
| 20 | +++ b/gnulib/import/sys_time.in.h | ||
| 21 | @@ -93,20 +93,20 @@ struct timeval | ||
| 22 | # define gettimeofday rpl_gettimeofday | ||
| 23 | # endif | ||
| 24 | _GL_FUNCDECL_RPL (gettimeofday, int, | ||
| 25 | - (struct timeval *restrict, void *restrict) | ||
| 26 | + (struct timeval *__restrict, void *__restrict) | ||
| 27 | _GL_ARG_NONNULL ((1))); | ||
| 28 | _GL_CXXALIAS_RPL (gettimeofday, int, | ||
| 29 | - (struct timeval *restrict, void *restrict)); | ||
| 30 | + (struct timeval *__restrict, void *__restrict)); | ||
| 31 | # else | ||
| 32 | # if !@HAVE_GETTIMEOFDAY@ | ||
| 33 | _GL_FUNCDECL_SYS (gettimeofday, int, | ||
| 34 | - (struct timeval *restrict, void *restrict) | ||
| 35 | + (struct timeval *__restrict, void *__restrict) | ||
| 36 | _GL_ARG_NONNULL ((1))); | ||
| 37 | # endif | ||
| 38 | /* Need to cast, because on glibc systems, by default, the second argument is | ||
| 39 | struct timezone *. */ | ||
| 40 | _GL_CXXALIAS_SYS_CAST (gettimeofday, int, | ||
| 41 | - (struct timeval *restrict, void *restrict)); | ||
| 42 | + (struct timeval *__restrict, void *__restrict)); | ||
| 43 | # endif | ||
| 44 | _GL_CXXALIASWARN (gettimeofday); | ||
| 45 | # if defined __cplusplus && defined GNULIB_NAMESPACE | ||
