diff mbox

[Cilkplus] Patch to fix unused variable

Message ID 2950715866004049A240A2F9BB410E7315FB28F60F@azsmsx502.amr.corp.intel.com
State New
Headers show

Commit Message

Iyer, Balaji V Nov. 11, 2011, 4:21 p.m. UTC
Forgot to mention.. this is the 4th and final patch in this sequence.

Thanks,

Balaji V. Iyer.

Comments

H.J. Lu Nov. 11, 2011, 5:54 p.m. UTC | #1
On Fri, Nov 11, 2011 at 8:21 AM, Iyer, Balaji V <balaji.v.iyer@intel.com> wrote:
> Forgot to mention.. this is the 4th and final patch in this sequence.
>
> Thanks,
>
> Balaji V. Iyer.
> ________________________________________
> From: Iyer, Balaji V
> Sent: Friday, November 11, 2011 11:16 AM
> To: gcc-patches@gcc.gnu.org
> Subject: [PATCH][Cilkplus] Patch to fix unused variable
>
> Hello Everyone,
>    This patch is for the Cilkplus branch affecting both C and C++ compilers. This patch will fix an unused variable warning in collect2.c by enclosing the variable inside #ifdef TARGET_AIX_VERSION.
>
> Thanks,
>
> Balaji V. Iyer.
>

I believe this has been fixed on mainline.  You should imply merge with
mainline to get the proper fix.

I checked in the first 3 patches for you.  Please always use a complete
separate ChangeLog entry for each change when someone else has to
check it in for you.

Thanks.
diff mbox

Patch

diff --git a/gcc/ChangeLog.cilk b/gcc/ChangeLog.cilk
index ea3dc6e..8893b9a 100644
--- a/gcc/ChangeLog.cilk
+++ b/gcc/ChangeLog.cilk
@@ -6,6 +6,8 @@ 
 	(wrapper_local_cb): Likewise.
 	* opts.c: Removed the CILKPLUS_IMPLEMENTED macro and the #ifdef and
 	#ifndefs that uses this macro.
+	* collect2.c (main): Enclosed object_nbr declaration inside a
+	#ifdef TARGET_AIX_VERSION.
 
 2011-10-22  Balaji V. Iyer  <balaji.v.iyer@intel.com>
 
diff --git a/gcc/collect2.c b/gcc/collect2.c
index 9240bc8..92ef7ba 100644
--- a/gcc/collect2.c
+++ b/gcc/collect2.c
@@ -1091,7 +1091,9 @@  main (int argc, char **argv)
   const char **ld2;
   char **object_lst;
   const char **object;
+#ifdef TARGET_AIX_VERSION
   int object_nbr = argc;
+#endif
   int first_file;
   int num_c_args;
   char **old_argv;