2005-01-07  Joerg Wunsch <address@hidden>

	* libm/fplib/asin.S: prefix internal global symbols
	with "__fp_".
	* libm/fplib/atan.S: (Ditto.)
	* libm/fplib/cos.S: (Ditto.)
	* libm/fplib/cosh.S: (Ditto.)
	* libm/fplib/divsf3.S: (Ditto.)
	* libm/fplib/exp.S: (Ditto.)
	* libm/fplib/fp_cosinus.S: (Ditto.)
	* libm/fplib/fp_flashconst.S: (Ditto.)
	* libm/fplib/fp_powerseries.S: (Ditto.)
	* libm/fplib/log.S: (Ditto.)
	* libm/fplib/sinh.S: (Ditto.)
	* libm/fplib/strtod.S: (Ditto.)
	* libm/fplib/tan.S: (Ditto.)

Index: libm/fplib/asin.S
===================================================================
RCS file: /home/cvs/avr-libc/avr-libc/libm/fplib/asin.S,v
retrieving revision 1.4
diff -u -u -r1.4 asin.S
--- libm/fplib/asin.S	1 Nov 2004 17:01:23 -0000	1.4
+++ libm/fplib/asin.S	7 Jan 2005 21:05:45 -0000
@@ -77,7 +77,7 @@
 	PUSH	rA0		; save x
 	LDI	ZL,LOW(table_asin)
 	LDI	ZH,HIGH(table_asin)	; point to table
