diff options
| author | Tristan Gingold <gingold@adacore.com> | 2017-04-27 13:54:41 +0000 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2017-04-27 15:54:41 +0200 |
| commit | a96eb6f2d7efc24f1be6a3cca2b7437fc6059779 (patch) | |
| tree | 2705512ae39b27e5ff34a83c70b3f3a4728e5465 /gcc | |
| parent | 8ab31c0c31ecf1fa368974dc98196955cb2c25cd (diff) | |
| download | gcc-a96eb6f2d7efc24f1be6a3cca2b7437fc6059779.zip gcc-a96eb6f2d7efc24f1be6a3cca2b7437fc6059779.tar.gz gcc-a96eb6f2d7efc24f1be6a3cca2b7437fc6059779.tar.bz2 | |
Make-lang.in: Define EH_MECHANISM while building raise-gcc.c.
2017-04-27 Tristan Gingold <gingold@adacore.com>
* gcc-interface/Make-lang.in: Define EH_MECHANISM while building
raise-gcc.c. Fix include search path for raise-gcc.c
From-SVN: r247339
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/Make-lang.in | 13 |
2 files changed, 12 insertions, 6 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 667d863..3bab80e 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2017-04-27 Tristan Gingold <gingold@adacore.com> + + * gcc-interface/Make-lang.in: Define EH_MECHANISM while building + raise-gcc.c. Fix include search path for raise-gcc.c + 2017-04-27 Eric Botcazou <ebotcazou@adacore.com> * fe.h (Warn_On_Questionable_Layout): Declare. diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in index 10c865f..fa04e80 100644 --- a/gcc/ada/gcc-interface/Make-lang.in +++ b/gcc/ada/gcc-interface/Make-lang.in @@ -99,8 +99,6 @@ ADA_TOOLS=gnatbind gnatchop gnat gnatkr gnatlink gnatls gnatmake \ ada-warn = $(ADA_CFLAGS) $(filter-out -pedantic, $(STRICT_WARN)) # Unresolved warnings in specific files. ada/adaint.o-warn = -Wno-error -# For unwind-pe.h -CFLAGS-ada/raise-gcc.o += -I$(srcdir)/../libgcc -Iinclude ada/%.o: ada/gcc-interface/%.c $(COMPILE) $< @@ -611,17 +609,20 @@ TARGET_ADA_SRCS = # Select the right s-excmac according to exception layout (Itanium or arm) host_cpu=$(word 1, $(subst -, ,$(host))) -EH_MECHANISM=-gcc +EH_MECHANISM=gcc ifeq ($(strip $(filter-out arm%,$(host_cpu))),) -EH_MECHANISM=-arm +EH_MECHANISM=arm endif +# For unwind-pe.h +CFLAGS-ada/raise-gcc.o += -I$(srcdir)/../libgcc -DEH_MECHANISM_$(EH_MECHANISM) + ada/s-excmac.o: ada/s-excmac.ads ada/s-excmac.adb -ada/s-excmac.ads: $(srcdir)/ada/s-excmac$(EH_MECHANISM).ads +ada/s-excmac.ads: $(srcdir)/ada/s-excmac-$(EH_MECHANISM).ads $(CP) $< $@ -ada/s-excmac.adb: $(srcdir)/ada/s-excmac$(EH_MECHANISM).adb +ada/s-excmac.adb: $(srcdir)/ada/s-excmac-$(EH_MECHANISM).adb $(CP) $< $@ # Needs to be built with CC=gcc |