From db19be6b84c89b8dbcbe6abe85a1c1daea384100 Mon Sep 17 00:00:00 2001
From: Andrew Hsieh <andrewhsieh@google.com>
Date: Wed, 3 Apr 2013 14:09:57 +0800
Subject: Misc fixes

1. Fixed darwin build of GCC 4.8/X86 by removing trailing
   ',' from the last item of enum.  Not discovered before
   because GCC 4.8 now builds with -Wall -Werror, and gcc-4.2.1
   in darwin is picky about that
2. Fixed -fuse-ld=mcld

Change-Id: I7b65edfb76841f14c3290acb5a98f556d00e1139
---
 gcc-4.4.3/gcc/config/i386/i386.h    | 2 +-
 gcc-4.6/gcc/config/i386/i386.h      | 2 +-
 gcc-4.7/gcc/config/i386/i386-opts.h | 2 +-
 gcc-4.8/gcc/collect2.c              | 2 +-
 gcc-4.8/gcc/config/i386/i386-opts.h | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gcc-4.4.3/gcc/config/i386/i386.h b/gcc-4.4.3/gcc/config/i386/i386.h
index d611fe632..1c9d8b52f 100644
--- a/gcc-4.4.3/gcc/config/i386/i386.h
+++ b/gcc-4.4.3/gcc/config/i386/i386.h
@@ -2519,7 +2519,7 @@ struct machine_function GTY(())
 
 enum stack_protector_guard {
   SSP_TLS,      /* per-thread canary at %gs:20 */
-  SSP_GLOBAL,   /* global canary */
+  SSP_GLOBAL    /* global canary */
 };
 
 extern enum stack_protector_guard ix86_stack_protector_guard;
diff --git a/gcc-4.6/gcc/config/i386/i386.h b/gcc-4.6/gcc/config/i386/i386.h
index d7714f7e4..e1a1dc84c 100644
--- a/gcc-4.6/gcc/config/i386/i386.h
+++ b/gcc-4.6/gcc/config/i386/i386.h
@@ -2380,7 +2380,7 @@ extern void debug_dispatch_window (int);
 
 enum stack_protector_guard {
   SSP_TLS,      /* per-thread canary at %gs:20 */
-  SSP_GLOBAL,   /* global canary */
+  SSP_GLOBAL    /* global canary */
 };
 
 extern enum stack_protector_guard ix86_stack_protector_guard;
diff --git a/gcc-4.7/gcc/config/i386/i386-opts.h b/gcc-4.7/gcc/config/i386/i386-opts.h
index 8904491de..4f92987aa 100644
--- a/gcc-4.7/gcc/config/i386/i386-opts.h
+++ b/gcc-4.7/gcc/config/i386/i386-opts.h
@@ -84,7 +84,7 @@ enum ix86_veclibabi {
 
 enum stack_protector_guard {
   SSP_TLS,      /* per-thread canary at %gs:20 */
-  SSP_GLOBAL,   /* global canary */
+  SSP_GLOBAL    /* global canary */
 };
 
 #endif
diff --git a/gcc-4.8/gcc/collect2.c b/gcc-4.8/gcc/collect2.c
index dc094ed02..bc180eb04 100644
--- a/gcc-4.8/gcc/collect2.c
+++ b/gcc-4.8/gcc/collect2.c
@@ -854,7 +854,7 @@ main (int argc, char **argv)
       "ld",
       PLUGIN_LD_SUFFIX,
       "ld.gold",
-      "ld.bfd"
+      "ld.bfd",
       "ld.mcld"
     };
   static const char *const real_ld_suffix = "real-ld";
diff --git a/gcc-4.8/gcc/config/i386/i386-opts.h b/gcc-4.8/gcc/config/i386/i386-opts.h
index 3f3ce13be..d2421b573 100644
--- a/gcc-4.8/gcc/config/i386/i386-opts.h
+++ b/gcc-4.8/gcc/config/i386/i386-opts.h
@@ -87,7 +87,7 @@ enum ix86_veclibabi {
 
 enum stack_protector_guard {
   SSP_TLS,      /* per-thread canary at %gs:20 */
-  SSP_GLOBAL,   /* global canary */
+  SSP_GLOBAL    /* global canary */
 };
 
 #endif
-- 
cgit v1.2.3