newlib 1.8.2 rtems patch

[corsepiu at faw.uni-ulm.de (Ralf Corsepius)]

Joel Sherrill wrote:

> I have put a first attempt at a patch for this in arc_snapshot/newlib
> right next to the newlib-1.8.2 tar.gz file.  I don't know how correct
> this version of the patch is.  I have only built newlib for one target
> so far and not used that against RTEMS.
>
> I was unable to determine what to do with the changes in the RTEMS
> patch
> to the machine/sh directory, so I can make no statements about the sh.
> :(
>

Not as broken as newlib-1.8.1, but it doesn't even compile :- (Did anybody
of the newlib folks ever try to built this part of the sources?)

Please find enclosed a patch which finally lets me compile it (Relative to
newlib-1.8.2 with newlib-1.8.2-rtems-diff-19991001 applied). However, I
didn't use/test it on actual hardware yet.

Ralf

PS: building newlib-1.8.2 with gcc-2.95.1 produces hundreds of warnings.
AFAIS the vast majority of them seem to be harmless. Nevertheless this
amount of warnings leaves an encouraging first impression ...

--
Ralf Corsepius
Forschungsinstitut fuer Anwendungsorientierte Wissensverarbeitung (FAW)
Helmholtzstr. 16, 89081 Ulm, Germany     Tel: +49/731/501-8690
mailto:corsepiu at faw.uni-ulm.de           FAX: +49/731/501-999
http://www.faw.uni-ulm.de


-------------- next part --------------
diff -u -N -r newlib-1.8.2/newlib/ChangeLog newlib-1.8.2-rc/newlib/ChangeLog
--- newlib-1.8.2/newlib/ChangeLog	Sat Oct  2 01:53:06 1999
+++ newlib-1.8.2-rc/newlib/ChangeLog	Sat Oct  2 01:58:21 1999
@@ -1,4 +1,7 @@
-XXX look at libc/machine/sh part of RTEMS patch
+Sat Oct  2 02:02:00 MEST 1999  Ralf Corsepius <corsepiu at faw.uni-ulm.de>
+
+	* libc/machine/sh/asm.h: Added __SH4_SINGLE__ to DELAYED_BRANCHES
+	* libc/machine/sh/memcpy.S: Fix line wrapping in SL macro
 
 Fri Oct  1 13:17:59 CDT 1999  <joel at OARcorp.com>
 	* libc/include/grp.h: Added getgrnam_r and getgrgid_r prototypes
diff -u -N -r newlib-1.8.2/newlib/libc/machine/sh/asm.h newlib-1.8.2-rc/newlib/libc/machine/sh/asm.h
--- newlib-1.8.2/newlib/libc/machine/sh/asm.h	Tue Jul  7 02:51:36 1998
+++ newlib-1.8.2-rc/newlib/libc/machine/sh/asm.h	Sat Oct  2 01:48:46 1999
@@ -12,7 +12,7 @@
 	_ENTRY(_C_LABEL(name))
 
 #if (defined (__sh2__) || defined (__sh3__) || defined (__SH3E__) \
-     || defined (__SH4__)) || defined(__SH4_SINGLE_ONLY__)
+     || defined (__SH4_SINGLE__) || defined (__SH4__)) || defined(__SH4_SINGLE_ONLY__)
 #define DELAYED_BRANCHES
 #define SL(branch, dest, in_slot, in_slot_arg2) \
 	branch##.s dest; in_slot, in_slot_arg2
diff -u -N -r newlib-1.8.2/newlib/libc/machine/sh/memcpy.S newlib-1.8.2-rc/newlib/libc/machine/sh/memcpy.S
--- newlib-1.8.2/newlib/libc/machine/sh/memcpy.S	Tue Jul  7 02:51:36 1998
+++ newlib-1.8.2-rc/newlib/libc/machine/sh/memcpy.S	Sat Oct  2 01:48:18 1999
@@ -132,8 +132,7 @@
 	sub r4,r5
 	mov #11,r1
 	cmp/hs r1,r6
-	SL(bf, L_small,
-	add #-1,r5)
+	SL(bf, L_small, add #-1,r5)
 	mov r5,r3
 	add r0,r3
 	shlr r3
@@ -145,8 +144,7 @@
 L_even:
 	tst #1,r0
 	add #-1,r5
-	SL(bf, L_odddst,
-	add #8,r7)
+	SL(bf, L_odddst, add #8,r7)
 	tst #2,r0
 	bt L_al4dst
 	add #-1,r3