Change all references to "__INTEL__" to "__i386__".

They are functionally identical, but the former is a BeOS/Haiku-specfic
macro that we include in the compiler specs, and the latter is defined
by GCC.
This commit is contained in:
Augustin Cavalier
2019-03-30 16:54:01 -04:00
parent 1e60bdeab6
commit 5ffbe7d778
49 changed files with 91 additions and 91 deletions
+1 -1
View File
@@ -18,7 +18,7 @@
__HAIKU_BIG_ENDIAN - defined to 1 on big endian architectures
(defaults to undefined)
*/
#if defined(__INTEL__)
#if defined(__i386__)
# define __HAIKU_ARCH x86
# if __GNUC__ == 2
# define __HAIKU_ARCH_ABI "x86_gcc2"
+1 -1
View File
@@ -534,7 +534,7 @@ extern status_t get_cpu_info(uint32 firstCPU, uint32 cpuCount,
extern status_t get_cpu_topology_info(cpu_topology_node_info* topologyInfos,
uint32* topologyInfoCount);
#if defined(__INTEL__) || defined(__x86_64__)
#if defined(__i386__) || defined(__x86_64__)
typedef union {
struct {
uint32 max_eax;
+1 -1
View File
@@ -24,7 +24,7 @@
#if defined(__x86_64__)
typedef struct x86_64_debug_cpu_state debug_cpu_state;
#elif defined(__INTEL__)
#elif defined(__i386__)
typedef struct x86_debug_cpu_state debug_cpu_state;
#elif defined(__POWERPC__)
typedef struct ppc_debug_cpu_state debug_cpu_state;
+3 -3
View File
@@ -23,7 +23,7 @@ extern "C" {
extern int32 tls_allocate(void);
#if !_NO_INLINE_ASM && __INTEL__ && __GNUC__
#if !_NO_INLINE_ASM && __i386__ && __GNUC__
static inline void *
tls_get(int32 index)
@@ -54,13 +54,13 @@ tls_set(int32 index, void *value)
: : "r" (index), "r" (value));
}
#else /* !_NO_INLINE_ASM && __INTEL__ && __GNUC__ */
#else /* !_NO_INLINE_ASM && __i386__ && __GNUC__ */
extern void *tls_get(int32 index);
extern void **tls_address(int32 index);
extern void tls_set(int32 index, void *value);
#endif /* !_NO_INLINE_ASM && __INTEL__ && __GNUC__ */
#endif /* !_NO_INLINE_ASM && __i386__ && __GNUC__ */
#ifdef __cplusplus
}
+2 -2
View File
@@ -10,7 +10,7 @@
* Architecture-specific structure passed to signal handlers
*/
#if __INTEL__
#if __i386__
typedef struct packed_fp_stack {
unsigned char st0[10];
@@ -146,6 +146,6 @@ struct vregs {
unsigned long ebx;
};
#endif /* __INTEL__ */
#endif /* __i386__ */
#endif /* _ARCH_SIGNAL_H_ */
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef _FENV_H
#define _FENV_H
#if defined(__INTEL__)
#if defined(__i386__)
# include <arch/x86/fenv.h>
#elif defined(__x86_64__)
# include <arch/x86_64/fenv.h>
+1 -1
View File
@@ -49,7 +49,7 @@ check_r5_compatibility()
if (!__gR5Compatibility)
return false;
#ifndef __INTEL__
#ifndef __i386__
return false;
#else
+5 -5
View File
@@ -31,7 +31,7 @@ int32 get_rounded_cpu_speed(void);
#endif
#if defined(__INTEL__) || defined(__x86_64__)
#if defined(__i386__) || defined(__x86_64__)
/*! Tries to parse an Intel CPU ID string to match our usual naming scheme.
Note, this function is not thread safe, and must only be called once
at a time.
@@ -182,7 +182,7 @@ get_cpu_vendor_string(enum cpu_vendor cpuVendor)
}
#if defined(__INTEL__) || defined(__x86_64__)
#if defined(__i386__) || defined(__x86_64__)
/*! Parameter 'name' needs to point to an allocated array of 49 characters. */
void
get_cpuid_model_string(char *name)
@@ -237,21 +237,21 @@ get_cpuid_model_string(char *name)
}
}
}
#endif /* __INTEL__ || __x86_64__ */
#endif /* __i386__ || __x86_64__ */
static const char*
get_cpu_model_string(enum cpu_platform platform, enum cpu_vendor cpuVendor,
uint32 cpuModel)
{
#if defined(__INTEL__) || defined(__x86_64__)
#if defined(__i386__) || defined(__x86_64__)
char cpuidName[49];
#endif
(void)cpuVendor;
(void)cpuModel;
#if defined(__INTEL__) || defined(__x86_64__)
#if defined(__i386__) || defined(__x86_64__)
if (platform != B_CPU_x86 && platform != B_CPU_x86_64)
return NULL;
+1 -1
View File
@@ -549,7 +549,7 @@ extern void _kern_clear_caches(void *address, size_t length,
extern bool _kern_cpu_enabled(int32 cpu);
extern status_t _kern_set_cpu_enabled(int32 cpu, bool enabled);
#if defined(__INTEL__) || defined(__x86_64__)
#if defined(__i386__) || defined(__x86_64__)
// our only x86 only syscall
extern status_t _kern_get_cpuid(cpuid_info *info, uint32 eax, uint32 cpu);
#endif