diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2014-01-22 09:15:03 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2014-01-22 09:15:03 +0000 |
| commit | 3044bbe427434f1dcd74a01130aab9935316d3ad (patch) | |
| tree | f6166a03935dc707c4fb7733d337033eb8df18fb | |
| parent | 4c70d4600d2cf6278a1e5ad407cbf73939c24df7 (diff) | |
| download | gcc-3044bbe427434f1dcd74a01130aab9935316d3ad.zip gcc-3044bbe427434f1dcd74a01130aab9935316d3ad.tar.gz gcc-3044bbe427434f1dcd74a01130aab9935316d3ad.tar.bz2 | |
* gcc-interface/Makefile.in: Minor fixes.
From-SVN: r206918
| -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 a630bc7..5a23f0a 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,7 @@ +2014-01-22 Eric Botcazou <ebotcazou@adacore.com> + + * gcc-interface/Makefile.in: Minor fixes. + 2014-01-21 Robert Dewar <dewar@adacore.com> * par-ch4.adb (P_If_Expression): Rewritten to improve error recovery. diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index 7751971..f60cd2a 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -637,7 +637,7 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworksae,$(target_cpu) $(target_vendor) $(ATOMICS_TARGET_PAIRS) \ $(ATOMICS_BUILTINS_TARGET_PAIRS) - ifeq ($(strip $(filter-out e500%, $(arch))),) + ifeq ($(strip $(filter-out e500%, $(target_alias))),) LIBGNAT_TARGET_PAIRS += system.ads<system-vxworks-e500-vthread.ads else LIBGNAT_TARGET_PAIRS += system.ads<system-vxworks-ppc-vthread.ads @@ -751,7 +751,7 @@ ifeq ($(strip $(filter-out %86 wrs vxworksae vxworksmils,$(target_cpu) $(target_ s-vxwext.adb<s-vxwext-noints.adb \ s-vxwext.ads<s-vxwext-vthreads.ads \ s-vxwork.ads<s-vxwork-x86.ads \ - system.ads<system-vxworks-x86.ads \ + system.ads<system-vxworks-x86-vthread.ads \ $(ATOMICS_TARGET_PAIRS) \ $(ATOMICS_BUILTINS_TARGET_PAIRS) @@ -762,7 +762,7 @@ ifeq ($(strip $(filter-out %86 wrs vxworksae vxworksmils,$(target_cpu) $(target_ EXTRA_GNATRTL_NONTASKING_OBJS=i-vxwork.o i-vxwoio.o s-thread.o EXTRA_GNATRTL_TASKING_OBJS=s-vxwork.o s-vxwext.o - EXTRA_LIBGNAT_OBJS+=vx_stack_info.o # sigtramp-ppcvxw.o + EXTRA_LIBGNAT_OBJS+=vx_stack_info.o GNATRTL_SOCKETS_OBJS = # Extra pairs for the vthreads runtime @@ -1740,6 +1740,7 @@ ifeq ($(strip $(filter-out cygwin% mingw32% pe,$(target_os))),) EXTRA_GNATRTL_NONTASKING_OBJS = \ s-win32.o s-winext.o g-regist.o g-sse.o g-ssvety.o EXTRA_GNATRTL_TASKING_OBJS = a-exetim.o + EXTRA_LIBGNAT_SRCS+=mingw32.h MISCLIB = -lws2_32 |