svn commit: r198200 - projects/clangbsd/contrib/gcc

[Roman Divacky]

Author: rdivacky
Date: Sun Oct 18 12:48:23 2009
New Revision: 198200
URL: http://svn.freebsd.org/changeset/base/198200

Log:
  Revert most of the adjustments previously needed for clang to build gcc.

Modified:
  projects/clangbsd/contrib/gcc/bitmap.c
  projects/clangbsd/contrib/gcc/cfg.c
  projects/clangbsd/contrib/gcc/dominance.c
  projects/clangbsd/contrib/gcc/haifa-sched.c
  projects/clangbsd/contrib/gcc/longlong.h

Modified: projects/clangbsd/contrib/gcc/bitmap.c
==============================================================================
--- projects/clangbsd/contrib/gcc/bitmap.c	Sun Oct 18 11:28:31 2009	(r198199)
+++ projects/clangbsd/contrib/gcc/bitmap.c	Sun Oct 18 12:48:23 2009	(r198200)
@@ -186,7 +186,7 @@ bitmap_elt_clear_from (bitmap head, bitm
 
 /* Clear a bitmap by freeing the linked list.  */
 
-void
+inline void
 bitmap_clear (bitmap head)
 {
   if (head->first)

Modified: projects/clangbsd/contrib/gcc/cfg.c
==============================================================================
--- projects/clangbsd/contrib/gcc/cfg.c	Sun Oct 18 11:28:31 2009	(r198199)
+++ projects/clangbsd/contrib/gcc/cfg.c	Sun Oct 18 12:48:23 2009	(r198200)
@@ -658,7 +658,7 @@ static void *first_edge_aux_obj = 0;
 /* Allocate a memory block of SIZE as BB->aux.  The obstack must
    be first initialized by alloc_aux_for_blocks.  */
 
-void
+inline void
 alloc_aux_for_block (basic_block bb, int size)
 {
   /* Verify that aux field is clear.  */
@@ -721,7 +721,7 @@ free_aux_for_blocks (void)
 /* Allocate a memory edge of SIZE as BB->aux.  The obstack must
    be first initialized by alloc_aux_for_edges.  */
 
-void
+inline void
 alloc_aux_for_edge (edge e, int size)
 {
   /* Verify that aux field is clear.  */

Modified: projects/clangbsd/contrib/gcc/dominance.c
==============================================================================
--- projects/clangbsd/contrib/gcc/dominance.c	Sun Oct 18 11:28:31 2009	(r198199)
+++ projects/clangbsd/contrib/gcc/dominance.c	Sun Oct 18 12:48:23 2009	(r198200)
@@ -686,7 +686,7 @@ get_immediate_dominator (enum cdi_direct
 
 /* Set the immediate dominator of the block possibly removing
    existing edge.  NULL can be used to remove any edge.  */
-void
+inline void
 set_immediate_dominator (enum cdi_direction dir, basic_block bb,
 			 basic_block dominated_by)
 {

Modified: projects/clangbsd/contrib/gcc/haifa-sched.c
==============================================================================
--- projects/clangbsd/contrib/gcc/haifa-sched.c	Sun Oct 18 11:28:31 2009	(r198199)
+++ projects/clangbsd/contrib/gcc/haifa-sched.c	Sun Oct 18 12:48:23 2009	(r198200)
@@ -625,7 +625,7 @@ static rtx last_scheduled_insn;
    This is the number of cycles between instruction issue and
    instruction results.  */
 
-int
+HAIFA_INLINE int
 insn_cost (rtx insn, rtx link, rtx used)
 {
   return insn_cost1 (insn, used ? REG_NOTE_KIND (link) : REG_NOTE_MAX,

Modified: projects/clangbsd/contrib/gcc/longlong.h
==============================================================================
--- projects/clangbsd/contrib/gcc/longlong.h	Sun Oct 18 11:28:31 2009	(r198199)
+++ projects/clangbsd/contrib/gcc/longlong.h	Sun Oct 18 12:48:23 2009	(r198200)
@@ -322,22 +322,22 @@ UDItype __umulsidi3 (USItype, USItype);
 	     "g" ((USItype) (bl)))
 #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
   __asm__ ("subl %5,%1\n\tsbbl %3,%0"					\
-	   : "=r" ((sh)),					\
-	     "=&r" ((sl))					\
+	   : "=r" ((USItype) (sh)),					\
+	     "=&r" ((USItype) (sl))					\
 	   : "0" ((USItype) (ah)),					\
 	     "g" ((USItype) (bh)),					\
 	     "1" ((USItype) (al)),					\
 	     "g" ((USItype) (bl)))
 #define umul_ppmm(w1, w0, u, v) \
   __asm__ ("mull %3"							\
-	   : "=a" ((w0)),					\
-	     "=d" ((w1))					\
+	   : "=a" ((USItype) (w0)),					\
+	     "=d" ((USItype) (w1))					\
 	   : "%0" ((USItype) (u)),					\
 	     "rm" ((USItype) (v)))
 #define udiv_qrnnd(q, r, n1, n0, dv) \
   __asm__ ("divl %4"							\
-	   : "=a" ((q)),					\
-	     "=d" ((r))					\
+	   : "=a" ((USItype) (q)),					\
+	     "=d" ((USItype) (r))					\
 	   : "0" ((USItype) (n0)),					\
 	     "1" ((USItype) (n1)),					\
 	     "rm" ((USItype) (dv)))
@@ -387,10 +387,10 @@ UDItype __umulsidi3 (USItype, USItype);
 #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
   /* The cmp clears the condition bit.  */ \
   __asm__ ("cmp %0,%0\n\tsubx %1,%5\n\tsubx %0,%3"			\
-	   : "=r" ((USItype)(sh)),					\
-	   "=&r" ((USItype)(sl))					\
-	   : "0" ((USItype)(ah)),					\
-	   "r" ((USItype)(bh)),						\
+	   : "=r" ((USItype) (sh)),					\
+	     "=&r" ((USItype) (sl))					\
+	   : "0" ((USItype) (ah)),					\
+	     "r" ((USItype) (bh)),					\
 	     "1" ((USItype) (al)),					\
 	     "r" ((USItype) (bl))					\
 	   : "cbit")