diff mbox series

[RFC,05/13] nat/x86-cpuid.h: Remove non-x86 fallbacks

Message ID 20231009183617.24862-6-jhb@FreeBSD.org
State New
Headers
Series Proposal for a new NT_X86_CPUID core dump note |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gdb_check--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_gdb_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_gdb_check--master-arm success Testing passed

Commit Message

John Baldwin Oct. 9, 2023, 6:36 p.m. UTC 
  This header is only suitable for use on x86 hosts and is only included
there, so these fallbacks should not be needed.
---
 gdb/nat/x86-cpuid.h | 22 ----------------------
 1 file changed, 22 deletions(-)

Comments

Simon Marchi Oct. 12, 2023, 4:29 a.m. UTC | #1 
On 2023-10-09 14:36, John Baldwin wrote:
> This header is only suitable for use on x86 hosts and is only included
> there, so these fallbacks should not be needed.
> ---
>  gdb/nat/x86-cpuid.h | 22 ----------------------
>  1 file changed, 22 deletions(-)
> 
> diff --git a/gdb/nat/x86-cpuid.h b/gdb/nat/x86-cpuid.h
> index e1b0321d593..9401705c44d 100644
> --- a/gdb/nat/x86-cpuid.h
> +++ b/gdb/nat/x86-cpuid.h
> @@ -28,8 +28,6 @@
>  #define nullptr ((void *) 0)
>  #endif
>  
> -#if defined(__i386__) || defined(__x86_64__)
> -
>  /* Return cpuid data for requested cpuid level, as found in returned
>     eax, ebx, ecx and edx registers.  The function checks if cpuid is
>     supported and returns 1 for valid cpuid information or 0 for
> @@ -78,26 +76,6 @@ x86_cpuid_count (unsigned int __level, unsigned int __sublevel,
>    return __get_cpuid_count (__level, __sublevel, __eax, __ebx, __ecx, __edx);
>  }
>  
> -#else
> -
> -static __inline int
> -x86_cpuid (unsigned int __level,
> -	    unsigned int *__eax, unsigned int *__ebx,
> -	    unsigned int *__ecx, unsigned int *__edx)
> -{
> -  return 0;
> -}
> -
> -static __inline int
> -x86_cpuid_count (unsigned int __level, unsigned int __sublevel,
> -		 unsigned int *__eax, unsigned int *__ebx,
> -		 unsigned int *__ecx, unsigned int *__edx)
> -{
> -  return 0;
> -}
> -
> -#endif /* i386 && x86_64 */
> -
>  #ifndef __cplusplus
>  /* Avoid leaking this local definition beyond the scope of this header
>     file.  */

I think that one could go in right away.

Approved-By: Simon Marchi <simon.marchi@efficios.com>

Simon
diff mbox series

Patch

diff --git a/gdb/nat/x86-cpuid.h b/gdb/nat/x86-cpuid.h
index e1b0321d593..9401705c44d 100644
--- a/gdb/nat/x86-cpuid.h
+++ b/gdb/nat/x86-cpuid.h
@@ -28,8 +28,6 @@ 
 #define nullptr ((void *) 0)
 #endif
 
-#if defined(__i386__) || defined(__x86_64__)
-
 /* Return cpuid data for requested cpuid level, as found in returned
    eax, ebx, ecx and edx registers.  The function checks if cpuid is
    supported and returns 1 for valid cpuid information or 0 for
@@ -78,26 +76,6 @@  x86_cpuid_count (unsigned int __level, unsigned int __sublevel,
   return __get_cpuid_count (__level, __sublevel, __eax, __ebx, __ecx, __edx);
 }
 
-#else
-
-static __inline int
-x86_cpuid (unsigned int __level,
-	    unsigned int *__eax, unsigned int *__ebx,
-	    unsigned int *__ecx, unsigned int *__edx)
-{
-  return 0;
-}
-
-static __inline int
-x86_cpuid_count (unsigned int __level, unsigned int __sublevel,
-		 unsigned int *__eax, unsigned int *__ebx,
-		 unsigned int *__ecx, unsigned int *__edx)
-{
-  return 0;
-}
-
-#endif /* i386 && x86_64 */
-
 #ifndef __cplusplus
 /* Avoid leaking this local definition beyond the scope of this header
    file.  */