Skip to content

Commit 16a1ef8

Browse files
authored
[compiler-rt] remove hexdump interception. (#79378)
a freebsd dev member reported a symbol conflict and intercepting this had little value anyway.
1 parent a58dcc5 commit 16a1ef8

File tree

3 files changed

+0
-39
lines changed

3 files changed

+0
-39
lines changed

compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc

-15
Original file line numberDiff line numberDiff line change
@@ -10218,20 +10218,6 @@ INTERCEPTOR(int, __xuname, int size, void *utsname) {
1021810218
#define INIT___XUNAME
1021910219
#endif
1022010220

10221-
#if SANITIZER_INTERCEPT_HEXDUMP
10222-
INTERCEPTOR(void, hexdump, const void *ptr, int length, const char *header, int flags) {
10223-
void *ctx;
10224-
COMMON_INTERCEPTOR_ENTER(ctx, hexdump, ptr, length, header, flags);
10225-
COMMON_INTERCEPTOR_READ_RANGE(ctx, ptr, length);
10226-
COMMON_INTERCEPTOR_READ_RANGE(ctx, header, internal_strlen(header) + 1);
10227-
REAL(hexdump)(ptr, length, header, flags);
10228-
}
10229-
10230-
#define INIT_HEXDUMP COMMON_INTERCEPT_FUNCTION(hexdump);
10231-
#else
10232-
#define INIT_HEXDUMP
10233-
#endif
10234-
1023510221
#if SANITIZER_INTERCEPT_ARGP_PARSE
1023610222
INTERCEPTOR(int, argp_parse, const struct argp *argp, int argc, char **argv,
1023710223
unsigned flags, int *arg_index, void *input) {
@@ -10581,7 +10567,6 @@ static void InitializeCommonInterceptors() {
1058110567
INIT_PROCCTL
1058210568
INIT_UNAME;
1058310569
INIT___XUNAME;
10584-
INIT_HEXDUMP;
1058510570
INIT_ARGP_PARSE;
1058610571
INIT_CPUSET_GETAFFINITY;
1058710572

compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h

-1
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,6 @@
596596
#define SANITIZER_INTERCEPT___XUNAME SI_FREEBSD
597597
#define SANITIZER_INTERCEPT_FLOPEN SI_FREEBSD
598598
#define SANITIZER_INTERCEPT_PROCCTL SI_FREEBSD
599-
#define SANITIZER_INTERCEPT_HEXDUMP SI_FREEBSD
600599
#define SANITIZER_INTERCEPT_ARGP_PARSE SI_GLIBC
601600
#define SANITIZER_INTERCEPT_CPUSET_GETAFFINITY SI_FREEBSD
602601

compiler-rt/test/sanitizer_common/TestCases/FreeBSD/hexdump.cc

-23
This file was deleted.

0 commit comments

Comments
 (0)