[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[microblaze-uclinux] Re: [uClinux-dev] uClinux-dist-test-20041116 released for testing



Hi John,

All applied, for final dist cut.

Rgeards
Greg




John Williams wrote:
> Hi David,
> 
> David McCullough wrote:
> 
>>
>> Given the change is so small,  and the code is unlikely to change much,
>> we could make an exception here:
>>
>>     * check your changes into the kernel
> 
> 
> done
> 
>>     * check your changes into the uClinux-dist part of the repo
> 
> 
> done
> 
>>     * send us the "patch" for the lot (probably easier) to sync our tree
>>       properly as well.
> 
> 
> Attached.
> 
> 
> Thanks,
> 
> John
> 
> 
> ------------------------------------------------------------------------
> 
> diff -Naur -x '.*' -x '*CVS*' -x '*.o' -x '*.a' /opt/src/uClinux-dist/uClibc/libc/sysdeps/linux/microblaze/clone.c uClibc/libc/sysdeps/linux/microblaze/clone.c
> --- /opt/src/uClinux-dist/uClibc/libc/sysdeps/linux/microblaze/clone.c	2004-07-08 16:10:54.000000000 +1000
> +++ uClibc/libc/sysdeps/linux/microblaze/clone.c	2004-11-17 11:46:16.000000000 +1000
> @@ -31,7 +31,7 @@
>        arg0 = flags;
>        arg1 = (unsigned long)child_stack;
>        syscall = __NR_clone;
> -      asm volatile ("bralid r17, 0x08;nop;" 
> +      asm volatile ("brki	r14, 0x08;" 
>  		    : "=r" (rval), "=r" (syscall)
>  		    : "1" (syscall), "r" (arg0), "r" (arg1)
>  		    : SYSCALL_CLOBBERS);
> @@ -41,7 +41,7 @@
>  	{
>  	  arg0 = (*fn) (arg);
>  	  syscall = __NR_exit;
> -	  asm volatile ("bralid r17, 0x08;nop;" 
> +	  asm volatile ("brki	r14, 0x08;" 
>  			: "=r" (rval), "=r" (syscall)
>  			: "1" (syscall), "r" (arg0)
>  			: SYSCALL_CLOBBERS);
> diff -Naur -x '.*' -x '*CVS*' -x '*.o' -x '*.a' /opt/src/uClinux-dist/uClibc/libc/sysdeps/linux/microblaze/syscall.c uClibc/libc/sysdeps/linux/microblaze/syscall.c
> --- /opt/src/uClinux-dist/uClibc/libc/sysdeps/linux/microblaze/syscall.c	2004-07-08 16:10:54.000000000 +1000
> +++ uClibc/libc/sysdeps/linux/microblaze/syscall.c	2004-11-17 11:46:16.000000000 +1000
> @@ -36,7 +36,7 @@
>    register unsigned long ret asm (SYSCALL_RET);
>  	unsigned long ret_sav;
>  
> -  asm ("bralid r17, 0x08; nop;" 
> +  asm ("brki	r14, 0x08" 
>         : "=r" (ret)
>         : "r" (syscall), "r" (a), "r" (b), "r" (c), "r" (d), "r" (e), "r" (f)
>         : SYSCALL_CLOBBERS);
> diff -Naur -x '.*' -x '*CVS*' -x '*.o' -x '*.a' /opt/src/uClinux-dist/uClibc/libc/sysdeps/linux/microblaze/vfork.S uClibc/libc/sysdeps/linux/microblaze/vfork.S
> --- /opt/src/uClinux-dist/uClibc/libc/sysdeps/linux/microblaze/vfork.S	2004-07-08 16:10:54.000000000 +1000
> +++ uClibc/libc/sysdeps/linux/microblaze/vfork.S	2004-11-17 11:46:16.000000000 +1000
> @@ -29,8 +29,7 @@
>  
>  C_ENTRY (__vfork):
>  	addi	r12, r0, SYS_vfork
> -	bralid	r17, 0x08;
> -	nop
> +	brki	r14, 0x08;
>  	addi	r4, r3, 125		// minimum err value
>  	blti	r4, 1f			// is r3 < -125?
>  	rtsd	r15, 8			// normal return
> 
> 
> ------------------------------------------------------------------------
> 
> _______________________________________________
> uClinux-dev mailing list
> uClinux-dev@uclinux.org
> http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
> This message was resent by uclinux-dev@uclinux.org

-- 
------------------------------------------------------------------------
Greg Ungerer  --  Chief Software Dude       EMAIL:     gerg@snapgear.com
SnapGear -- a CyberGuard Company            PHONE:       +61 7 3435 2888
825 Stanley St,                             FAX:         +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia         WEB: http://www.SnapGear.com
___________________________
microblaze-uclinux mailing list
microblaze-uclinux@itee.uq.edu.au
Project Home Page : http://www.itee.uq.edu.au/~jwilliams/mblaze-uclinux
Mailing List Archive : http://www.itee.uq.edu.au/~listarch/microblaze-uclinux/