Attachment #397970 for bug #542030




SubDirs :=

# Add submodules.
#SubDirs += asan
SubDirs += builtins
#SubDirs += dfsan
SubDirs += interception
#SubDirs += lsan
#SubDirs += msan
SubDirs += profile
#SubDirs += sanitizer_common
#SubDirs += tsan
#SubDirs += ubsan




  return real == wrapper;
}

#if !defined(__ANDROID__)  // android does not have dlvsym
void *GetFuncAddrVer(const char *func_name, const char *ver) {
  return dlvsym(RTLD_NEXT, func_name, ver);
}
#endif  // !defined(__ANDROID__)

}  // namespace __interception






      (::__interception::uptr) & (func),                                   \
      (::__interception::uptr) & WRAP(func))

#if !defined(__ANDROID__)  // android does not have dlvsym
# define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
     ::__interception::real_##func = (func##_f)(unsigned long) \
         ::__interception::GetFuncAddrVer(#func, symver)
#else
# define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
     INTERCEPT_FUNCTION_LINUX_OR_FREEBSD(func)
#endif  // !defined(__ANDROID__)

#endif  // INTERCEPTION_LINUX_H
#endif  // __linux__ || __FreeBSD__

Return to bug 542030

Lines 24-35 Link Here

(-)a/projects/compiler-rt/lib/interception/interception_linux.cc (-6 lines)
24	return real == wrapper;	24	return real == wrapper;
25	}	25	}
26		26
27	#if !defined(__ANDROID__) // android does not have dlvsym
28	void GetFuncAddrVer(const char func_name, const char *ver) {
29	return dlvsym(RTLD_NEXT, func_name, ver);
30	}
31	#endif // !defined(__ANDROID__)
32
33	} // namespace __interception	27	} // namespace __interception
34		28
35		29

Lines 10-22 Link Here

(-)a/projects/compiler-rt/lib/Makefile.mk (-7 / +7 lines)
10	SubDirs :=	10	SubDirs :=
11		11
12	# Add submodules.	12	# Add submodules.
13	SubDirs += asan	13	#SubDirs += asan
14	SubDirs += builtins	14	SubDirs += builtins
15	SubDirs += dfsan	15	#SubDirs += dfsan
16	SubDirs += interception	16	SubDirs += interception
17	SubDirs += lsan	17	#SubDirs += lsan
18	SubDirs += msan	18	#SubDirs += msan
19	SubDirs += profile	19	SubDirs += profile
20	SubDirs += sanitizer_common	20	#SubDirs += sanitizer_common
21	SubDirs += tsan	21	#SubDirs += tsan
22	SubDirs += ubsan	22	#SubDirs += ubsan

Lines 34-47 Link Here

(-)a/projects/compiler-rt/lib/interception/interception_linux.h (-6 lines)
34	(::__interception::uptr) & (func), \	34	(::__interception::uptr) & (func), \
35	(::__interception::uptr) & WRAP(func))	35	(::__interception::uptr) & WRAP(func))
36		36
37	#if !defined(__ANDROID__) // android does not have dlvsym
38	# define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
39	::__interception::real_##func = (func##_f)(unsigned long) \
40	::__interception::GetFuncAddrVer(#func, symver)
41	#else
42	# define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \	37	# define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
43	INTERCEPT_FUNCTION_LINUX_OR_FREEBSD(func)	38	INTERCEPT_FUNCTION_LINUX_OR_FREEBSD(func)
44	#endif // !defined(__ANDROID__)
45		39
46	#endif // INTERCEPTION_LINUX_H	40	#endif // INTERCEPTION_LINUX_H
47	#endif // __linux__ \|\| __FreeBSD__	41	#endif // __linux__ \|\| __FreeBSD__