summaryrefslogtreecommitdiff
path: root/sysdeps/i386
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/i386')
-rw-r--r--sysdeps/i386/__longjmp.S2
-rw-r--r--sysdeps/i386/bits/endian.h (renamed from sysdeps/i386/bytesex.h)0
-rw-r--r--sysdeps/i386/bits/huge_val.h (renamed from sysdeps/i386/huge_val.h)8
-rw-r--r--sysdeps/i386/bits/select.h (renamed from sysdeps/i386/selectbits.h)8
-rw-r--r--sysdeps/i386/bits/setjmp.h (renamed from sysdeps/i386/jmp_buf.h)0
-rw-r--r--sysdeps/i386/dl-machine.h4
-rw-r--r--sysdeps/i386/fpu/bits/fenv.h (renamed from sysdeps/i386/fpu/fenvbits.h)8
-rw-r--r--sysdeps/i386/fpu/bits/mathdef.h (renamed from sysdeps/i386/fpu/mathbits.h)8
-rw-r--r--sysdeps/i386/fpu/bits/mathinline.h (renamed from sysdeps/i386/fpu/__math.h)6
-rw-r--r--sysdeps/i386/setjmp.S2
10 files changed, 24 insertions, 22 deletions
diff --git a/sysdeps/i386/__longjmp.S b/sysdeps/i386/__longjmp.S
index f6331d496d..0ec5d26a38 100644
--- a/sysdeps/i386/__longjmp.S
+++ b/sysdeps/i386/__longjmp.S
@@ -19,7 +19,7 @@
#include <sysdep.h>
#define _ASM
-#include <jmp_buf.h>
+#include <bits/setjmp.h>
ENTRY (__longjmp)
movl 4(%esp), %ecx /* User's jmp_buf in %ecx. */
diff --git a/sysdeps/i386/bytesex.h b/sysdeps/i386/bits/endian.h
index a5d6c5ea92..a5d6c5ea92 100644
--- a/sysdeps/i386/bytesex.h
+++ b/sysdeps/i386/bits/endian.h
diff --git a/sysdeps/i386/huge_val.h b/sysdeps/i386/bits/huge_val.h
index fa071452fb..65a06d8f3c 100644
--- a/sysdeps/i386/huge_val.h
+++ b/sysdeps/i386/bits/huge_val.h
@@ -18,8 +18,10 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _HUGE_VAL_H
-#define _HUGE_VAL_H 1
+#ifndef _MATH_H
+#error "Never use <bits/huge_val.h> directly; include <math.h> instead."
+#endif
+
#include <features.h>
#include <sys/cdefs.h>
@@ -66,5 +68,3 @@ static __huge_vall_t __huge_vall = { __HUGE_VALL_bytes };
#endif /* GCC. */
#endif /* __USE_ISOC9X. */
-
-#endif /* huge_val.h */
diff --git a/sysdeps/i386/selectbits.h b/sysdeps/i386/bits/select.h
index 973ecad58e..3912515a7f 100644
--- a/sysdeps/i386/selectbits.h
+++ b/sysdeps/i386/bits/select.h
@@ -16,8 +16,10 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _SELECTBITS_H
-#define _SELECTBITS_H 1
+#ifndef _SYS_SELECT_H
+#error "Never use <bits/select.h> directly; include <sys/select.h> instead."
+#endif
+
#if defined __GNUC__ && __GNUC__ >= 2
@@ -53,5 +55,3 @@
#define __FD_ISSET(d, set) ((set)->fds_bits[__FDELT(d)] & __FDMASK(d))
#endif /* GNU CC */
-
-#endif /* selectbits.h */
diff --git a/sysdeps/i386/jmp_buf.h b/sysdeps/i386/bits/setjmp.h
index 0c03073b36..0c03073b36 100644
--- a/sysdeps/i386/jmp_buf.h
+++ b/sysdeps/i386/bits/setjmp.h
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index 6efa32bcd1..64d36ca1a9 100644
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -263,6 +263,10 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
switch (ELF32_R_TYPE (reloc->r_info))
{
case R_386_COPY:
+ if (sym == NULL)
+ /* This can happen in trace mode if an object could not be
+ found. */
+ break;
if (sym->st_size > refsym->st_size
|| (_dl_verbose && sym->st_size < refsym->st_size))
{
diff --git a/sysdeps/i386/fpu/fenvbits.h b/sysdeps/i386/fpu/bits/fenv.h
index bea89a15b1..63f3e52958 100644
--- a/sysdeps/i386/fpu/fenvbits.h
+++ b/sysdeps/i386/fpu/bits/fenv.h
@@ -16,10 +16,10 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-/* This file should never be included directly. */
+#ifndef _FENV_H
+#error "Never use <bits/fenv.h> directly; include <fenv.h> instead."
+#endif
-#ifndef _FENVBITS_H
-#define _FENVBITS_H 1
/* Define bits representing the exception. We use the bit positions
of the appropriate bits in the FPU control word. */
@@ -87,5 +87,3 @@ fenv_t;
/* Floating-point environment where none of the exception is masked. */
# define FE_NOMASK_ENV ((fenv_t *) -2)
#endif
-
-#endif /* fenvbits.h */
diff --git a/sysdeps/i386/fpu/mathbits.h b/sysdeps/i386/fpu/bits/mathdef.h
index f4a22c0757..2387a39510 100644
--- a/sysdeps/i386/fpu/mathbits.h
+++ b/sysdeps/i386/fpu/bits/mathdef.h
@@ -16,8 +16,10 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _MATHBITS_H
-#define _MATHBITS_H 1
+#ifndef _MATH_H
+# error "Never use <bits/mathdef.h> directly; include <math.h> instead"
+#endif
+
/* The ix87 FPUs evaluate all values in the 80 bit floating-point format
which is also available for the user as `long double'. Therefore
@@ -37,5 +39,3 @@ typedef long double double_t; /* `double' expressions are evaluated as
/* The values returned by `ilogb' for 0 and NaN respectively. */
#define FP_ILOGB0 0x80000000
#define FP_ILOGBNAN 0x80000000
-
-#endif /* mathbits.h */
diff --git a/sysdeps/i386/fpu/__math.h b/sysdeps/i386/fpu/bits/mathinline.h
index 9e1c23cec0..d5c480a51a 100644
--- a/sysdeps/i386/fpu/__math.h
+++ b/sysdeps/i386/fpu/bits/mathinline.h
@@ -18,8 +18,8 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef __MATH_H
-#define __MATH_H 1
+#ifndef _BITS_MATHINLINE_H
+#define _BITS_MATHINLINE_H 1
#if defined __GNUG__ && \
(__GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ <= 7))
@@ -605,4 +605,4 @@ pow2 (double __x)
#endif /* __NO_MATH_INLINES */
#endif /* __GNUC__ */
-#endif /* __MATH_H */
+#endif /* _BITS_MATHINLINE_H */
diff --git a/sysdeps/i386/setjmp.S b/sysdeps/i386/setjmp.S
index 203c2d16d0..1ba3fc5a75 100644
--- a/sysdeps/i386/setjmp.S
+++ b/sysdeps/i386/setjmp.S
@@ -19,7 +19,7 @@
#include <sysdep.h>
#define _ASM
-#include <jmp_buf.h>
+#include <bits/setjmp.h>
/* Binary compatibility entry point. */
ENTRY (__setjmp)
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 06:33:41 +0000