From owner-freebsd-current  Mon Dec 25 06:57:17 1995
Return-Path: owner-current
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id GAA18542
          for current-outgoing; Mon, 25 Dec 1995 06:57:17 -0800 (PST)
Received: from godzilla.zeta.org.au (godzilla.zeta.org.au [203.2.228.19])
          by freefall.freebsd.org (8.7.3/8.7.3) with SMTP id GAA18537
          for <current@freebsd.org>; Mon, 25 Dec 1995 06:57:06 -0800 (PST)
Received: (from bde@localhost) by godzilla.zeta.org.au (8.6.9/8.6.9) id BAA31681; Tue, 26 Dec 1995 01:56:10 +1100
Date: Tue, 26 Dec 1995 01:56:10 +1100
From: Bruce Evans <bde@zeta.org.au>
Message-Id: <199512251456.BAA31681@godzilla.zeta.org.au>
To: current@freebsd.org, kato@eclogite.eps.nagoya-u.ac.jp
Subject: Re: Cyrix 5x86 is not identified
Sender: owner-current@freebsd.org
Precedence: bulk

>When I run this kernel on Cyrix 5x86 box, it is paniced by 
>	CPU: Pentium Proc (unknown-class CPU)
>	CPU class not configured
>...
>Now I have applied following quick hack to run -current:

>---------- BEGIN ----------
>*** locore.s.1.57	Mon Dec 25 22:41:10 1995
>--- locore.s	Mon Dec 25 22:41:48 1995
>***************
>*** 458,463 ****
>--- 458,466 ----
>  	movl	$CPU_586,_cpu-KERNBASE
>  	jmp	3f
>  2:
>+ 	/* Cyrix 5x86 ? */
>+ 	cmpl	$6,%eax
>+ 	jb	3f
>  	/* Greater than Pentium...call it a Pentium Pro */
>  	movl	$CPU_686,_cpu-KERNBASE
>  3:
>---------- END ----------

>Comparison between revision 1.56 and 1.57, I can't find the reason why
>5x86 is not identified.  The reason seems to be gas problem which

An earlier `jmp 2f' (after detecting a CYRIX) didn't get changed to
`jmp 3f'.

Numeric local labels shouldn't be used here.   They should only be used
in macros and for very short branches.

Bruce