From 93a87598b928f58f9e467bea8c718c5e2c91e498 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Wed, 30 Jul 2014 13:01:18 +0200 Subject: [multiple changes] 2014-07-30 Doug Rupp * adaint.c (__gnat_tmp_name) [__ANDROID__]: Default to putting temp files in /cache directory unless overridden by TMPDIR. 2014-07-30 Jose Ruiz * s-tassta.adb, s-tarest.adb (Initialize, Create_Task, Create_Restricted_Task): Remove redundant check. Number_Of_CPUs returns type CPU, so it can never be greater than CPU_Range'Last. 2014-07-30 Bob Duff * s-taskin.ads: Minor comment fix. 2014-07-30 Thomas Quinot * g-socket.adb: Remove now useless WITH, USE, and USE TYPE clauses. 2014-07-30 Yannick Moy * debug.adb: Free debug flag dQ used for frontend inlining in GNATprove mode.. * sem_ch6.adb (Analyze_Subprogram_Body_Helper): Remove test of debug flag.. 2014-07-30 Thomas Quinot * Make-generated.in: Remove generation of s-oscons.ads, only generate the xoscons utility, in runtime-agnostic rules. * gcc-interface/Makefile.in: Clean up rules. Remove VMS parts, no longer supported. From-SVN: r213250 --- gcc/ada/gcc-interface/Makefile.in | 251 ++++++++++++++++---------------------- 1 file changed, 108 insertions(+), 143 deletions(-) (limited to 'gcc/ada/gcc-interface') diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index 5c36962..a05e852 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-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. #This file is part of GCC. @@ -454,6 +454,16 @@ EXTRA_LIBGNAT_OBJS= # file (included files). EXTRA_LIBGNAT_SRCS= +# GCC spec files to be installed in $(libsubdir), so --specs= +# finds them at runtime. Sequences of alphanum characters prefixed with '_' in +# the filename are stripped off at installation time. This is used to strip +# the architecture indications in vxsim spec filenames, installing e.g. +# vxsim_ppc.spec as vxsim.spec. This allows setting up pretty general self +# specs to perform -vxsim -> --specs=<...> translations without causing +# conflicts since the specs are installed in a target specific subdirectory. +# +GCC_SPEC_FILES= + # $(filter-out PATTERN...,TEXT) removes all PATTERN words from TEXT. # $(strip STRING) removes leading and trailing spaces from STRING. # If what's left is null then it's a match. @@ -563,6 +573,9 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks,$(target_cpu) $(target_vendor) $ s-vxwext.adb s-oscons-tmplt.s +OSCONS_CC=$(subst ./xgcc,../../xgcc,$(subst -B./, -B../../,$(GCC_FOR_TARGET))) -else -# GCC_FOR_TARGET has paths relative to the gcc directory, so we need to adjust -# for running it from $(RTSDIR) -OSCONS_CC=`echo "$(GCC_FOR_TARGET)" \ - | sed -e 's^\./xgcc^../../xgcc^' -e 's^-B./^-B../../^'` -OSCONS_CPP=$(OSCONS_CC) $(GNATLIBCFLAGS) -E -C \ - -DTARGET=\"$(target)\" $(fsrcpfx)ada/s-oscons-tmplt.c > s-oscons-tmplt.i -OSCONS_EXTRACT=$(OSCONS_CC) $(GNATLIBCFLAGS) -S s-oscons-tmplt.i -endif +# The main ada source directory must be on the include path for #include "..." +# because s-oscons-tmplt.c requires adaint.h, gsocket.h, and any file included +# by these headers. However note that we must use -iquote, not -I, so that +# ada/types.h does not conflict with a same-named system header (VxWorks +# has a header). + +OSCONS_CPP=$(OSCONS_CC) $(GNATLIBCFLAGS) $(GNATLIBCFLAGS_FOR_C) -E -C \ + -DTARGET=\"$(target)\" -iquote $(fsrcpfx)ada $(fsrcpfx)ada/s-oscons-tmplt.c > s-oscons-tmplt.i +OSCONS_EXTRACT=$(OSCONS_CC) -S s-oscons-tmplt.i + +# Note: if you need to build with a non-GNU compiler, you could adapt the +# following definitions (written for VMS DEC-C) +#OSCONS_CPP=../../../$(DECC) -E /comment=as_is -DNATIVE \ +# -DTARGET='""$(target)""' -I$(OSCONS_SRCDIR) s-oscons-tmplt.c +# +#OSCONS_EXTRACT=../../../$(DECC) -DNATIVE \ +# -DTARGET='""$(target)""' -I$(OSCONS_SRCDIR) s-oscons-tmplt.c ; \ +# ld -o s-oscons-tmplt.exe s-oscons-tmplt.obj; \ +# ./s-oscons-tmplt.exe > s-oscons-tmplt.s ./bldtools/oscons/xoscons: xoscons.adb xutil.ads xutil.adb -$(MKDIR) ./bldtools/oscons @@ -2759,13 +2730,8 @@ $(RTSDIR)/s-oscons.ads: ../stamp-gnatlib1-$(RTSDIR) s-oscons-tmplt.c gsocket.h . $(OSCONS_EXTRACT) ; \ ../bldtools/oscons/xoscons s-oscons) -# Don't use semicolon separated shell commands that involve list expansions. -# The semicolon triggers a call to DCL on VMS and DCL can't handle command -# line lengths in excess of 256 characters. -# Example: cd $(RTSDIR); ar rc libfoo.a $(LONG_LIST_OF_OBJS) -# is guaranteed to overflow the buffer. - gnatlib: ../stamp-gnatlib1-$(RTSDIR) ../stamp-gnatlib2-$(RTSDIR) $(RTSDIR)/s-oscons.ads + test -f $(RTSDIR)/s-oscons.ads || exit 1 # C files $(MAKE) -C $(RTSDIR) \ CC="`echo \"$(GCC_FOR_TARGET)\" \ @@ -3107,8 +3073,7 @@ socket.o : socket.c gsocket.h sysdep.o : sysdep.c raise.o : raise.c raise.h sigtramp-armdroid.o : sigtramp-armdroid.c sigtramp.h -sigtramp-armvxw.o : sigtramp-armvxw.c sigtramp.h -sigtramp-ppcvxw.o : sigtramp-ppcvxw.c sigtramp.h +sigtramp-vxworks.o : sigtramp-vxworks.c sigtramp.h terminals.o : terminals.c vx_stack_info.o : vx_stack_info.c -- cgit v1.1