projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 022ed17)
* gcc-interface/Makefile.in (s-traceb.o): Adjust rules.
authorBob Duff <duff@adacore.com>
Thu, 31 Jul 2014 10:16:33 +0000 (10:16 +0000)
committerArnaud Charlet <charlet@gcc.gnu.org>
Thu, 31 Jul 2014 10:16:33 +0000 (12:16 +0200)
From-SVN: r213342

gcc/ada/ChangeLog patch | blob | history
gcc/ada/gcc-interface/Makefile.in patch | blob | history

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 8daa4dc2a376db29eee1a30663b452d977db0abd..c1698288919f43922d5d074f426a570c3ba0c6b8 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -80,6 +80,7 @@
        * s-traceb.adb, s-traceb-hpux.adb, s-traceb-mastop.adb:
        (Call_Chain): Add 1 to number of frames to skip, to account for
        the fact that there's one more frame on the stack.
+       * gcc-interface/Makefile.in (s-traceb.o): Adjust rules.
 
 2014-07-31  Robert Dewar  <dewar@adacore.com>
 
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index fb06b6bcca3384a2662e5c16e4e9947e9e056cad..c4c81e50a39637d1697eb94f56eae30ed40e7ad9 100644 (file)
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -106,6 +106,7 @@ GNATBIND_FLAGS = -static -x
 ADA_CFLAGS =
 ADAFLAGS = -W -Wall -gnatpg -gnata
 FORCE_DEBUG_ADAFLAGS = -g
+NO_INLINE_ADAFLAGS = -fno-inline
 NO_SIBLING_ADAFLAGS = -fno-optimize-sibling-calls
 NO_REORDER_ADAFLAGS = -fno-toplevel-reorder
 GNATLIBFLAGS = -W -Wall -gnatpg -nostdinc
@@ -2997,14 +2998,14 @@ ADA_RTL_OBJ_DIR = $(libsubdir)/adalib
 
 # force no sibling call optimization on s-traceb.o so the number of stack
 # frames to be skipped when computing a call chain is not modified by
-# optimization.
+# optimization. We don't want inlining, either.
 
 s-traceb.o  : s-traceb.adb s-traceb.ads
-       $(CC) -c $(ALL_ADAFLAGS) $(FORCE_DEBUG_ADAFLAGS) \
+       $(CC) -c $(ALL_ADAFLAGS) $(FORCE_DEBUG_ADAFLAGS) $(NO_INLINE_ADAFLAGS) \
              $(NO_SIBLING_ADAFLAGS) $(ADA_INCLUDES) $< $(OUTPUT_OPTION)
 
-# force debugging information on s-tasdeb.o so that it is always
-# possible to set conditional breakpoints on tasks.
+# compile s-tasdeb.o without optimization and with debug info so that it is
+# always possible to set conditional breakpoints on tasks.
 
 s-tasdeb.o  : s-tasdeb.adb s-tasdeb.ads
        $(CC) -c $(ALL_ADAFLAGS) $(FORCE_DEBUG_ADAFLAGS) -O0 $(ADA_INCLUDES) \