Skip to content

Commit aeb2385

Browse files
trcrsiredfelipepiovezan
authored andcommitted
[compiler-rt][sanitizer] Remove linux/scc.h (llvm#194116)
llvm#194110 Linux Kernel has removed scc.h header completely from the source code Therefore, we need to remove the usage in compiler-rt/sanitizer too. torvalds/linux@64edfa6#diff-1ca78e598a5041ee51ae795d168435afad598b82a7a0ce80f215993589b96c7c Without removing it, not only it breaks compiler-rt but also GCC build since GCC always builds libsanitizer for linux targets. After merging this we will need to cherry pick to GCC.
1 parent a5e24e0 commit aeb2385

1 file changed

Lines changed: 9 additions & 12 deletions

File tree

‎compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -151,16 +151,15 @@ typedef struct user_fpregs elf_fpregset_t;
151151
#if defined(__mips64)
152152
# include <sys/procfs.h>
153153
#endif
154-
#include <sys/user.h>
155-
#include <linux/if_eql.h>
156-
#include <linux/if_plip.h>
157-
#include <linux/lp.h>
158-
#include <linux/mroute.h>
159-
#include <linux/mroute6.h>
160-
#include <linux/scc.h>
161-
#include <linux/serial.h>
162-
#include <sys/msg.h>
163-
#include <sys/ipc.h>
154+
# include <linux/if_eql.h>
155+
# include <linux/if_plip.h>
156+
# include <linux/lp.h>
157+
# include <linux/mroute.h>
158+
# include <linux/mroute6.h>
159+
# include <linux/serial.h>
160+
# include <sys/ipc.h>
161+
# include <sys/msg.h>
162+
# include <sys/user.h>
164163
#endif // SANITIZER_ANDROID
165164

166165
#include <link.h>
@@ -532,8 +531,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
532531
unsigned struct_kbsentry_sz = sizeof(struct kbsentry);
533532
unsigned struct_mtconfiginfo_sz = sizeof(struct mtconfiginfo);
534533
unsigned struct_nr_parms_struct_sz = sizeof(struct nr_parms_struct);
535-
unsigned struct_scc_modem_sz = sizeof(struct scc_modem);
536-
unsigned struct_scc_stat_sz = sizeof(struct scc_stat);
537534
unsigned struct_serial_multiport_struct_sz
538535
= sizeof(struct serial_multiport_struct);
539536
unsigned struct_serial_struct_sz = sizeof(struct serial_struct);

0 commit comments

Comments
 (0)