derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arch: Drop sysctl support if built against glibc

Browse Source 
Since glibc 2.30 the sysctl() function has been declared deprecated and
it will be deleted in future versions. This patch removes the support
for the sysctl system call in SE mode (which is currently serviced
calling the sysctl() function) if gem5 is built against glibc, keeping
it with other libc implementations, as a temporary measure to prevent
the generation of a compilation error. Note that this system call in
gem5 is only supported for the arm/freebsd architecture.

Change-Id: Ie5fcb983d15c0a27c7820d24250d7ae5dbe12355
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/21519
Reviewed-by: Brandon Potter <Brandon.Potter@amd.com>
Maintainer: Brandon Potter <Brandon.Potter@amd.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Tommaso Marinelli
2019-10-06 21:12:06 +02:00
parent e77b9d0424
commit 239054f484
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/arch/arm/freebsd/process.cc
View File

@@ -35,7 +35,9 @@
#include <sys/mman.h>
#include <sys/param.h>
#include <sys/syscall.h>
#if !defined ( __GNU_LIBRARY__ )
#include <sys/sysctl.h>
#endif
#include <sys/types.h>
#include <utime.h>
@@ -90,6 +92,7 @@ issetugidFunc(SyscallDesc *desc, int callnum, ThreadContext *tc)
return 0;
}
#if !defined ( __GNU_LIBRARY__ )
static SyscallReturn
sysctlFunc(SyscallDesc *desc, int callnum, ThreadContext *tc)
{
@@ -133,6 +136,7 @@ sysctlFunc(SyscallDesc *desc, int callnum, ThreadContext *tc)
return (ret);
}
#endif
static SyscallDesc syscallDescs32[] = {
/* 0 */ SyscallDesc("unused#000", unimplementedFunc),
@@ -888,7 +892,11 @@ static SyscallDesc syscallDescs64[] = {
/* 199 */ SyscallDesc("unused#199", unimplementedFunc),
/* 200 */ SyscallDesc("unused#200", unimplementedFunc),
/* 201 */ SyscallDesc("unused#201", unimplementedFunc),
#if !defined ( __GNU_LIBRARY__ )
/* 202 */ SyscallDesc("sysctl", sysctlFunc),
#else
/* 202 */ SyscallDesc("sysctl", unimplementedFunc),
#endif
/* 203 */ SyscallDesc("unused#203", unimplementedFunc),
/* 204 */ SyscallDesc("unused#204", unimplementedFunc),
/* 205 */ SyscallDesc("unused#205", unimplementedFunc),