aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/i386
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/i386')
-rw-r--r--sysdeps/i386/__longjmp.S1
-rw-r--r--sysdeps/i386/bits/byteswap.h7
-rw-r--r--sysdeps/i386/bits/endian.h4
-rw-r--r--sysdeps/i386/bits/huge_val.h36
-rw-r--r--sysdeps/i386/bits/setjmp.h18
-rw-r--r--sysdeps/i386/elf/setjmp.S1
-rw-r--r--sysdeps/i386/fpu/bits/fenv.h5
7 files changed, 40 insertions, 32 deletions
diff --git a/sysdeps/i386/__longjmp.S b/sysdeps/i386/__longjmp.S
index 0ec5d26a38..7e039deb8f 100644
--- a/sysdeps/i386/__longjmp.S
+++ b/sysdeps/i386/__longjmp.S
@@ -19,6 +19,7 @@
#include <sysdep.h>
#define _ASM
+#define _SETJMP_H
#include <bits/setjmp.h>
ENTRY (__longjmp)
diff --git a/sysdeps/i386/bits/byteswap.h b/sysdeps/i386/bits/byteswap.h
index 326962e621..bf55c890ba 100644
--- a/sysdeps/i386/bits/byteswap.h
+++ b/sysdeps/i386/bits/byteswap.h
@@ -17,8 +17,9 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _BITS_BYTESWAP_H
-#define _BITS_BYTESWAP_H 1
+#if !defined _BYTESWAP_H && !defined _NETINET_IN_H
+# error "Never use <bits/byteswap.h> directly; include <byteswap.h> instead."
+#endif
/* Swap bytes in 16 bit value. */
#define __bswap_constant_16(x) \
@@ -88,5 +89,3 @@
__r.__l[1] = __bswap_32 (__v.__l[0]); \
__r.__ll; })
#endif
-
-#endif /* bits/byteswap.h */
diff --git a/sysdeps/i386/bits/endian.h b/sysdeps/i386/bits/endian.h
index a5d6c5ea92..54bd9d14bb 100644
--- a/sysdeps/i386/bits/endian.h
+++ b/sysdeps/i386/bits/endian.h
@@ -1,3 +1,7 @@
/* i386 is little-endian. */
+#ifndef _ENDIAN_H
+# error "Never use <bits/endian.h> directly; include <endian.h> instead."
+#endif
+
#define __BYTE_ORDER __LITTLE_ENDIAN
diff --git a/sysdeps/i386/bits/huge_val.h b/sysdeps/i386/bits/huge_val.h
index 65a06d8f3c..23127b4031 100644
--- a/sysdeps/i386/bits/huge_val.h
+++ b/sysdeps/i386/bits/huge_val.h
@@ -19,12 +19,10 @@
Boston, MA 02111-1307, USA. */
#ifndef _MATH_H
-#error "Never use <bits/huge_val.h> directly; include <math.h> instead."
+# error "Never use <bits/huge_val.h> directly; include <math.h> instead."
#endif
-
#include <features.h>
-#include <sys/cdefs.h>
/* IEEE positive infinity (-HUGE_VAL is negative infinity). */
@@ -32,11 +30,11 @@
#define __huge_val_t union { unsigned char __c[8]; double __d; }
#ifdef __GNUC__
-#define HUGE_VAL (__extension__ \
+# define HUGE_VAL (__extension__ \
((__huge_val_t) { __c: __HUGE_VAL_bytes }).__d)
#else /* Not GCC. */
static __huge_val_t __huge_val = { __HUGE_VAL_bytes };
-#define HUGE_VAL (__huge_val.__d)
+# define HUGE_VAL (__huge_val.__d)
#endif /* GCC. */
@@ -44,27 +42,27 @@ static __huge_val_t __huge_val = { __HUGE_VAL_bytes };
#ifdef __USE_ISOC9X
-#define __HUGE_VALF_bytes { 0, 0, 0x80, 0x7f }
+# define __HUGE_VALF_bytes { 0, 0, 0x80, 0x7f }
-#define __huge_valf_t union { unsigned char __c[4]; float __f; }
-#ifdef __GNUC__
-#define HUGE_VALF (__extension__ \
+# define __huge_valf_t union { unsigned char __c[4]; float __f; }
+# ifdef __GNUC__
+# define HUGE_VALF (__extension__ \
((__huge_valf_t) { __c: __HUGE_VALF_bytes }).__f)
-#else /* Not GCC. */
+# else /* Not GCC. */
static __huge_valf_t __huge_valf = { __HUGE_VALF_bytes };
-#define HUGE_VALF (__huge_valf.__f)
-#endif /* GCC. */
+# define HUGE_VALF (__huge_valf.__f)
+# endif /* GCC. */
-#define __HUGE_VALL_bytes { 0, 0, 0, 0, 0, 0, 0, 0x80, 0xff, 0x7f, 0, 0 }
+# define __HUGE_VALL_bytes { 0, 0, 0, 0, 0, 0, 0, 0x80, 0xff, 0x7f, 0, 0 }
-#define __huge_vall_t union { unsigned char __c[12]; long double __ld; }
-#ifdef __GNUC__
-#define HUGE_VALL (__extension__ \
+# define __huge_vall_t union { unsigned char __c[12]; long double __ld; }
+# ifdef __GNUC__
+# define HUGE_VALL (__extension__ \
((__huge_vall_t) { __c: __HUGE_VALL_bytes }).__ld)
-#else /* Not GCC. */
+# else /* Not GCC. */
static __huge_vall_t __huge_vall = { __HUGE_VALL_bytes };
-#define HUGE_VALL (__huge_vall.__ld)
-#endif /* GCC. */
+# define HUGE_VALL (__huge_vall.__ld)
+# endif /* GCC. */
#endif /* __USE_ISOC9X. */
diff --git a/sysdeps/i386/bits/setjmp.h b/sysdeps/i386/bits/setjmp.h
index 0c03073b36..5cb60a8c7d 100644
--- a/sysdeps/i386/bits/setjmp.h
+++ b/sysdeps/i386/bits/setjmp.h
@@ -1,12 +1,16 @@
/* Define the machine-dependent type `jmp_buf'. Intel 386 version. */
-#if defined (__USE_MISC) || defined (_ASM)
-#define JB_BX 0
-#define JB_SI 1
-#define JB_DI 2
-#define JB_BP 3
-#define JB_SP 4
-#define JB_PC 5
+#ifndef _SETJMP_H
+# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
+#endif
+
+#if defined __USE_MISC || defined _ASM
+# define JB_BX 0
+# define JB_SI 1
+# define JB_DI 2
+# define JB_BP 3
+# define JB_SP 4
+# define JB_PC 5
#endif
#ifndef _ASM
diff --git a/sysdeps/i386/elf/setjmp.S b/sysdeps/i386/elf/setjmp.S
index d73e84364f..bc4890c215 100644
--- a/sysdeps/i386/elf/setjmp.S
+++ b/sysdeps/i386/elf/setjmp.S
@@ -19,6 +19,7 @@
#include <sysdep.h>
#define _ASM
+#define _SETJMP_H
#include <bits/setjmp.h>
/* We include the BSD entry points here as well but we make
diff --git a/sysdeps/i386/fpu/bits/fenv.h b/sysdeps/i386/fpu/bits/fenv.h
index 63f3e52958..4d06b01be3 100644
--- a/sysdeps/i386/fpu/bits/fenv.h
+++ b/sysdeps/i386/fpu/bits/fenv.h
@@ -17,7 +17,7 @@
Boston, MA 02111-1307, USA. */
#ifndef _FENV_H
-#error "Never use <bits/fenv.h> directly; include <fenv.h> instead."
+# error "Never use <bits/fenv.h> directly; include <fenv.h> instead."
#endif
@@ -61,7 +61,8 @@ enum
typedef unsigned short int fexcept_t;
-/* Type representing floating-point environment. This function corresponds to the layout of the block written by the `fstenv'. */
+/* Type representing floating-point environment. This function corresponds
+ to the layout of the block written by the `fstenv'. */
typedef struct
{
unsigned short int control_word;