FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make-lang.in: Define EH_MECHANISM while building raise-gcc.c.

Browse source 
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
This commit is contained in:
Tristan Gingold 2017-04-27 13:54:41 +00:00 • committed by Arnaud Charlet
parent 8ab31c0c31
commit a96eb6f2d7
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gcc/ada/ChangeLog
View file

@ -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.

13
gcc/ada/gcc-interface/Make-lang.in
View file

@ -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