diff options
author | kib <kib@FreeBSD.org> | 2010-07-22 09:13:49 +0000 |
---|---|---|
committer | kib <kib@FreeBSD.org> | 2010-07-22 09:13:49 +0000 |
commit | 9ac2754b6d3dd9b7de4909a0d80515d971da738e (patch) | |
tree | a1e7b78633c799b8be45f7c7e0bf35589eceef96 | |
parent | 3f34a9652f0bdd0c831fbb46eb6f576ec725fd9c (diff) | |
download | FreeBSD-src-9ac2754b6d3dd9b7de4909a0d80515d971da738e.zip FreeBSD-src-9ac2754b6d3dd9b7de4909a0d80515d971da738e.tar.gz |
When compat32 binary asks for the value of hw.machine_arch, report the
name of 32bit sibling architecture instead of the host one. Do the
same for hw.machine on amd64.
Add a safety belt debug.adaptive_machine_arch sysctl, to turn the
substitution off.
Reviewed by: jhb, nwhitehorn
MFC after: 2 weeks
-rw-r--r-- | sys/amd64/amd64/identcpu.c | 26 | ||||
-rw-r--r-- | sys/amd64/include/param.h | 3 | ||||
-rw-r--r-- | sys/ia64/include/param.h | 3 | ||||
-rw-r--r-- | sys/kern/kern_mib.c | 28 | ||||
-rw-r--r-- | sys/powerpc/include/param.h | 5 |
5 files changed, 60 insertions, 5 deletions
diff --git a/sys/amd64/amd64/identcpu.c b/sys/amd64/amd64/identcpu.c index 52e7568..b188c97 100644 --- a/sys/amd64/amd64/identcpu.c +++ b/sys/amd64/amd64/identcpu.c @@ -76,8 +76,30 @@ static void print_via_padlock_info(void); int cpu_class; char machine[] = "amd64"; -SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, - machine, 0, "Machine class"); + +#ifdef SCTL_MASK32 +extern int adaptive_machine_arch; +#endif + +static int +sysctl_hw_machine(SYSCTL_HANDLER_ARGS) +{ +#ifdef SCTL_MASK32 + static const char machine32[] = "i386"; +#endif + int error; + +#ifdef SCTL_MASK32 + if ((req->flags & SCTL_MASK32) != 0 && adaptive_machine_arch) + error = SYSCTL_OUT(req, machine32, sizeof(machine32)); + else +#endif + error = SYSCTL_OUT(req, machine, sizeof(machine)); + return (error); + +} +SYSCTL_PROC(_hw, HW_MACHINE, machine, CTLTYPE_STRING | CTLFLAG_RD, + NULL, 0, sysctl_hw_machine, "A", "Machine class"); static char cpu_model[128]; SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD, diff --git a/sys/amd64/include/param.h b/sys/amd64/include/param.h index c940597..9a742f9 100644 --- a/sys/amd64/include/param.h +++ b/sys/amd64/include/param.h @@ -59,6 +59,9 @@ #ifndef MACHINE_ARCH #define MACHINE_ARCH "amd64" #endif +#ifndef MACHINE_ARCH32 +#define MACHINE_ARCH32 "i386" +#endif #if defined(SMP) || defined(KLD_MODULE) #define MAXCPU 32 diff --git a/sys/ia64/include/param.h b/sys/ia64/include/param.h index ba26290..36b27e0 100644 --- a/sys/ia64/include/param.h +++ b/sys/ia64/include/param.h @@ -57,6 +57,9 @@ #ifndef MACHINE_ARCH #define MACHINE_ARCH "ia64" #endif +#ifndef MACHINE_ARCH32 +#define MACHINE_ARCH32 "i386" +#endif #if defined(SMP) || defined(KLD_MODULE) #define MAXCPU 32 diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c index 7ef580f..e31daf7 100644 --- a/sys/kern/kern_mib.c +++ b/sys/kern/kern_mib.c @@ -232,9 +232,31 @@ sysctl_hw_pagesizes(SYSCTL_HANDLER_ARGS) SYSCTL_PROC(_hw, OID_AUTO, pagesizes, CTLTYPE_ULONG | CTLFLAG_RD, NULL, 0, sysctl_hw_pagesizes, "LU", "Supported page sizes"); -static char machine_arch[] = MACHINE_ARCH; -SYSCTL_STRING(_hw, HW_MACHINE_ARCH, machine_arch, CTLFLAG_RD, - machine_arch, 0, "System architecture"); +#ifdef SCTL_MASK32 +int adaptive_machine_arch = 1; +SYSCTL_INT(_debug, OID_AUTO, adaptive_machine_arch, CTLFLAG_RW, + &adaptive_machine_arch, 1, + "Adapt reported machine architecture to the ABI of the binary"); +#endif + +static int +sysctl_hw_machine_arch(SYSCTL_HANDLER_ARGS) +{ + int error; + static const char machine_arch[] = MACHINE_ARCH; +#ifdef SCTL_MASK32 + static const char machine_arch32[] = MACHINE_ARCH32; + + if ((req->flags & SCTL_MASK32) != 0 && adaptive_machine_arch) + error = SYSCTL_OUT(req, machine_arch32, sizeof(machine_arch32)); + else +#endif + error = SYSCTL_OUT(req, machine_arch, sizeof(machine_arch)); + return (error); + +} +SYSCTL_PROC(_hw, HW_MACHINE_ARCH, machine_arch, CTLTYPE_STRING | CTLFLAG_RD, + NULL, 0, sysctl_hw_machine_arch, "A", "System architecture"); static int sysctl_hostname(SYSCTL_HANDLER_ARGS) diff --git a/sys/powerpc/include/param.h b/sys/powerpc/include/param.h index 4aeabe7..91bb238 100644 --- a/sys/powerpc/include/param.h +++ b/sys/powerpc/include/param.h @@ -61,6 +61,11 @@ #endif #endif #define MID_MACHINE MID_POWERPC +#ifdef __powerpc64__ +#ifndef MACHINE_ARCH32 +#define MACHINE_ARCH32 "powerpc" +#endif +#endif #if defined(SMP) || defined(KLD_MODULE) #define MAXCPU 2 |