From: Bernd Schmidt <bernds@codesourcery.com>
Date: Wed, 25 May 2011 16:42:23 +0000 (+0000)
Subject: re PR bootstrap/49160 (Bootstrap failure)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0c007eb2cd68405c6d7fa4dbd6616e8f0b959388;p=gcc.git

re PR bootstrap/49160 (Bootstrap failure)

	PR bootstrap/49160
	* libgcc2.h (__powisf2, __powidf2, __powitf2, __powixf2,
	__mulsc3, __muldc3, __mulxc3, __multc3, __divsc3, __divdc3,
	__divxc3, __divtc3): Wrap definitions in #ifndef.

From-SVN: r174216
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 620acbb117b..74591f5a20f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-25  Bernd Schmidt  <bernds@codesourcery.com>
+
+	PR bootstrap/49160
+	* libgcc2.h (__powisf2, __powidf2, __powitf2, __powixf2,
+	__mulsc3, __muldc3, __mulxc3, __multc3, __divsc3, __divdc3,
+	__divxc3, __divtc3): Wrap definitions in #ifndef.
+
 2011-05-25  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR target/49142
diff --git a/gcc/libgcc2.h b/gcc/libgcc2.h
index aee6d19c3ea..bb4e6f31471 100644
--- a/gcc/libgcc2.h
+++ b/gcc/libgcc2.h
@@ -324,23 +324,48 @@ typedef int shift_count_type __attribute__((mode (__libgcc_shift_count__)));
 #define __parityDI2	__NDW(parity,2)
 
 #define __clz_tab		__N(clz_tab)
+#define __bswapsi2		__N(bswapsi2)
+#define __bswapdi2		__N(bswapdi2)
+#define __udiv_w_sdiv		__N(udiv_w_sdiv)
+#define __clear_cache		__N(clear_cache)
+#define __enable_execute_stack	__N(enable_execute_stack)
+
+#ifndef __powisf2
 #define __powisf2		__N(powisf2)
+#endif
+#ifndef __powidf2
 #define __powidf2		__N(powidf2)
+#endif
+#ifndef __powitf2
 #define __powitf2		__N(powitf2)
+#endif
+#ifndef __powixf2
 #define __powixf2		__N(powixf2)
-#define __bswapsi2		__N(bswapsi2)
-#define __bswapdi2		__N(bswapdi2)
+#endif
+#ifndef __mulsc3
 #define __mulsc3		__N(mulsc3)
+#endif
+#ifndef __muldc3
 #define __muldc3		__N(muldc3)
+#endif
+#ifndef __mulxc3
 #define __mulxc3		__N(mulxc3)
+#endif
+#ifndef __multc3
 #define __multc3		__N(multc3)
+#endif
+#ifndef __divsc3
 #define __divsc3		__N(divsc3)
+#endif
+#ifndef __divdc3
 #define __divdc3		__N(divdc3)
+#endif
+#ifndef __divxc3
 #define __divxc3		__N(divxc3)
+#endif
+#ifndef __divtc3
 #define __divtc3		__N(divtc3)
-#define __udiv_w_sdiv		__N(udiv_w_sdiv)
-#define __clear_cache		__N(clear_cache)
-#define __enable_execute_stack	__N(enable_execute_stack)
+#endif
 
 extern DWtype __muldi3 (DWtype, DWtype);
 extern DWtype __divdi3 (DWtype, DWtype);