[Bug target/96238] New: [i386] cpuid.h header needs include guards

[Bug target/96238] New: [i386] cpuid.h header needs include guards

[thiago at kde dot org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96238

            Bug ID: 96238
           Summary: [i386] cpuid.h header needs include guards
           Product: gcc
           Version: unknown
            Status: UNCONFIRMED
          Severity: normal
          Priority: P3
         Component: target
          Assignee: unassigned at gcc dot gnu.org
          Reporter: thiago at kde dot org
  Target Milestone: ---

$ cat x.c
#include <cpuid.h>
#include <cpuid.h>
$ gcc -c x.c
/usr/lib64/gcc/x86_64-suse-linux/10/include/cpuid.h:228:1: error: redefinition
of ‘__get_cpuid_max’
  228 | __get_cpuid_max (unsigned int __ext, unsigned int *__sig)
      | ^~~~~~~~~~~~~~~
In file included from <command-line>:32:
/usr/lib64/gcc/x86_64-suse-linux/10/include/cpuid.h:228:1: note: previous
definition of ‘__get_cpuid_max’ was here
  228 | __get_cpuid_max (unsigned int __ext, unsigned int *__sig)
      | ^~~~~~~~~~~~~~~
/usr/lib64/gcc/x86_64-suse-linux/10/include/cpuid.h:283:1: error: redefinition
of ‘__get_cpuid’
  283 | __get_cpuid (unsigned int __leaf,
      | ^~~~~~~~~~~
/usr/lib64/gcc/x86_64-suse-linux/10/include/cpuid.h:283:1: note: previous
definition of ‘__get_cpuid’ was here
  283 | __get_cpuid (unsigned int __leaf,
      | ^~~~~~~~~~~
/usr/lib64/gcc/x86_64-suse-linux/10/include/cpuid.h:300:1: error: redefinition
of ‘__get_cpuid_count’
  300 | __get_cpuid_count (unsigned int __leaf, unsigned int __subleaf,
      | ^~~~~~~~~~~~~~~~~
/usr/lib64/gcc/x86_64-suse-linux/10/include/cpuid.h:300:1: note: previous
definition of ‘__get_cpuid_count’ was here
  300 | __get_cpuid_count (unsigned int __leaf, unsigned int __subleaf,
      | ^~~~~~~~~~~~~~~~~

[Bug target/96238] [i386] cpuid.h header needs include guards

[hjl.tools at gmail dot com]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96238

H.J. Lu <hjl.tools at gmail dot com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                URL|                            |https://gcc.gnu.org/piperma
                   |                            |il/gcc-patches/2020-July/55
                   |                            |0244.html
            Version|unknown                     |11.0
   Last reconfirmed|                            |2020-07-18
           Keywords|                            |patch
   Target Milestone|---                         |11.0
             Status|UNCONFIRMED                 |NEW
     Ever confirmed|0                           |1

--- Comment #1 from H.J. Lu <hjl.tools at gmail dot com> ---
A patch is posted at

https://gcc.gnu.org/pipermail/gcc-patches/2020-July/550244.html

[Bug target/96238] [i386] cpuid.h header needs include guards

[cvs-commit at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96238

--- Comment #2 from CVS Commits <cvs-commit at gcc dot gnu.org> ---
The master branch has been updated by H.J. Lu <hjl@gcc.gnu.org>:

https://gcc.gnu.org/g:29e1039ca211c4e3f1053925eda0a81c57cbcb0c

commit r11-2216-g29e1039ca211c4e3f1053925eda0a81c57cbcb0c
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Sat Jul 18 04:43:10 2020 -0700

    x86: Add __cpuidex and include guard to <cpuid.h>

    Add

    void __cpuidex (int __cpuid_info[4], int __leaf, int __subleaf);

    as well as include guard to <cpuid.h>.

    gcc/

            PR target/95973
            PR target/96238
            * config/i386/cpuid.h: Add include guard.
            (__cpuidex): New.

    gcc/testsuite/

            PR target/95973
            PR target/96238
            * gcc.target/i386/pr95973.c: New test.

[Bug target/96238] [i386] cpuid.h header needs include guards

[hjl.tools at gmail dot com]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96238

H.J. Lu <hjl.tools at gmail dot com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|---                         |FIXED

--- Comment #3 from H.J. Lu <hjl.tools at gmail dot com> ---
Fixed for GCC 11.

[Bug target/96238] [i386] cpuid.h header needs include guards

[roland at gnu dot org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96238

roland at gnu dot org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |roland at gnu dot org

--- Comment #4 from roland at gnu dot org ---
Can at least the header guard fix be backported to 10?