Makefile.in (LIBGCC_VER_FIXEDPOINT_GNU_PREFIX): New.

	libgcc/
	* Makefile.in (LIBGCC_VER_FIXEDPOINT_GNU_PREFIX): New.
	(libgcc-std.ver.in): Use above.
	* fixed-bit.h (LIBGCC2_FIXEDBIT_GNU_PREFIX): Define, if
	LIBGCC2_GNU_PREFIX is defined.  Use instead of LIBGCC2_GNU_PREFIX
	throughout file.
	* config/t-fixedpoint-gnu-prefix: New file.
	* config/t-gnu-prefix (LIBGCC_VER_FIXEDPOINT_GNU_PREFIX): Set.
	* libgcc-std.ver.in (fixed-point routines): Use __FIXPTPFX__
	instead of __PFX__.

From-SVN: r177019

libgcc/ChangeLog

+2011-08-01  Julian Brown  <julian@codesourcery.com>
+
+	* Makefile.in (LIBGCC_VER_FIXEDPOINT_GNU_PREFIX): New.
+	(libgcc-std.ver.in): Use above.
+	* fixed-bit.h (LIBGCC2_FIXEDBIT_GNU_PREFIX): Define, if
+	LIBGCC2_GNU_PREFIX is defined.  Use instead of LIBGCC2_GNU_PREFIX
+	throughout file.
+	* config/t-fixedpoint-gnu-prefix: New file.
+	* config/t-gnu-prefix (LIBGCC_VER_FIXEDPOINT_GNU_PREFIX): Set.
+	* libgcc-std.ver.in (fixed-point routines): Use __FIXPTPFX__
+	instead of __PFX__.
+
 2011-07-28  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* config/i386/morestack.S (X86_64_SAVE_NEW_STACK_BOUNDARY): New.

libgcc/Makefile.in

@@ -253,6 +253,7 @@ objects = $(filter %$(objext),$^)
 # Collect any host-specific information from Makefile fragments.
 
 LIBGCC_VER_GNU_PREFIX = __
+LIBGCC_VER_FIXEDPOINT_GNU_PREFIX = __
 LIBGCC_VER_SYMBOLS_PREFIX =
 
 tmake_file = @tmake_file@
@@ -837,7 +838,8 @@ mapfile = libgcc.map
 endif
 
 libgcc-std.ver: $(srcdir)/libgcc-std.ver.in
-	sed -e 's/__PFX__/$(LIBGCC_VER_GNU_PREFIX)/g' < $< > $@
+	sed -e 's/__PFX__/$(LIBGCC_VER_GNU_PREFIX)/g' \
+	    -e 's/__FIXPTPFX__/$(LIBGCC_VER_FIXEDPOINT_GNU_PREFIX)/g' < $< > $@
 
 libgcc_s$(SHLIB_EXT): $(libgcc-s-objects) $(extra-parts)
 	# @multilib_flags@ is still needed because this may use

libgcc/config/t-fixedpoint-gnu-prefix

+LIBGCC_VER_FIXEDPOINT_GNU_PREFIX = __gnu_

libgcc/config/t-gnu-prefix

 LIBGCC_VER_GNU_PREFIX = __gnu_
+LIBGCC_VER_FIXEDPOINT_GNU_PREFIX = __gnu_

libgcc/fixed-bit.h

@@ -25,6 +25,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #ifndef _FIXED_BIT_H
 #define _FIXED_BIT_H
 
+#ifdef LIBGCC2_GNU_PREFIX
+#define LIBGCC2_FIXEDBIT_GNU_PREFIX
+#endif
+
 /* To use this file we need to define one of the following:
    QQ_MODE, UQQ_MODE, HQ_MODE, UHQ_MODE, SQ_MODE, USQ_MODE, DQ_MODE, UDQ_MODE,
    TQ_MODE, UTQ_MODE, HA_MODE, UHA_MODE, SA_MODE, USA_MODE, DA_MODE, UDA_MODE,
@@ -445,7 +449,7 @@ typedef union
 #define IBITS		IBITS2(MODE_NAME)
 #define I_F_BITS	(FBITS + IBITS)
 
-#ifdef LIBGCC2_GNU_PREFIX
+#ifdef LIBGCC2_FIXEDBIT_GNU_PREFIX
 #define FIXED_OP(OP,MODE,NUM)	__gnu_ ## OP ## MODE ## NUM
 #else
 #define FIXED_OP(OP,MODE,NUM)	__ ## OP ## MODE ## NUM
@@ -1150,7 +1154,7 @@ extern FIXED_C_TYPE FIXED_USASHL (FIXED_C_TYPE, word_type);
 #define TO_HAVE_PADDING_BITS	(TO_PADDING_BITS > 0)
 #endif /* TO_TYPE == 4  */
 
-#ifdef LIBGCC2_GNU_PREFIX
+#ifdef LIBGCC2_FIXEDBIT_GNU_PREFIX
 #define FIXED_CONVERT_OP(OP,FROM,TO)	__gnu_ ## OP ## FROM ## TO
 #define FIXED_CONVERT_OP2(OP,FROM,TO)	__gnu_ ## OP ## FROM ## TO ## 2
 #else