diff options
Diffstat (limited to 'sysdeps/m68k')
| -rw-r--r-- | sysdeps/m68k/bits/endian.h (renamed from sysdeps/m68k/bytesex.h) | 0 | ||||
| -rw-r--r-- | sysdeps/m68k/bits/huge_val.h (renamed from sysdeps/m68k/huge_val.h) | 26 | ||||
| -rw-r--r-- | sysdeps/m68k/bits/setjmp.h (renamed from sysdeps/m68k/jmp_buf.h) | 0 | ||||
| -rw-r--r-- | sysdeps/m68k/dl-machine.h | 4 | ||||
| -rw-r--r-- | sysdeps/m68k/fpu/bits/fenv.h (renamed from sysdeps/m68k/fpu/fenvbits.h) | 8 | ||||
| -rw-r--r-- | sysdeps/m68k/fpu/bits/mathdef.h (renamed from sysdeps/m68k/fpu/mathbits.h) | 8 | ||||
| -rw-r--r-- | sysdeps/m68k/fpu/bits/mathinline.h (renamed from sysdeps/m68k/fpu/__math.h) | 0 | ||||
| -rw-r--r-- | sysdeps/m68k/fpu/switch/bits/mathinline.h (renamed from sysdeps/m68k/fpu/switch/__math.h) | 0 |
8 files changed, 24 insertions, 22 deletions
diff --git a/sysdeps/m68k/bytesex.h b/sysdeps/m68k/bits/endian.h index 6f985293f2..6f985293f2 100644 --- a/sysdeps/m68k/bytesex.h +++ b/sysdeps/m68k/bits/endian.h diff --git a/sysdeps/m68k/huge_val.h b/sysdeps/m68k/bits/huge_val.h index c71454e9a8..822b82930b 100644 --- a/sysdeps/m68k/huge_val.h +++ b/sysdeps/m68k/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> @@ -28,7 +30,7 @@ #ifdef __GNUC__ -#define HUGE_VAL \ +# define HUGE_VAL \ (__extension__ \ ((union { unsigned long long __l; double __d; }) \ { __l: 0x7ff0000000000000ULL }).__d) @@ -37,7 +39,7 @@ static union { unsigned char __c[8]; double __d; } __huge_val = { { 0x7f, 0xf0, 0, 0, 0, 0, 0, 0 } }; -#define HUGE_VAL (__huge_val.__d) +# define HUGE_VAL (__huge_val.__d) #endif /* GCC. */ @@ -46,30 +48,28 @@ static union { unsigned char __c[8]; double __d; } __huge_val = #ifdef __USE_ISOC9X -#ifdef __GNUC__ +# ifdef __GNUC__ -#define HUGE_VALF \ +# define HUGE_VALF \ (__extension__ \ ((union { unsigned long __l; float __f; }) \ { __l: 0x7f800000UL }).__f) -#define HUGE_VALL \ +# define HUGE_VALL \ (__extension__ \ ((union { unsigned long __l[3]; long double __ld; }) \ { __l: { 0x7fff0000UL, 0x80000000UL, 0UL } }).__ld) -#else /* not GCC */ +# else /* not GCC */ static union { unsigned char __c[4]; float __f; } __huge_valf = { { 0x7f, 0x80, 0, 0 } }; -#define HUGE_VALF (__huge_valf.__f) +# define HUGE_VALF (__huge_valf.__f) static union { unsigned char __c[12]; long double __ld; } __huge_vall = { { 0x7f, 0xff, 0, 0, 0x80, 0, 0, 0, 0, 0, 0, 0 } }; -#define HUGE_VALL (__huge_vall.__ld) +# define HUGE_VALL (__huge_vall.__ld) -#endif /* GCC. */ +# endif /* GCC. */ #endif /* __USE_ISOC9X. */ - -#endif /* huge_val.h */ diff --git a/sysdeps/m68k/jmp_buf.h b/sysdeps/m68k/bits/setjmp.h index 96240f0d8e..96240f0d8e 100644 --- a/sysdeps/m68k/jmp_buf.h +++ b/sysdeps/m68k/bits/setjmp.h diff --git a/sysdeps/m68k/dl-machine.h b/sysdeps/m68k/dl-machine.h index 1523ddb1c6..e50f773614 100644 --- a/sysdeps/m68k/dl-machine.h +++ b/sysdeps/m68k/dl-machine.h @@ -227,6 +227,10 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, switch (ELF32_R_TYPE (reloc->r_info)) { case R_68K_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/m68k/fpu/fenvbits.h b/sysdeps/m68k/fpu/bits/fenv.h index b653b1aafd..ce071b93ff 100644 --- a/sysdeps/m68k/fpu/fenvbits.h +++ b/sysdeps/m68k/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 FPSR Accrued Exception Byte. */ @@ -76,5 +76,3 @@ fenv_t; /* Floating-point environment where none of the exceptions are masked. */ # define FE_NOMASK_ENV ((fenv_t *) -2) #endif - -#endif /* fenvbits.h */ diff --git a/sysdeps/m68k/fpu/mathbits.h b/sysdeps/m68k/fpu/bits/mathdef.h index 049662319a..4d07176405 100644 --- a/sysdeps/m68k/fpu/mathbits.h +++ b/sysdeps/m68k/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 m68k FPUs evaluate all values in the 96 bit floating-point format which is also available for the user as `long double'. Therefore we @@ -32,5 +34,3 @@ typedef long double double_t; /* `double' expressions are evaluated as /* Define `INFINITY' as value of type `float_t'. */ #define INFINITY HUGE_VALL - -#endif /* mathbits.h */ diff --git a/sysdeps/m68k/fpu/__math.h b/sysdeps/m68k/fpu/bits/mathinline.h index bdeaa9efb0..bdeaa9efb0 100644 --- a/sysdeps/m68k/fpu/__math.h +++ b/sysdeps/m68k/fpu/bits/mathinline.h diff --git a/sysdeps/m68k/fpu/switch/__math.h b/sysdeps/m68k/fpu/switch/bits/mathinline.h index c0f6966981..c0f6966981 100644 --- a/sysdeps/m68k/fpu/switch/__math.h +++ b/sysdeps/m68k/fpu/switch/bits/mathinline.h |