-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
sys-devel/llvm-roc: fix linux-headers-5.13 build
Backport #include <linux/cyclades.h> uptream removal. Reported-by: cyrillic Closes: https://bugs.gentoo.org/800695 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
- Loading branch information
Sergei Trofimovich
committed
Jul 8, 2021
1 parent
99613e8
commit f876f1c
Showing
2 changed files
with
87 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| https://github.com/RadeonOpenCompute/llvm-project/commit/68d5235cb58f988c71b403334cd9482d663841ab.patch | ||
| https://bugs.gentoo.org/800695 | ||
| Differential Revision: https://reviews.llvm.org/D102059 | ||
|
|
||
| From 68d5235cb58f988c71b403334cd9482d663841ab Mon Sep 17 00:00:00 2001 | ||
| From: Tamar Christina <tamar.christina@arm.com> | ||
| Date: Thu, 20 May 2021 18:55:11 +0100 | ||
| Subject: [PATCH] libsanitizer: Remove cyclades inclusion in sanitizer | ||
| --- a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc | ||
| +++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc | ||
| @@ -370,15 +370,6 @@ static void ioctl_table_fill() { | ||
|
|
||
| #if SANITIZER_GLIBC | ||
| // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE | ||
| - _(CYGETDEFTHRESH, WRITE, sizeof(int)); | ||
| - _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); | ||
| - _(CYGETMON, WRITE, struct_cyclades_monitor_sz); | ||
| - _(CYGETTHRESH, WRITE, sizeof(int)); | ||
| - _(CYGETTIMEOUT, WRITE, sizeof(int)); | ||
| - _(CYSETDEFTHRESH, NONE, 0); | ||
| - _(CYSETDEFTIMEOUT, NONE, 0); | ||
| - _(CYSETTHRESH, NONE, 0); | ||
| - _(CYSETTIMEOUT, NONE, 0); | ||
| _(EQL_EMANCIPATE, WRITE, struct_ifreq_sz); | ||
| _(EQL_ENSLAVE, WRITE, struct_ifreq_sz); | ||
| _(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz); | ||
| --- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp | ||
| +++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp | ||
| @@ -143,7 +143,6 @@ typedef struct user_fpregs elf_fpregset_t; | ||
| # include <sys/procfs.h> | ||
| #endif | ||
| #include <sys/user.h> | ||
| -#include <linux/cyclades.h> | ||
| #include <linux/if_eql.h> | ||
| #include <linux/if_plip.h> | ||
| #include <linux/lp.h> | ||
| @@ -460,7 +459,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); | ||
|
|
||
| #if SANITIZER_GLIBC | ||
| unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); | ||
| - unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); | ||
| #if EV_VERSION > (0x010000) | ||
| unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry); | ||
| #else | ||
| @@ -824,15 +822,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); | ||
| #endif // SANITIZER_LINUX | ||
|
|
||
| #if SANITIZER_LINUX && !SANITIZER_ANDROID | ||
| - unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; | ||
| - unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; | ||
| - unsigned IOCTL_CYGETMON = CYGETMON; | ||
| - unsigned IOCTL_CYGETTHRESH = CYGETTHRESH; | ||
| - unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT; | ||
| - unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH; | ||
| - unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT; | ||
| - unsigned IOCTL_CYSETTHRESH = CYSETTHRESH; | ||
| - unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT; | ||
| unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE; | ||
| unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE; | ||
| unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG; | ||
| --- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h | ||
| +++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h | ||
| @@ -983,7 +983,6 @@ extern unsigned struct_vt_mode_sz; | ||
|
|
||
| #if SANITIZER_LINUX && !SANITIZER_ANDROID | ||
| extern unsigned struct_ax25_parms_struct_sz; | ||
| -extern unsigned struct_cyclades_monitor_sz; | ||
| extern unsigned struct_input_keymap_entry_sz; | ||
| extern unsigned struct_ipx_config_data_sz; | ||
| extern unsigned struct_kbdiacrs_sz; | ||
| @@ -1328,15 +1327,6 @@ extern unsigned IOCTL_VT_WAITACTIVE; | ||
| #endif // SANITIZER_LINUX | ||
|
|
||
| #if SANITIZER_LINUX && !SANITIZER_ANDROID | ||
| -extern unsigned IOCTL_CYGETDEFTHRESH; | ||
| -extern unsigned IOCTL_CYGETDEFTIMEOUT; | ||
| -extern unsigned IOCTL_CYGETMON; | ||
| -extern unsigned IOCTL_CYGETTHRESH; | ||
| -extern unsigned IOCTL_CYGETTIMEOUT; | ||
| -extern unsigned IOCTL_CYSETDEFTHRESH; | ||
| -extern unsigned IOCTL_CYSETDEFTIMEOUT; | ||
| -extern unsigned IOCTL_CYSETTHRESH; | ||
| -extern unsigned IOCTL_CYSETTIMEOUT; | ||
| extern unsigned IOCTL_EQL_EMANCIPATE; | ||
| extern unsigned IOCTL_EQL_ENSLAVE; | ||
| extern unsigned IOCTL_EQL_GETMASTRCFG; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters