lang.opt (fbuiltin-printf): Accept.

	* gcc-interface/lang.opt (fbuiltin-printf): Accept.
	* gcc-interface/misc.c (gnat_handle_option): Ignore it.
	* gcc-interface/lang-specs.h (@ada, @adawhy, @adascil): Propagate -f*
	flags as -g* and -m* flags past -gnatez.

Co-Authored-By: Olivier Hainque <hainque@adacore.com>
From-SVN: r228381

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index a4b159ddd020619e6caa8a95ba8e2f8f9d41addf..6703686c8e4696831078134adda182ca6cf10924 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,11 @@
+2015-10-02  Doug Rupp  <rupp@adacore.com>
+            Olivier Hainque  <hainque@adacore.com>
+
+       * gcc-interface/lang.opt (fbuiltin-printf): Accept.
+       * gcc-interface/misc.c (gnat_handle_option): Ignore it.
+       * gcc-interface/lang-specs.h (@ada, @adawhy, @adascil): Propagate -f*
+       flags as -g* and -m* flags past -gnatez.
+
 2015-10-02  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gcc-interface/trans.c (Pragma_to_gnu) <Pragma_Warnings>: Replace

diff --git a/gcc/ada/gcc-interface/lang-specs.h b/gcc/ada/gcc-interface/lang-specs.h
index 5091fbbd6453755c5e5e9c79eef3d996bfce382e..eece809343d13c8a743e2d2518c0b514172b0b98 100644 (file)
--- a/gcc/ada/gcc-interface/lang-specs.h
+++ b/gcc/ada/gcc-interface/lang-specs.h
@@ -36,12 +36,12 @@
     %{nostdinc*} %{nostdlib*}\
     -dumpbase %{.adb:%b.adb}%{.ads:%b.ads}%{!.adb:%{!.ads:%b.ada}}\
     %{c|S:%{o*:-auxbase-strip %*}%{!o*:-auxbase %b}}%{!c:%{!S:-auxbase %b}} \
-    %{O*} %{W*} %{w} %{p} %{pg:-p} %{d*} %{f*}\
+    %{O*} %{W*} %{w} %{p} %{pg:-p} %{d*} \
     %{coverage:-fprofile-arcs -ftest-coverage} "
 #if defined(TARGET_VXWORKS_RTP)
    "%{fRTS=rtp|fRTS=rtp-smp|fRTS=ravenscar-cert-rtp:-mrtp} "
 #endif
-   "%{gnatea:-gnatez} %{g*&m*} "
+   "%{gnatea:-gnatez} %{g*&m*&f*} "
    "%1 %{!S:%{o*:%w%*-gnatO}} \
     %i %{S:%W{o*}%{!o*:-o %b.s}} \
     %{gnatc*|gnats*: -o %j} %{-param*} \
@@ -54,8 +54,8 @@
     %{nostdinc*} %{nostdlib*}\
     -dumpbase %{.adb:%b.adb}%{.ads:%b.ads}%{!.adb:%{!.ads:%b.ada}}\
     %{o*:-auxbase-strip %*}%{!o*:-auxbase %b} \
-    %{a} %{d*} %{f*} \
-    %{gnatea:-gnatez} %{g*&m*} \
+    %{a} %{d*} \
+    %{gnatea:-gnatez} %{g*&m*&f*} \
     %1 %{o*:%w%*-gnatO} \
     %i \
     %{gnatc*|gnats*: -o %j} %{-param*} ", 0, 0, 0},
@@ -67,8 +67,8 @@
     %{nostdinc*} %{nostdlib*}\
     -dumpbase %{.adb:%b.adb}%{.ads:%b.ads}%{!.adb:%{!.ads:%b.ada}}\
     %{o*:-auxbase-strip %*}%{!o*:-auxbase %b} \
-    %{a} %{d*} %{f*} \
-    %{gnatea:-gnatez} %{g*&m*} \
+    %{a} %{d*} \
+    %{gnatea:-gnatez} %{g*&m*&f*} \
     %1 %{o*:%w%*-gnatO} \
     %i \
     %{gnatc*|gnats*: -o %j} %{-param*} ", 0, 0, 0},

diff --git a/gcc/ada/gcc-interface/lang.opt b/gcc/ada/gcc-interface/lang.opt
index 004388ba26a870699814ffdda93046836ef46a71..6c260c010240de45cf4d4ba732c696f1cad777fe 100644 (file)
--- a/gcc/ada/gcc-interface/lang.opt
+++ b/gcc/ada/gcc-interface/lang.opt
@@ -1,5 +1,5 @@
 ; Options for the Ada front end.
-; Copyright (C) 2003-2013 Free Software Foundation, Inc.
+; Copyright (C) 2003-2015 Free Software Foundation, Inc.
 ;
 ; This file is part of GCC.
 ;
@@ -88,4 +88,8 @@ gnat
 Ada AdaWhy AdaSCIL Joined
 -gnat<options> Specify options to GNAT
 
+fbuiltin-printf
+Ada Undocumented
+Ignored
+
 ; This comment is to ensure we retain the blank line above.

diff --git a/gcc/ada/gcc-interface/misc.c b/gcc/ada/gcc-interface/misc.c
index da91c6f326d04059213b10f062c94f125951fe27..128234223e152f0e280f86edd299ea25c113e8ad 100644 (file)
--- a/gcc/ada/gcc-interface/misc.c
+++ b/gcc/ada/gcc-interface/misc.c
@@ -164,6 +164,11 @@ gnat_handle_option (size_t scode, const char *arg ATTRIBUTE_UNUSED, int value,
       /* This is handled by the middle-end.  */
       break;
 
+    case OPT_fbuiltin_printf:
+      /* This is ignored in Ada but needs to be accepted so it can be
+        defaulted.  */
+      break;
+
     default:
       gcc_unreachable ();
     }