diff --git a/compiler-rt/lib/scudo/standalone/linux.cpp b/compiler-rt/lib/scudo/standalone/linux.cpp --- a/compiler-rt/lib/scudo/standalone/linux.cpp +++ b/compiler-rt/lib/scudo/standalone/linux.cpp @@ -28,11 +28,11 @@ #include #include -#if SCUDO_ANDROID #include -// Definitions of prctl arguments to set a vma name in Android kernels. -#define ANDROID_PR_SET_VMA 0x53564d41 -#define ANDROID_PR_SET_VMA_ANON_NAME 0 +// Definitions of prctl arguments to set a vma name in kernels (Linux from 5.17). +#ifndef PR_SET_VMA +#define PR_SET_VMA 0x53564d41 +#define PR_SET_VMA_ANON_NAME 0 #endif namespace scudo { @@ -66,10 +66,8 @@ dieOnMapUnmapError(errno == ENOMEM ? Size : 0); return nullptr; } -#if SCUDO_ANDROID if (Name) - prctl(ANDROID_PR_SET_VMA, ANDROID_PR_SET_VMA_ANON_NAME, P, Size, Name); -#endif + prctl(PR_SET_VMA, PR_SET_VMA_ANON_NAME, P, Size, Name); return P; }