diff options
| author | Kai Tietz <ktietz@gcc.gnu.org> | 2010-06-12 15:19:17 +0200 |
|---|---|---|
| committer | Kai Tietz <ktietz@gcc.gnu.org> | 2010-06-12 15:19:17 +0200 |
| commit | 57e215e4f732d236ebedc3231dd04faaff041fee (patch) | |
| tree | 4efaeec6d7548d66d2881aa8068f064ba2547d7f /gcc | |
| parent | acb6411a264e66b3059447ddd12601460327622d (diff) | |
| download | gcc-57e215e4f732d236ebedc3231dd04faaff041fee.zip gcc-57e215e4f732d236ebedc3231dd04faaff041fee.tar.gz gcc-57e215e4f732d236ebedc3231dd04faaff041fee.tar.bz2 | |
2010-06-12 Kai Tietz
PR ada/43731
* gcc-interface/Makefile.in: Add rules for multilib x86/x64
mingw targets.
From-SVN: r160662
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 18 |
2 files changed, 20 insertions, 4 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 828f031..83f9636 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2010-06-12 Kai Tietz + + PR ada/43731 + * gcc-interface/Makefile.in: Add rules for multilib x86/x64 + mingw targets. + 2010-06-11 Alexandre Oliva <aoliva@redhat.com> * gcc-interface/utils.c (update_pointer_to): Initialize last. diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index 236903d..8a3254f 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -1637,11 +1637,21 @@ ifeq ($(strip $(filter-out cygwin32% mingw32% pe,$(osys))),) s-taprop.adb<s-taprop-mingw.adb ifeq ($(strip $(filter-out x86_64%,$(arch))),) - LIBGNAT_TARGET_PAIRS += \ - system.ads<system-mingw-x86_64.ads + ifeq ($(strip $(MULTISUBDIR)),/32) + LIBGNAT_TARGET_PAIRS += \ + system.ads<system-mingw.ads + else + LIBGNAT_TARGET_PAIRS += \ + system.ads<system-mingw-x86_64.ads + endif else - LIBGNAT_TARGET_PAIRS += \ - system.ads<system-mingw.ads + ifeq ($(strip $(MULTISUBDIR)),/64) + LIBGNAT_TARGET_PAIRS += \ + system.ads<system-mingw-x86_64.ads + else + LIBGNAT_TARGET_PAIRS += \ + system.ads<system-mingw.ads + endif endif EXTRA_GNATRTL_NONTASKING_OBJS = \ |