diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 61fb680..079828e 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,7 @@ +2015-06-01 Eric Botcazou <ebotcazou@adacore.com> + + * gcc-interface/Makefile.in: Fix ARM/Darwin configuration. + 2015-06-01 Pierre-Marie de Rodat <derodat@adacore.com> * gcc-interface/utils.c (scale_by_factor_of): When handling a function diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index 90aedb5..6f7615a 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -1,5 +1,5 @@ # Makefile for GNU Ada Compiler (GNAT). -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2015 Free Software Foundation, Inc. #This file is part of GCC. @@ -2338,11 +2338,12 @@ ifeq ($(strip $(filter-out darwin%,$(target_os))),) endif endif - ifeq ($(strip $(filter-out arm,$(arch))),) + ifeq ($(strip $(filter-out arm,$(target_cpu))),) LIBGNAT_TARGET_PAIRS += \ s-intman.adb<s-intman-susv3.adb \ s-osprim.adb<s-osprim-darwin.adb \ - $(ATOMICS_TARGET_PAIRS) + $(ATOMICS_TARGET_PAIRS) \ + $(ATOMICS_BUILTINS_TARGET_PAIRS) LIBGNAT_TARGET_PAIRS += \ system.ads<system-darwin-arm.ads |