[Glibc-bsd-commits] r3149 - trunk/kfreebsd-8/debian/patches

[Petr Salinger]

Author: ps-guest
Date: 2010-08-06 06:59:26 +0000 (Fri, 06 Aug 2010)
New Revision: 3149

Modified:
   trunk/kfreebsd-8/debian/patches/000_adaptive_machine_arch.diff
Log:
return i686, not i386 on amd64 for sysctl hw.machine



Modified: trunk/kfreebsd-8/debian/patches/000_adaptive_machine_arch.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/000_adaptive_machine_arch.diff	2010-08-06 06:44:59 UTC (rev 3148)
+++ trunk/kfreebsd-8/debian/patches/000_adaptive_machine_arch.diff	2010-08-06 06:59:26 UTC (rev 3149)
@@ -5,6 +5,11 @@
 Add a safety belt debug.adaptive_machine_arch sysctl, to turn the
 substitution off.
 
+
+Compared to upstream, we return i686, not i386 on amd64 for sysctl hw.machine
+This part have to be moved into 907_cpu_class.diff later.
+
+
 --- a/sys/powerpc/include/param.h
 +++ b/sys/powerpc/include/param.h
 @@ -69,6 +69,11 @@
@@ -99,7 +104,7 @@
 +sysctl_hw_machine(SYSCTL_HANDLER_ARGS)
 +{
 +#ifdef SCTL_MASK32
-+	static const char machine32[] = "i386";
++	static const char machine32[] = "i686";
 +#endif
 +	int error;
 +