* Lili Cui via Gcc-cvs:

> https://gcc.gnu.org/g:0fa76e35a5f9e141c08fdf151380f2f9689101c7
>
> commit r13-7720-g0fa76e35a5f9e141c08fdf151380f2f9689101c7
> Author: Cui, Lili <lili....@intel.com>
> Date:   Mon Aug 14 02:06:00 2023 +0000
>
>     x86: Update model values for Raptorlake.
>     
>     Update model values for Raptorlake according to SDM.
>     
>     gcc/ChangeLog
>     
>             * common/config/i386/cpuinfo.h (get_intel_cpu): Add model value 
> 0xba
>             to Raptorlake.
>
> Diff:
> ---
>  gcc/common/config/i386/cpuinfo.h | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/gcc/common/config/i386/cpuinfo.h 
> b/gcc/common/config/i386/cpuinfo.h
> index 81f8b1766f8d..d6f2b7e3cfb3 100644
> --- a/gcc/common/config/i386/cpuinfo.h
> +++ b/gcc/common/config/i386/cpuinfo.h
> @@ -539,6 +539,8 @@ get_intel_cpu (struct __processor_model *cpu_model,
>      case 0xbf:
>        /* Alder Lake.  */
>      case 0xb7:
> +    case 0xba:
> +    case 0xbf:
>        /* Raptor Lake.  */
>      case 0xaa:
>      case 0xac:

This mismerge breaks the build (duplicate 0xbf case values).

Thanks,
Florian

Reply via email to