-	XCALL	_U(fp_powerseries)	; A = P0 + x(P1 + x(P2 + x(P3 + x(P4 +
+	XCALL	_U(__fp_powerseries)	; A = P0 + x(P1 + x(P2 + x(P3 + x(P4 +
 					;  x(P5 + x(P6 + x(P7)))))))
 	POP	rB0
 	POP	rB1
Index: libm/fplib/atan.S
===================================================================
RCS file: /home/cvs/avr-libc/avr-libc/libm/fplib/atan.S,v
retrieving revision 1.4
diff -u -u -r1.4 atan.S
--- libm/fplib/atan.S	1 Nov 2004 17:01:23 -0000	1.4
+++ libm/fplib/atan.S	7 Jan 2005 21:05:51 -0000
@@ -73,14 +73,14 @@
 	CPC	rA3, rB3		; A - 1.0000001192092896
 	BRCS	1f			; |x| <= 1.0 --> calculate atan(x)
 	ORI	magn, 0x80		; set magn.b7 as |x| > 1
-	XCALL	_U(inverse)		; A = 1.0 / x
+	XCALL	_U(__fp_inverse)		; A = 1.0 / x
 1:
 	OR	rA3, sign		; restore sign of x
 	FPPUSH	(rA)			; save x
 	XCALL	_U(square)		; A = x^2
 	LDI	ZL,LOW(.Ltable_atan)
 	LDI	ZH,HIGH(.Ltable_atan)	; point to table
-	RCALL	_U(fp_powerseries)
+	RCALL	_U(__fp_powerseries)
 	FPPOP	(rB)			; get x again
 	XCALL	_U(__mulsf3)		; now A = atan(x) for -1 <= x <= 1
 	TST	magn			; |x| > 1 ?
Index: libm/fplib/cos.S
===================================================================
RCS file: /home/cvs/avr-libc/avr-libc/libm/fplib/cos.S,v
retrieving revision 1.2
diff -u -u -r1.2 cos.S
--- libm/fplib/cos.S	10 Nov 2004 21:04:46 -0000	1.2
+++ libm/fplib/cos.S	7 Jan 2005 21:08:15 -0000
@@ -53,7 +53,7 @@
        LDI    rB1,0x0F
        LDI    rB0,0xDB		; load 2*PI
        RCALL  _U(fmod)		; X = remainder X/2PI
-       RJMP   _U(fp_cosinus)
+       RJMP   _U(__fp_cosinus)
 
           ENDFUNC
 
Index: libm/fplib/cosh.S
===================================================================
RCS file: /home/cvs/avr-libc/avr-libc/libm/fplib/cosh.S,v
retrieving revision 1.2
diff -u -u -r1.2 cosh.S
--- libm/fplib/cosh.S	10 Nov 2004 21:04:46 -0000	1.2
+++ libm/fplib/cosh.S	7 Jan 2005 21:03:30 -0000
@@ -53,7 +53,7 @@
    PUSH  rA1
    PUSH  rA2
    PUSH  rA3
-   RCALL _U(inverse)
+   RCALL _U(__fp_inverse)
    POP   rB3
    POP   rB2
    POP   rB1
Index: libm/fplib/divsf3.S
===================================================================
RCS file: /home/cvs/avr-libc/avr-libc/libm/fplib/divsf3.S,v
retrieving revision 1.2
diff -u -u -r1.2 divsf3.S
--- libm/fplib/divsf3.S	10 Nov 2004 21:04:46 -0000	1.2
+++ libm/fplib/divsf3.S	7 Jan 2005 21:03:40 -0000
@@ -49,9 +49,9 @@
 #include "fplib.inc"
 
           TEXT_SEG(fplib, __divsf3)
-          FUNCTION(inverse)
+          FUNCTION(__fp_inverse)
 
-GLOBAL(inverse)
+GLOBAL(__fp_inverse)
      MOV     rB3,rA3
      MOV     rB2,rA2
      MOV     rB1,rA1
Index: libm/fplib/exp.S
===================================================================
RCS file: /home/cvs/avr-libc/avr-libc/libm/fplib/exp.S,v
retrieving revision 1.3
diff -u -u -r1.3 exp.S
--- libm/fplib/exp.S	10 Nov 2004 21:04:46 -0000	1.3
+++ libm/fplib/exp.S	7 Jan 2005 21:05:55 -0000
@@ -95,7 +95,7 @@
 
    LDI     ZL,LOW(table_exp)
    LDI     ZH,HIGH(table_exp)
-   RCALL   _U(fp_powerseries)
+   RCALL   _U(__fp_powerseries)
 
    MOV   rB3,rS0
    MOV   rB2,rS1		;
@@ -131,7 +131,7 @@
 
    POP   rT0
    SBRC  rT0,7
-   RJMP  _U(inverse)
+   RJMP  _U(__fp_inverse)
    RET
 
           ENDFUNC
Index: libm/fplib/fp_cosinus.S
===================================================================
RCS file: /home/cvs/avr-libc/avr-libc/libm/fplib/fp_cosinus.S,v
retrieving revision 1.3
diff -u -u -r1.3 fp_cosinus.S
--- libm/fplib/fp_cosinus.S	10 Nov 2004 21:04:46 -0000	1.3
+++ libm/fplib/fp_cosinus.S	7 Jan 2005 21:08:50 -0000
@@ -59,10 +59,10 @@
 #include "gasava.inc"
 #include "fplib.inc"
 
-          TEXT_SEG(fplib, fp_cosinus)
-          FUNCTION(fp_cosinus)
+          TEXT_SEG(fplib, __fp_cosinus)
+          FUNCTION(__fp_cosinus)
 
-GLOBAL(fp_cosinus)		; input A = [-2PI...2PI[
+GLOBAL(__fp_cosinus)		; input A = [-2PI...2PI[
        PUSH    rSI0
        ANDI    rA3,0x7F		; input A = [0...2PI[
 
@@ -93,7 +93,7 @@
 					;
        LDI     ZL,LOW(table_cos)	;
        LDI     ZH,HIGH(table_cos)	;
-       RCALL   _U(fp_powerseries)	;
+       RCALL   _U(__fp_powerseries)	;
 
        EOR     rA3,rSI0		; complement sign
        POP     rSI0
Index: libm/fplib/fp_flashconst.S
===================================================================
RCS file: /home/cvs/avr-libc/avr-libc/libm/fplib/fp_flashconst.S,v
retrieving revision 1.2
diff -u -u -r1.2 fp_flashconst.S
--- libm/fplib/fp_flashconst.S	10 Nov 2004 21:04:46 -0000	1.2
+++ libm/fplib/fp_flashconst.S	7 Jan 2005 21:09:02 -0000
@@ -45,10 +45,10 @@
 #include "gasava.inc"
 #include "fplib.inc"
 
-          TEXT_SEG(fplib, fp_flashconst)
-          FUNCTION(fp_flashconst)
+          TEXT_SEG(fplib, __fp_flashconst)
+          FUNCTION(__fp_flashconst)
 
-GLOBAL(fp_flashconst)
+GLOBAL(__fp_flashconst)
     LPMRdZpp(rB3)
     LPMRdZpp(rB2)
     LPMRdZpp(rB1)
Index: libm/fplib/fp_powerseries.S
===================================================================
RCS file: /home/cvs/avr-libc/avr-libc/libm/fplib/fp_powerseries.S,v
retrieving revision 1.3
diff -u -u -r1.3 fp_powerseries.S
--- libm/fplib/fp_powerseries.S	10 Nov 2004 21:04:46 -0000	1.3
+++ libm/fplib/fp_powerseries.S	7 Jan 2005 21:09:47 -0000
@@ -50,8 +50,8 @@
 #include "gasava.inc"
 #include "fplib.inc"
 
-          TEXT_SEG(fplib, fp_powerseries)
-          FUNCTION(fp_powerseries)
+          TEXT_SEG(fplib, __fp_powerseries)
+          FUNCTION(__fp_powerseries)
 
  #define rGrade rS5
  #define rFlags rS4
@@ -60,7 +60,7 @@
  #define rArg1  rS1
  #define rArg0  rS0
 
-GLOBAL(fp_powerseries)
+GLOBAL(__fp_powerseries)
     MOV    rT0,rA3
     RCALL  _U(__fp_split1)	; call fp_split before pushing
 
@@ -117,7 +117,7 @@
 
  fp_powerloop:
                                ; AX preset with argument, rFlags.7 sign of AX
-    RCALL  _U(fp_flashconst)  ; BX = *array[n]
+    RCALL  _U(__fp_flashconst)  ; BX = *array[n]
 
     BST    rB2,7               ; store sign(B) to T
     ORI    rB2,0x80            ; set implicit one
@@ -137,7 +137,7 @@
     RCALL  _U(__mulsf3x)	; AX *= BX, sign T and rFlags stays untouched
     POP    ZH
     POP    ZL
-    RCALL  _U(fp_flashconst)	; BX = *array[n]
+    RCALL  _U(__fp_flashconst)	; BX = *array[n]
     CLR    rBE
 
 	/* now set sign right :
Index: libm/fplib/log.S
===================================================================
RCS file: /home/cvs/avr-libc/avr-libc/libm/fplib/log.S,v
retrieving revision 1.3
diff -u -u -r1.3 log.S
--- libm/fplib/log.S	10 Nov 2004 21:04:46 -0000	1.3
+++ libm/fplib/log.S	7 Jan 2005 21:06:26 -0000
@@ -91,7 +91,7 @@
 
    LDI     ZL,LOW(table_log)
    LDI     ZH,HIGH(table_log)
-   RCALL   _U(fp_powerseries)
+   RCALL   _U(__fp_powerseries)
 
    MOV    rT0,rS3
    MOV    rS3,rA3
Index: libm/fplib/sinh.S
===================================================================
RCS file: /home/cvs/avr-libc/avr-libc/libm/fplib/sinh.S,v
retrieving revision 1.2
diff -u -u -r1.2 sinh.S
--- libm/fplib/sinh.S	10 Nov 2004 21:04:46 -0000	1.2
+++ libm/fplib/sinh.S	7 Jan 2005 21:04:09 -0000
@@ -54,7 +54,7 @@
    PUSH  rA1
    PUSH  rA2
    PUSH  rA3
-   RCALL _U(inverse)
+   RCALL _U(__fp_inverse)
    ORI   rA3,0x80		; exp(-x) = -exp(-x)
    POP   rB3
    POP   rB2
Index: libm/fplib/strtod.S
===================================================================
RCS file: /home/cvs/avr-libc/avr-libc/libm/fplib/strtod.S,v
retrieving revision 1.5
diff -u -u -r1.5 strtod.S
--- libm/fplib/strtod.S	10 Nov 2004 21:04:46 -0000	1.5
+++ libm/fplib/strtod.S	7 Jan 2005 21:10:05 -0000
@@ -206,7 +206,7 @@
 	ASR    rExp
 	BRCC   .L_nextPower
 
-	RCALL  fp_flashconst	; load constnat to B
+	RCALL  __fp_flashconst	; load constnat to B
 
 	PUSH   R30
 	PUSH   R31
Index: libm/fplib/tan.S
===================================================================
RCS file: /home/cvs/avr-libc/avr-libc/libm/fplib/tan.S,v
retrieving revision 1.3
diff -u -u -r1.3 tan.S
--- libm/fplib/tan.S	10 Nov 2004 21:04:46 -0000	1.3
+++ libm/fplib/tan.S	7 Jan 2005 21:06:30 -0000
@@ -108,7 +108,7 @@
        ORI     rA3,0x80 		; -xý
        LDI     ZL,LOW(table_tan)
        LDI     ZH,HIGH(table_tan)
-       RCALL   _U(fp_powerseries)
+       RCALL   _U(__fp_powerseries)
        POP     rB0
        POP     rB1
        POP     rB2
@@ -116,7 +116,7 @@
        RCALL   _U(__mulsf3)
        SBRS    rSI0,0
        RJMP    _tan_100
-       RCALL   _U(inverse)
+       RCALL   _U(__fp_inverse)
  _tan_100:
        SBRC    rSI0,7
        ORI     rA3,0x80