diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 308ec70..9a6147d 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,5 +1,9 @@ 2017-10-21 Eric Botcazou <ebotcazou@adacore.com> + * gcc-interface/Makefile.in: Remove bogus settings for VxWorks. + +2017-10-21 Eric Botcazou <ebotcazou@adacore.com> + * gcc-interface/utils.c (pad_type_hash): Use hashval_t for hash value. (convert): Do not use an unchecked conversion for converting from a type to another type padding it. diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index 2fa47ca..f2f0058 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -627,10 +627,10 @@ ifeq ($(strip $(filter-out %86 x86_64 wrs vxworks vxworks7,$(target_cpu) $(targe ifeq ($(strip $(filter-out x86_64, $(target_cpu))),) X86CPU=x86_64 - LIBGNAT_TARGET_PAIRS=s-atocou.adb<libgnat/s-atocou__builtin.adb + LIBGNAT_TARGET_PAIRS=$(X86_64_TARGET_PAIRS) else X86CPU=x86 - LIBGNAT_TARGET_PAIRS=s-atocou.adb<libgnat/s-atocou__x86.adb + LIBGNAT_TARGET_PAIRS=$(X86_TARGET_PAIRS) endif LIBGNAT_TARGET_PAIRS+= \ @@ -653,10 +653,7 @@ ifeq ($(strip $(filter-out %86 x86_64 wrs vxworks vxworks7,$(target_cpu) $(targe g-socthi.ads<libgnat/g-socthi__vxworks.ads \ g-socthi.adb<libgnat/g-socthi__vxworks.adb \ g-stsifd.adb<libgnat/g-stsifd__sockets.adb \ - $(ATOMICS_TARGET_PAIRS) \ - $(CERTMATH_TARGET_PAIRS) \ - $(CERTMATH_TARGET_PAIRS_SQRT_FPU) \ - $(CERTMATH_TARGET_PAIRS_X86TRA) + $(ATOMICS_TARGET_PAIRS) TOOLS_TARGET_PAIRS=indepsw.adb<indepsw-gnu.adb @@ -745,8 +742,7 @@ ifeq ($(strip $(filter-out %86 x86_64 wrs vxworks vxworks7,$(target_cpu) $(targe endif endif - EXTRA_GNATRTL_NONTASKING_OBJS += s-stchop.o \ - $(CERTMATH_GNATRTL_OBJS) $(CERTMATH_GNATRTL_X86TRA_OBJS) + EXTRA_GNATRTL_NONTASKING_OBJS += s-stchop.o EXTRA_GNATRTL_TASKING_OBJS += i-vxinco.o s-vxwork.o s-vxwext.o EXTRA_LIBGNAT_OBJS+=vx_stack_info.o @@ -845,7 +841,7 @@ ifeq ($(strip $(filter-out arm% coff wrs vx%,$(target_cpu) $(target_vendor) $(ta endif endif - EXTRA_GNATRTL_NONTASKING_OBJS=i-vxwork.o i-vxwoio.o $(CERTMATH_GNATRTL_OBJS) \ + EXTRA_GNATRTL_NONTASKING_OBJS=i-vxwork.o i-vxwoio.o \ s-stchop.o EXTRA_GNATRTL_TASKING_OBJS=i-vxinco.o s-vxwork.o s-vxwext.o |