toolchain/uClibc/patches-0.9.33.2/970-add___kernel_long_and___kernel_ulong.patch

   1 From 6a76edddaa62ff06f178143b582167734cb55c18 Mon Sep 17 00:00:00 2001
   2 From: Chris Packham <chris.packham@alliedtelesis.co.nz>
   3 Date: Mon, 01 Oct 2012 05:12:54 +0000
   4 Subject: libc/sysdeps: add __kernel_long and __kernel_ulong
   5
   6 Linux 3.4 added __kernel_long_t and __kernel_ulong_t and various
   7 exported header files were updated to use these new types. Add the
   8 definitions for __kernel_long_t and __kernel_ulong_t to the relevant
   9 kernel_types.h headers.
  10
  11 This change was automated with the following scriptlet
  12
  13   git grep --name-only 'typedef.*__kernel_old_dev_t' \
  14     | xargs sed -i '/typedef.*__kernel_old_dev_t/ a\
  15   typedef long\t\t__kernel_long_t;\
  16   typedef unsigned long\t__kernel_ulong_t;'
  17
  18 Whitespace in arm, avr32, hppa, sparc was then manually fixed up.
  19
  20 Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
  21 --
  22 Here's a cleaned up patch which should get the whitespace right. I'm a
  23 bit iffy about the sparc changes they make sense to me but it's not a
  24 platform I have access to.
  25
  26 I can break this up per arch or per maintainer if requested.
  27
  28  libc/sysdeps/linux/alpha/bits/kernel_types.h      |    2 ++
  29  libc/sysdeps/linux/arm/bits/kernel_types.h        |    2 ++
  30  libc/sysdeps/linux/avr32/bits/kernel_types.h      |    2 ++
  31  libc/sysdeps/linux/bfin/bits/kernel_types.h       |    2 ++
  32  libc/sysdeps/linux/c6x/bits/kernel_types.h        |    2 ++
  33  libc/sysdeps/linux/cris/bits/kernel_types.h       |    2 ++
  34  libc/sysdeps/linux/e1/bits/kernel_types.h         |    2 ++
  35  libc/sysdeps/linux/h8300/bits/kernel_types.h      |    2 ++
  36  libc/sysdeps/linux/hppa/bits/kernel_types.h       |    2 ++
  37  libc/sysdeps/linux/i386/bits/kernel_types.h       |    2 ++
  38  libc/sysdeps/linux/ia64/bits/kernel_types.h       |    2 ++
  39  libc/sysdeps/linux/m68k/bits/kernel_types.h       |    2 ++
  40  libc/sysdeps/linux/microblaze/bits/kernel_types.h |    2 ++
  41  libc/sysdeps/linux/mips/bits/kernel_types.h       |    4 ++++
  42  libc/sysdeps/linux/nios2/bits/kernel_types.h      |    2 ++
  43  libc/sysdeps/linux/powerpc/bits/kernel_types.h    |    4 ++++
  44  libc/sysdeps/linux/sh/bits/kernel_types.h         |    2 ++
  45  libc/sysdeps/linux/sh64/bits/kernel_types.h       |    2 ++
  46  libc/sysdeps/linux/sparc/bits/kernel_types.h      |    4 ++++
  47  libc/sysdeps/linux/v850/bits/kernel_types.h       |    2 ++
  48  libc/sysdeps/linux/x86_64/bits/kernel_types.h     |    2 ++
  49  libc/sysdeps/linux/xtensa/bits/kernel_types.h     |    2 ++
  50  22 files changed, 50 insertions(+)
  51 Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
  52 ---
  53 --- a/libc/sysdeps/linux/alpha/bits/kernel_types.h
  54 +++ b/libc/sysdeps/linux/alpha/bits/kernel_types.h
  55 @@ -33,6 +33,8 @@ typedef __kernel_gid_t __kernel_old_gid_
  56  typedef __kernel_uid_t __kernel_uid32_t;
  57  typedef __kernel_gid_t __kernel_gid32_t;
  58  typedef __kernel_dev_t __kernel_old_dev_t;
  59 +typedef long           __kernel_long_t;
  60 +typedef unsigned long  __kernel_ulong_t;
  61
  62  typedef struct {
  63         int val[2];
  64 --- a/libc/sysdeps/linux/arm/bits/kernel_types.h
  65 +++ b/libc/sysdeps/linux/arm/bits/kernel_types.h
  66 @@ -32,6 +32,8 @@ typedef unsigned short                __kernel_old_uid
  67  typedef unsigned short         __kernel_old_gid_t;
  68  typedef long long              __kernel_loff_t;
  69  typedef __kernel_dev_t         __kernel_old_dev_t;
  70 +typedef long                   __kernel_long_t;
  71 +typedef unsigned long          __kernel_ulong_t;
  72
  73  typedef struct {
  74  #ifdef __USE_ALL
  75 --- a/libc/sysdeps/linux/avr32/bits/kernel_types.h
  76 +++ b/libc/sysdeps/linux/avr32/bits/kernel_types.h
  77 @@ -39,6 +39,8 @@ typedef unsigned int          __kernel_gid32_t;
  78  typedef unsigned short         __kernel_old_uid_t;
  79  typedef unsigned short         __kernel_old_gid_t;
  80  typedef unsigned short         __kernel_old_dev_t;
  81 +typedef long                   __kernel_long_t;
  82 +typedef unsigned long          __kernel_ulong_t;
  83
  84  #ifdef __GNUC__
  85  typedef long long              __kernel_loff_t;
  86 --- a/libc/sysdeps/linux/bfin/bits/kernel_types.h
  87 +++ b/libc/sysdeps/linux/bfin/bits/kernel_types.h
  88 @@ -32,6 +32,8 @@ typedef unsigned short        __kernel_old_uid_
  89  typedef unsigned short __kernel_old_gid_t;
  90  typedef long long      __kernel_loff_t;
  91  typedef __kernel_dev_t __kernel_old_dev_t;
  92 +typedef long           __kernel_long_t;
  93 +typedef unsigned long  __kernel_ulong_t;
  94
  95  typedef struct {
  96  #ifdef __USE_ALL
  97 --- a/libc/sysdeps/linux/c6x/bits/kernel_types.h
  98 +++ b/libc/sysdeps/linux/c6x/bits/kernel_types.h
  99 @@ -22,6 +22,8 @@ typedef unsigned int  __kernel_gid32_t;
 100  typedef unsigned int   __kernel_old_uid_t;
 101  typedef unsigned int   __kernel_old_gid_t;
 102  typedef unsigned int   __kernel_old_dev_t;
 103 +typedef long           __kernel_long_t;
 104 +typedef unsigned long  __kernel_ulong_t;
 105  typedef unsigned int   __kernel_size_t;
 106  typedef int            __kernel_ssize_t;
 107  typedef int            __kernel_ptrdiff_t;
 108 --- a/libc/sysdeps/linux/cris/bits/kernel_types.h
 109 +++ b/libc/sysdeps/linux/cris/bits/kernel_types.h
 110 @@ -28,6 +28,8 @@ typedef unsigned int    __kernel_gid32_t
 111  typedef unsigned short  __kernel_old_uid_t;
 112  typedef unsigned short  __kernel_old_gid_t;
 113  typedef __kernel_dev_t __kernel_old_dev_t;
 114 +typedef long           __kernel_long_t;
 115 +typedef unsigned long  __kernel_ulong_t;
 116
 117  #ifdef __GNUC__
 118  typedef long long      __kernel_loff_t;
 119 --- a/libc/sysdeps/linux/e1/bits/kernel_types.h
 120 +++ b/libc/sysdeps/linux/e1/bits/kernel_types.h
 121 @@ -31,6 +31,8 @@ typedef unsigned int  __kernel_gid32_t;
 122  typedef unsigned short __kernel_old_uid_t;
 123  typedef unsigned short __kernel_old_gid_t;
 124  typedef __kernel_dev_t __kernel_old_dev_t;
 125 +typedef long           __kernel_long_t;
 126 +typedef unsigned long  __kernel_ulong_t;
 127  typedef long long      __kernel_loff_t;
 128
 129  /*
 130 --- a/libc/sysdeps/linux/h8300/bits/kernel_types.h
 131 +++ b/libc/sysdeps/linux/h8300/bits/kernel_types.h
 132 @@ -32,6 +32,8 @@ typedef unsigned short        __kernel_old_uid_
 133  typedef unsigned short __kernel_old_gid_t;
 134  typedef long long      __kernel_loff_t;
 135  typedef __kernel_dev_t __kernel_old_dev_t;
 136 +typedef long           __kernel_long_t;
 137 +typedef unsigned long  __kernel_ulong_t;
 138
 139  typedef struct {
 140  #ifdef __USE_ALL
 141 --- a/libc/sysdeps/linux/hppa/bits/kernel_types.h
 142 +++ b/libc/sysdeps/linux/hppa/bits/kernel_types.h
 143 @@ -45,6 +45,8 @@ typedef long long             __kernel_off64_t;
 144  typedef unsigned long long     __kernel_ino64_t;
 145
 146  typedef unsigned int           __kernel_old_dev_t;
 147 +typedef long                   __kernel_long_t;
 148 +typedef unsigned long          __kernel_ulong_t;
 149
 150  typedef struct {
 151  #ifdef __USE_ALL
 152 --- a/libc/sysdeps/linux/i386/bits/kernel_types.h
 153 +++ b/libc/sysdeps/linux/i386/bits/kernel_types.h
 154 @@ -40,6 +40,8 @@ typedef unsigned int  __kernel_gid32_t;
 155  typedef unsigned short __kernel_old_uid_t;
 156  typedef unsigned short __kernel_old_gid_t;
 157  typedef __kernel_dev_t __kernel_old_dev_t;
 158 +typedef long           __kernel_long_t;
 159 +typedef unsigned long  __kernel_ulong_t;
 160  typedef long long      __kernel_loff_t;
 161
 162  typedef struct {
 163 --- a/libc/sysdeps/linux/ia64/bits/kernel_types.h
 164 +++ b/libc/sysdeps/linux/ia64/bits/kernel_types.h
 165 @@ -52,5 +52,7 @@ typedef __kernel_gid_t __kernel_gid32_t;
 166
 167  typedef unsigned int   __kernel_dev_t;
 168  typedef unsigned int   __kernel_old_dev_t;
 169 +typedef long           __kernel_long_t;
 170 +typedef unsigned long  __kernel_ulong_t;
 171
 172  #endif /* _ASM_IA64_POSIX_TYPES_H */
 173 --- a/libc/sysdeps/linux/m68k/bits/kernel_types.h
 174 +++ b/libc/sysdeps/linux/m68k/bits/kernel_types.h
 175 @@ -32,6 +32,8 @@ typedef unsigned short        __kernel_old_uid_
 176  typedef unsigned short __kernel_old_gid_t;
 177  typedef long long      __kernel_loff_t;
 178  typedef __kernel_dev_t __kernel_old_dev_t;
 179 +typedef long           __kernel_long_t;
 180 +typedef unsigned long  __kernel_ulong_t;
 181
 182  typedef struct {
 183  #ifdef __USE_ALL
 184 --- a/libc/sysdeps/linux/microblaze/bits/kernel_types.h
 185 +++ b/libc/sysdeps/linux/microblaze/bits/kernel_types.h
 186 @@ -44,6 +44,8 @@ typedef unsigned int  __kernel_gid32_t;
 187  typedef unsigned int   __kernel_old_uid_t;
 188  typedef unsigned int   __kernel_old_gid_t;
 189  typedef unsigned int   __kernel_old_dev_t;
 190 +typedef long           __kernel_long_t;
 191 +typedef unsigned long  __kernel_ulong_t;
 192
 193  #ifdef __GNUC__
 194  typedef long long      __kernel_loff_t;
 195 --- a/libc/sysdeps/linux/mips/bits/kernel_types.h
 196 +++ b/libc/sysdeps/linux/mips/bits/kernel_types.h
 197 @@ -32,6 +32,8 @@ typedef int           __kernel_gid32_t;
 198  typedef __kernel_uid_t __kernel_old_uid_t;
 199  typedef __kernel_gid_t __kernel_old_gid_t;
 200  typedef __kernel_dev_t __kernel_old_dev_t;
 201 +typedef long           __kernel_long_t;
 202 +typedef unsigned long  __kernel_ulong_t;
 203  typedef long long      __kernel_loff_t;
 204  #else
 205  typedef unsigned int   __kernel_dev_t;
 206 @@ -68,6 +70,8 @@ typedef int           __kernel_gid32_t;
 207  typedef __kernel_uid_t __kernel_old_uid_t;
 208  typedef __kernel_gid_t __kernel_old_gid_t;
 209  typedef __kernel_dev_t __kernel_old_dev_t;
 210 +typedef long           __kernel_long_t;
 211 +typedef unsigned long  __kernel_ulong_t;
 212  typedef long long      __kernel_loff_t;
 213  #endif
 214
 215 --- a/libc/sysdeps/linux/nios2/bits/kernel_types.h
 216 +++ b/libc/sysdeps/linux/nios2/bits/kernel_types.h
 217 @@ -31,6 +31,8 @@ typedef unsigned int  __kernel_gid32_t;
 218  typedef unsigned short __kernel_old_uid_t;
 219  typedef unsigned short __kernel_old_gid_t;
 220  typedef unsigned short __kernel_old_dev_t;
 221 +typedef long           __kernel_long_t;
 222 +typedef unsigned long  __kernel_ulong_t;
 223  typedef long long      __kernel_loff_t;
 224
 225  typedef struct {
 226 --- a/libc/sysdeps/linux/powerpc/bits/kernel_types.h
 227 +++ b/libc/sysdeps/linux/powerpc/bits/kernel_types.h
 228 @@ -36,6 +36,8 @@ typedef unsigned int  __kernel_gid32_t;
 229  typedef unsigned int   __kernel_old_uid_t;
 230  typedef unsigned int   __kernel_old_gid_t;
 231  typedef __kernel_dev_t __kernel_old_dev_t;
 232 +typedef long           __kernel_long_t;
 233 +typedef unsigned long  __kernel_ulong_t;
 234  #else
 235  typedef unsigned int   __kernel_dev_t;
 236  typedef unsigned int   __kernel_ino_t;
 237 @@ -61,6 +63,8 @@ typedef unsigned int  __kernel_gid32_t;
 238  typedef unsigned int   __kernel_old_uid_t;
 239  typedef unsigned int   __kernel_old_gid_t;
 240  typedef __kernel_dev_t __kernel_old_dev_t;
 241 +typedef long           __kernel_long_t;
 242 +typedef unsigned long  __kernel_ulong_t;
 243  typedef long long      __kernel_loff_t;
 244  #endif
 245
 246 --- a/libc/sysdeps/linux/sh/bits/kernel_types.h
 247 +++ b/libc/sysdeps/linux/sh/bits/kernel_types.h
 248 @@ -32,6 +32,8 @@ typedef unsigned int  __kernel_gid32_t;
 249  typedef unsigned short __kernel_old_uid_t;
 250  typedef unsigned short __kernel_old_gid_t;
 251  typedef __kernel_dev_t __kernel_old_dev_t;
 252 +typedef long           __kernel_long_t;
 253 +typedef unsigned long  __kernel_ulong_t;
 254  typedef long long      __kernel_loff_t;
 255
 256  typedef struct {
 257 --- a/libc/sysdeps/linux/sh64/bits/kernel_types.h
 258 +++ b/libc/sysdeps/linux/sh64/bits/kernel_types.h
 259 @@ -43,6 +43,8 @@ typedef unsigned int    __kernel_gid32_t
 260  typedef unsigned short  __kernel_old_uid_t;
 261  typedef unsigned short  __kernel_old_gid_t;
 262  typedef __kernel_dev_t __kernel_old_dev_t;
 263 +typedef long           __kernel_long_t;
 264 +typedef unsigned long  __kernel_ulong_t;
 265  typedef long long       __kernel_loff_t;
 266
 267  typedef struct {
 268 --- a/libc/sysdeps/linux/sparc/bits/kernel_types.h
 269 +++ b/libc/sysdeps/linux/sparc/bits/kernel_types.h
 270 @@ -32,6 +32,8 @@ typedef unsigned short               __kernel_g
 271  typedef __kernel_uid_t                __kernel_old_uid_t;
 272  typedef __kernel_gid_t         __kernel_old_gid_t;
 273  typedef __kernel_dev_t         __kernel_old_dev_t;
 274 +typedef long                   __kernel_long_t;
 275 +typedef unsigned long          __kernel_ulong_t;
 276  typedef __kernel_uid_t        __kernel_uid32_t;
 277  typedef __kernel_gid_t        __kernel_gid32_t;
 278  typedef int                   __kernel_suseconds_t;
 279 @@ -62,6 +64,8 @@ typedef unsigned int         __kernel_gid
 280  typedef unsigned short        __kernel_old_uid_t;
 281  typedef unsigned short        __kernel_old_gid_t;
 282  typedef __kernel_dev_t         __kernel_old_dev_t;
 283 +typedef long                   __kernel_long_t;
 284 +typedef unsigned long          __kernel_ulong_t;
 285  typedef long long              __kernel_loff_t;
 286  #endif
 287
 288 --- a/libc/sysdeps/linux/v850/bits/kernel_types.h
 289 +++ b/libc/sysdeps/linux/v850/bits/kernel_types.h
 290 @@ -41,6 +41,8 @@ typedef unsigned int  __kernel_gid32_t;
 291  typedef unsigned short __kernel_old_uid_t;
 292  typedef unsigned short __kernel_old_gid_t;
 293  typedef __kernel_dev_t __kernel_old_dev_t;
 294 +typedef long           __kernel_long_t;
 295 +typedef unsigned long  __kernel_ulong_t;
 296
 297  typedef struct {
 298  #ifdef __USE_ALL
 299 --- a/libc/sysdeps/linux/x86_64/bits/kernel_types.h
 300 +++ b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
 301 @@ -40,6 +40,8 @@ typedef unsigned int  __kernel_gid32_t;
 302  typedef unsigned short __kernel_old_uid_t;
 303  typedef unsigned short __kernel_old_gid_t;
 304  typedef __kernel_dev_t __kernel_old_dev_t;
 305 +typedef long           __kernel_long_t;
 306 +typedef unsigned long  __kernel_ulong_t;
 307  typedef long long      __kernel_loff_t;
 308
 309  typedef struct {
 310 --- a/libc/sysdeps/linux/xtensa/bits/kernel_types.h
 311 +++ b/libc/sysdeps/linux/xtensa/bits/kernel_types.h
 312 @@ -33,6 +33,8 @@ typedef unsigned int  __kernel_gid32_t;
 313  typedef unsigned short __kernel_old_uid_t;
 314  typedef unsigned short __kernel_old_gid_t;
 315  typedef unsigned short __kernel_old_dev_t;
 316 +typedef long           __kernel_long_t;
 317 +typedef unsigned long  __kernel_ulong_t;
 318  typedef long long      __kernel_loff_t;
 319
 320  /* Beginning in 2.6 kernels, which is the first version that includes the