Changeset 16735


Ignore:
Timestamp:
2009-07-07T17:09:10+02:00 (7 years ago)
Author:
juhosg
Message:

[toolchain] uClibc: fix build error on ARM targets (closes #5473)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/toolchain/uClibc/patches-0.9.30.1/400-gcc4.4-fixes.patch

    r16720 r16735  
    819819                new_path--; 
    820820--  
    821 The test here is a constant expression and will compile out. 
    822 For platforms that don't need the shift the code gets slightly smaller 
    823 and simpler, for those that do the result is unchanged. 
    824  
    825 Signed-off-by: Ron Lee <ron@debian.org> 
    826 --- 
    827  libc/sysdeps/linux/arm/posix_fadvise.c |    6 ++++-- 
    828  1 files changed, 4 insertions(+), 2 deletions(-) 
    829  
    830 Index: uClibc-0.9.30.1/libc/sysdeps/linux/arm/posix_fadvise.c 
    831 =================================================================== 
    832 --- uClibc-0.9.30.1.orig/libc/sysdeps/linux/arm/posix_fadvise.c 2007-05-31 10:21:38.000000000 +0200 
    833 +++ uClibc-0.9.30.1/libc/sysdeps/linux/arm/posix_fadvise.c      2009-07-06 21:19:18.000000000 +0200 
    834 @@ -18,8 +18,8 @@ 
    835  { 
    836    INTERNAL_SYSCALL_DECL (err); 
    837    int ret = INTERNAL_SYSCALL (arm_fadvise64_64, err, 6, fd, advise, 
    838 -                              __LONG_LONG_PAIR ((long)(offset >> 32), (long)offset), 
    839 -                              __LONG_LONG_PAIR ((long)(len >> 32), (long)len)); 
    840 +                              __LONG_LONG_PAIR (HIGH_BITS(offset), (long)offset), 
    841 +                              __LONG_LONG_PAIR (HIGH_BITS(len), (long)len)); 
    842   
    843      if (INTERNAL_SYSCALL_ERROR_P (ret, err)) 
    844        return INTERNAL_SYSCALL_ERRNO (ret, err); 
    845821Signed-off-by: Ron Lee <ron@debian.org> 
    846822--- 
     
    901877        } 
    902878  
     879From 8ee834680d39677a60e26a0de4ece2f0c1ebbde2 Mon Sep 17 00:00:00 2001 
     880From: Ron <ron@debian.org> 
     881Date: Sat, 27 Jun 2009 04:44:27 +0930 
     882Subject: [PATCH] Avoid warnings about shifting more bits than we have 
     883 
     884The test here is a constant expression and will compile out. 
     885For platforms that don't need the shift the code gets slightly smaller 
     886and simpler, for those that do the result is unchanged. 
     887 
     888Signed-off-by: Ron Lee <ron@debian.org> 
     889Signed-off-by: Mike Frysinger <vapier@gentoo.org> 
     890--- 
     891 libc/sysdeps/linux/arm/posix_fadvise.c |    6 ++++-- 
     892 1 files changed, 4 insertions(+), 2 deletions(-) 
     893 
     894--- a/libc/sysdeps/linux/arm/posix_fadvise.c 
     895+++ b/libc/sysdeps/linux/arm/posix_fadvise.c 
     896@@ -10,6 +10,9 @@ 
     897 #include <sys/syscall.h> 
     898 #include <fcntl.h> 
     899 #if defined __NR_arm_fadvise64_64 
     900+ 
     901+#define HIGH_BITS(x) (sizeof(x) > 4 ? (x) >> 32 : 0) 
     902+ 
     903 /* This is for the ARM version of fadvise64_64 which swaps the params 
     904  *  * about to avoid having ABI compat issues 
     905  *   */ 
     906@@ -18,8 +21,8 @@ 
     907 { 
     908   INTERNAL_SYSCALL_DECL (err); 
     909   int ret = INTERNAL_SYSCALL (arm_fadvise64_64, err, 6, fd, advise, 
     910-                              __LONG_LONG_PAIR ((long)(offset >> 32), (long)offset), 
     911-                              __LONG_LONG_PAIR ((long)(len >> 32), (long)len)); 
     912+                              __LONG_LONG_PAIR (HIGH_BITS(offset), (long)offset), 
     913+                              __LONG_LONG_PAIR (HIGH_BITS(len), (long)len)); 
     914  
     915     if (INTERNAL_SYSCALL_ERROR_P (ret, err)) 
     916       return INTERNAL_SYSCALL_ERRNO (ret, err); 
Note: See TracChangeset for help on using the changeset viewer.