Merge from gcc:

2008-08-16  Nicolas Roche  <roche@adacore.com>
* Makefile.tpl: Add BOOT_ADAFLAGS.
* Makefile.in: Regenerate.

diff --git a/ChangeLog b/ChangeLog
index b6cd912de8a568f893041f523692b96d98947903..7d2bd9c7da0f26c1c52ec06402081ebdd6de4076 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-16  Nicolas Roche  <roche@adacore.com>
+
+       * Makefile.tpl: Add BOOT_ADAFLAGS.
+       * Makefile.in: Regenerate.
+
 2008-08-16  Richard Sandiford  <rdsandiford@googlemail.com>
 
        * configure.ac (mips*-*-*linux*, mips*-*-gnu*): Use mt-mips-gnu.

diff --git a/Makefile.in b/Makefile.in
index d9ef0681497579c218dea12335f0edc8eff87e7b..2ede05810ee5a83535ee0d023a10af7c867e9511 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -291,6 +291,7 @@ BUILD_PREFIX_1 = @BUILD_PREFIX_1@
 # here so that they can be overridden by Makefile fragments.
 BOOT_CFLAGS= -g -O2
 BOOT_LDFLAGS=
+BOOT_ADAFLAGS=-gnatpg -gnata
 
 BISON = @BISON@
 YACC = @YACC@

diff --git a/Makefile.tpl b/Makefile.tpl
index 1f0c318012fa18abc36f2dc260409fcc41dd192b..a9dfd3e2af46a3a1de48c932e3ea5909bdb62bd4 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -294,6 +294,7 @@ BUILD_PREFIX_1 = @BUILD_PREFIX_1@
 # here so that they can be overridden by Makefile fragments.
 BOOT_CFLAGS= -g -O2
 BOOT_LDFLAGS=
+BOOT_ADAFLAGS=-gnatpg -gnata
 
 BISON = @BISON@
 YACC = @YACC@