]> pilppa.org Git - familiar-h63xx-build.git/blob - org.handhelds.familiar/packages/uclibc/uclibc-0.9.27/thumb-swi.patch
OE tree imported from monotone branch org.openembedded.oz354fam083 at revision 8b12e3...
[familiar-h63xx-build.git] / org.handhelds.familiar / packages / uclibc / uclibc-0.9.27 / thumb-swi.patch
1 --- uClibc-0.9.27/.pc/thumb-swi.patch/libc/sysdeps/linux/arm/bits/syscalls.h    2005-01-11 23:59:21.000000000 -0800
2 +++ uClibc-0.9.27/libc/sysdeps/linux/arm/bits/syscalls.h        2005-08-08 21:04:11.081932985 -0700
3 @@ -97,6 +97,7 @@
4  #define INTERNAL_SYSCALL_DECL(err) do { } while (0)
5  
6  #undef INTERNAL_SYSCALL
7 +#if !defined(__thumb__)
8  #define INTERNAL_SYSCALL(name, err, nr, args...)               \
9    ({ unsigned int _sys_result;                                 \
10       {                                                         \
11 @@ -109,6 +110,21 @@
12         _sys_result = _a1;                                      \
13       }                                                         \
14       (int) _sys_result; })
15 +#else
16 +#define INTERNAL_SYSCALL(name, err, nr, args...)               \
17 +  ({ unsigned int _sys_result;                                 \
18 +     {                                                         \
19 +       register int _a1 asm ("a1");                            \
20 +       LOAD_ARGS_##nr (args)                                   \
21 +       register int _r7 asm ("r7") = (int) (SYS_ify(name));    \
22 +       asm volatile ("swi      0       @ syscall " #name       \
23 +                    : "=r" (_a1)                               \
24 +                    : "r" (_r7) ASM_ARGS_##nr                  \
25 +                    : "memory");                               \
26 +       _sys_result = _a1;                                      \
27 +     }                                                         \
28 +     (int) _sys_result; })
29 +#endif
30  
31  #undef INTERNAL_SYSCALL_ERROR_P
32  #define INTERNAL_SYSCALL_ERROR_P(val, err) \
33 --- uClibc-0.9.27/libc/sysdeps/linux/arm/brk.c.orig     2005-01-11 23:59:21.000000000 -0800
34 +++ uClibc-0.9.27/libc/sysdeps/linux/arm/brk.c  2005-08-09 12:44:56.000000000 -0700
35 @@ -26,14 +26,7 @@
36  
37  int brk (void *addr)
38  {
39 -    void *newbrk;
40 -
41 -    asm ("mov a1, %1\n"        /* save the argment in r0 */
42 -           "swi %2\n"  /* do the system call */
43 -           "mov %0, a1;"       /* keep the return value */
44 -           : "=r"(newbrk)
45 -           : "r"(addr), "i" (__NR_brk)
46 -           : "a1");
47 +    void *newbrk = (void*)INTERNAL_SYSCALL(brk, , 1, addr);
48  
49      __curbrk = newbrk;
50  
51 --- uClibc-0.9.27/libc/sysdeps/linux/arm/syscall.c.orig 2005-08-09 12:51:10.681364959 -0700
52 +++ uClibc-0.9.27/libc/sysdeps/linux/arm/syscall.c      2005-08-09 12:52:43.371197563 -0700
53 @@ -26,6 +26,7 @@
54  
55  long syscall(long sysnum, long a, long b, long c, long d, long e, long f)
56  {
57 +#if !defined(__thumb__)
58         register long _r0 asm("r0")=(long)(sysnum);
59         register long _r6 asm("r6")=(long)(f);
60         register long _r5 asm("r5")=(long)(e);
61 @@ -40,6 +41,21 @@
62                         "r"(_r2), "r"(_r3), "r"(_r4), "r"(_r5),
63                         "r"(_r6)
64                         : "memory");
65 +#else
66 +       register long _r7 asm("r7")=(long)(sysnum);
67 +       register long _r5 asm("r5")=(long)(f);
68 +       register long _r4 asm("r4")=(long)(e);
69 +       register long _r3 asm("r3")=(long)(d);
70 +       register long _r2 asm("r2")=(long)(c);
71 +       register long _r1 asm("r1")=(long)(b);
72 +       register long _r0 asm("r0")=(long)(a);
73 +       asm volatile(
74 +                       "swi 0"
75 +                       : "=r"(_r0)
76 +                       : "r"(_r0), "r"(_r1), "r"(_r2), "r"(_r3),
77 +                       "r"(_r4), "r"(_r5), "r"(_r7)
78 +                       : "memory");
79 +#endif
80         if(_r0 >=(unsigned long) -4095) {
81                 long err = _r0;
82                 (*__errno_location())=(-err);