diff options
| author | Khem Raj <raj.khem@gmail.com> | 2014-08-25 16:45:02 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-27 12:12:32 +0100 |
| commit | 90f65662eec8d330908385dcd50603f652f4a5ad (patch) | |
| tree | 98dbd5b35a9e4562f55b669ba54fe45567ecc7c7 /meta | |
| parent | 6e7127d400cc1b730ac57c0c49354b5aebcf574d (diff) | |
| download | poky-90f65662eec8d330908385dcd50603f652f4a5ad.tar.gz | |
uclibc: Upgrade to tip of master
Adjust mips to cater for new mips32r2 defaulttune
Remove upstreamed patches
(From OE-Core rev: 8003ce0df3f6297391a709cc9720adffbd8fbd0f)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
5 files changed, 6 insertions, 581 deletions
diff --git a/meta/recipes-core/uclibc/uclibc-git.inc b/meta/recipes-core/uclibc/uclibc-git.inc index 69e834d6d1..a6b9f65b54 100644 --- a/meta/recipes-core/uclibc/uclibc-git.inc +++ b/meta/recipes-core/uclibc/uclibc-git.inc | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | SRCREV="5eddde8f094ef52dca06695cc598e3b2556dcccb" | 1 | SRCREV = "48a0006012679ff0eda6f256da958d73a924fb57" |
| 2 | 2 | ||
| 3 | PV = "0.9.33+git${SRCPV}" | 3 | PV = "0.9.33+git${SRCPV}" |
| 4 | 4 | ||
| @@ -23,7 +23,5 @@ SRC_URI = "git://uclibc.org/uClibc.git;branch=master \ | |||
| 23 | file://0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch \ | 23 | file://0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch \ |
| 24 | file://0001-Add-eventfd_read-and-eventfd_write.patch \ | 24 | file://0001-Add-eventfd_read-and-eventfd_write.patch \ |
| 25 | file://0002-wire-setns-syscall.patch \ | 25 | file://0002-wire-setns-syscall.patch \ |
| 26 | file://0003-fcntl.h-Define-F_SETPIPE_SZ-and-F_GETPIPE_SZ.patch \ | ||
| 27 | file://0004-Add-clock_adjtime-syscall.patch \ | ||
| 28 | " | 26 | " |
| 29 | S = "${WORKDIR}/git" | 27 | S = "${WORKDIR}/git" |
diff --git a/meta/recipes-core/uclibc/uclibc-git/0003-fcntl.h-Define-F_SETPIPE_SZ-and-F_GETPIPE_SZ.patch b/meta/recipes-core/uclibc/uclibc-git/0003-fcntl.h-Define-F_SETPIPE_SZ-and-F_GETPIPE_SZ.patch deleted file mode 100644 index f4387db9c7..0000000000 --- a/meta/recipes-core/uclibc/uclibc-git/0003-fcntl.h-Define-F_SETPIPE_SZ-and-F_GETPIPE_SZ.patch +++ /dev/null | |||
| @@ -1,377 +0,0 @@ | |||
| 1 | From 7791d129d777e481a1e429815edcd05978438840 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Thu, 20 Feb 2014 01:12:14 -0800 | ||
| 4 | Subject: [PATCH 3/3] fcntl.h: Define F_SETPIPE_SZ and F_GETPIPE_SZ | ||
| 5 | |||
| 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 7 | Upstream-Status: Pending | ||
| 8 | --- | ||
| 9 | libc/sysdeps/linux/alpha/bits/fcntl.h | 2 ++ | ||
| 10 | libc/sysdeps/linux/arc/bits/fcntl.h | 2 ++ | ||
| 11 | libc/sysdeps/linux/arm/bits/fcntl.h | 2 ++ | ||
| 12 | libc/sysdeps/linux/bfin/bits/fcntl.h | 2 ++ | ||
| 13 | libc/sysdeps/linux/cris/bits/fcntl.h | 2 ++ | ||
| 14 | libc/sysdeps/linux/e1/bits/fcntl.h | 2 ++ | ||
| 15 | libc/sysdeps/linux/frv/bits/fcntl.h | 2 ++ | ||
| 16 | libc/sysdeps/linux/h8300/bits/fcntl.h | 2 ++ | ||
| 17 | libc/sysdeps/linux/hppa/bits/fcntl.h | 2 ++ | ||
| 18 | libc/sysdeps/linux/i386/bits/fcntl.h | 2 ++ | ||
| 19 | libc/sysdeps/linux/i960/bits/fcntl.h | 2 ++ | ||
| 20 | libc/sysdeps/linux/ia64/bits/fcntl.h | 2 ++ | ||
| 21 | libc/sysdeps/linux/m68k/bits/fcntl.h | 2 ++ | ||
| 22 | libc/sysdeps/linux/metag/bits/fcntl.h | 2 ++ | ||
| 23 | libc/sysdeps/linux/microblaze/bits/fcntl.h | 2 ++ | ||
| 24 | libc/sysdeps/linux/mips/bits/fcntl.h | 2 ++ | ||
| 25 | libc/sysdeps/linux/nios/bits/fcntl.h | 2 ++ | ||
| 26 | libc/sysdeps/linux/nios2/bits/fcntl.h | 2 ++ | ||
| 27 | libc/sysdeps/linux/powerpc/bits/fcntl.h | 2 ++ | ||
| 28 | libc/sysdeps/linux/sh/bits/fcntl.h | 2 ++ | ||
| 29 | libc/sysdeps/linux/sh64/bits/fcntl.h | 2 ++ | ||
| 30 | libc/sysdeps/linux/sparc/bits/fcntl.h | 2 ++ | ||
| 31 | libc/sysdeps/linux/v850/bits/fcntl.h | 2 ++ | ||
| 32 | libc/sysdeps/linux/vax/bits/fcntl.h | 2 ++ | ||
| 33 | libc/sysdeps/linux/x86_64/bits/fcntl.h | 2 ++ | ||
| 34 | libc/sysdeps/linux/xtensa/bits/fcntl.h | 2 ++ | ||
| 35 | 26 files changed, 52 insertions(+) | ||
| 36 | |||
| 37 | diff --git a/libc/sysdeps/linux/alpha/bits/fcntl.h b/libc/sysdeps/linux/alpha/bits/fcntl.h | ||
| 38 | index dd32529..a44be9e 100644 | ||
| 39 | --- a/libc/sysdeps/linux/alpha/bits/fcntl.h | ||
| 40 | +++ b/libc/sysdeps/linux/alpha/bits/fcntl.h | ||
| 41 | @@ -94,6 +94,8 @@ | ||
| 42 | # define F_NOTIFY 1026 /* Request notfications on a directory. */ | ||
| 43 | # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with | ||
| 44 | close-on-exit set on new fd. */ | ||
| 45 | +# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */ | ||
| 46 | +# define F_GETPIPE_SZ 1032 /* Get pipe page size array. */ | ||
| 47 | #endif | ||
| 48 | |||
| 49 | /* for F_[GET|SET]FD */ | ||
| 50 | diff --git a/libc/sysdeps/linux/arc/bits/fcntl.h b/libc/sysdeps/linux/arc/bits/fcntl.h | ||
| 51 | index 71136da..1cb9600 100755 | ||
| 52 | --- a/libc/sysdeps/linux/arc/bits/fcntl.h | ||
| 53 | +++ b/libc/sysdeps/linux/arc/bits/fcntl.h | ||
| 54 | @@ -87,6 +87,8 @@ | ||
| 55 | # define F_NOTIFY 1026 /* Request notfications on a directory. */ | ||
| 56 | # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with | ||
| 57 | close-on-exit set on new fd. */ | ||
| 58 | +# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */ | ||
| 59 | +# define F_GETPIPE_SZ 1032 /* Get pipe page size array. */ | ||
| 60 | #endif | ||
| 61 | |||
| 62 | /* For F_[GET|SET]FL. */ | ||
| 63 | diff --git a/libc/sysdeps/linux/arm/bits/fcntl.h b/libc/sysdeps/linux/arm/bits/fcntl.h | ||
| 64 | index f1a54f0..aedc154 100644 | ||
| 65 | --- a/libc/sysdeps/linux/arm/bits/fcntl.h | ||
| 66 | +++ b/libc/sysdeps/linux/arm/bits/fcntl.h | ||
| 67 | @@ -99,6 +99,8 @@ | ||
| 68 | # define F_NOTIFY 1026 /* Request notfications on a directory. */ | ||
| 69 | # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with | ||
| 70 | close-on-exit set on new fd. */ | ||
| 71 | +# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */ | ||
| 72 | +# define F_GETPIPE_SZ 1032 /* Get pipe page size array. */ | ||
| 73 | #endif | ||
| 74 | |||
| 75 | /* For F_[GET|SET]FD. */ | ||
| 76 | diff --git a/libc/sysdeps/linux/bfin/bits/fcntl.h b/libc/sysdeps/linux/bfin/bits/fcntl.h | ||
| 77 | index c6cba56..e987824 100644 | ||
| 78 | --- a/libc/sysdeps/linux/bfin/bits/fcntl.h | ||
| 79 | +++ b/libc/sysdeps/linux/bfin/bits/fcntl.h | ||
| 80 | @@ -98,6 +98,8 @@ | ||
| 81 | # define F_NOTIFY 1026 /* Request notfications on a directory. */ | ||
| 82 | # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with | ||
| 83 | close-on-exit set on new fd. */ | ||
| 84 | +# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */ | ||
| 85 | +# define F_GETPIPE_SZ 1032 /* Get pipe page size array. */ | ||
| 86 | #endif | ||
| 87 | |||
| 88 | /* For F_[GET|SET]FL. */ | ||
| 89 | diff --git a/libc/sysdeps/linux/cris/bits/fcntl.h b/libc/sysdeps/linux/cris/bits/fcntl.h | ||
| 90 | index acc5e25..029bb80 100644 | ||
| 91 | --- a/libc/sysdeps/linux/cris/bits/fcntl.h | ||
| 92 | +++ b/libc/sysdeps/linux/cris/bits/fcntl.h | ||
| 93 | @@ -99,6 +99,8 @@ | ||
| 94 | # define F_NOTIFY 1026 /* Request notfications on a directory. */ | ||
| 95 | # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with | ||
| 96 | close-on-exit set on new fd. */ | ||
| 97 | +# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */ | ||
| 98 | +# define F_GETPIPE_SZ 1032 /* Get pipe page size array. */ | ||
| 99 | #endif | ||
| 100 | |||
| 101 | /* For F_[GET|SET]FL. */ | ||
| 102 | diff --git a/libc/sysdeps/linux/e1/bits/fcntl.h b/libc/sysdeps/linux/e1/bits/fcntl.h | ||
| 103 | index da699c8..2e0e6ba 100644 | ||
| 104 | --- a/libc/sysdeps/linux/e1/bits/fcntl.h | ||
| 105 | +++ b/libc/sysdeps/linux/e1/bits/fcntl.h | ||
| 106 | @@ -93,6 +93,8 @@ | ||
| 107 | # define F_NOTIFY 1026 /* Request notfications on a directory. */ | ||
| 108 | # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with | ||
| 109 | close-on-exit set on new fd. */ | ||
| 110 | +# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */ | ||
| 111 | +# define F_GETPIPE_SZ 1032 /* Get pipe page size array. */ | ||
| 112 | #endif | ||
| 113 | |||
| 114 | /* For F_[GET|SET]FL. */ | ||
| 115 | diff --git a/libc/sysdeps/linux/frv/bits/fcntl.h b/libc/sysdeps/linux/frv/bits/fcntl.h | ||
| 116 | index 3aacc9d..5a7d9ef 100644 | ||
| 117 | --- a/libc/sysdeps/linux/frv/bits/fcntl.h | ||
| 118 | +++ b/libc/sysdeps/linux/frv/bits/fcntl.h | ||
| 119 | @@ -95,6 +95,8 @@ | ||
| 120 | # define F_NOTIFY 1026 /* Request notfications on a directory. */ | ||
| 121 | # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with | ||
| 122 | close-on-exit set on new fd. */ | ||
| 123 | +# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */ | ||
| 124 | +# define F_GETPIPE_SZ 1032 /* Get pipe page size array. */ | ||
| 125 | #endif | ||
| 126 | |||
| 127 | /* For F_[GET|SET]FL. */ | ||
| 128 | diff --git a/libc/sysdeps/linux/h8300/bits/fcntl.h b/libc/sysdeps/linux/h8300/bits/fcntl.h | ||
| 129 | index d0b8310..45deec4 100644 | ||
| 130 | --- a/libc/sysdeps/linux/h8300/bits/fcntl.h | ||
| 131 | +++ b/libc/sysdeps/linux/h8300/bits/fcntl.h | ||
| 132 | @@ -93,6 +93,8 @@ | ||
| 133 | # define F_NOTIFY 1026 /* Request notfications on a directory. */ | ||
| 134 | # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with | ||
| 135 | close-on-exit set on new fd. */ | ||
| 136 | +# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */ | ||
| 137 | +# define F_GETPIPE_SZ 1032 /* Get pipe page size array. */ | ||
| 138 | #endif | ||
| 139 | |||
| 140 | /* For F_[GET|SET]FL. */ | ||
| 141 | diff --git a/libc/sysdeps/linux/hppa/bits/fcntl.h b/libc/sysdeps/linux/hppa/bits/fcntl.h | ||
| 142 | index 1bb41ce..abb3372 100644 | ||
| 143 | --- a/libc/sysdeps/linux/hppa/bits/fcntl.h | ||
| 144 | +++ b/libc/sysdeps/linux/hppa/bits/fcntl.h | ||
| 145 | @@ -96,6 +96,8 @@ | ||
| 146 | # define F_NOTIFY 1026 /* Request notfications on a directory. */ | ||
| 147 | # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with | ||
| 148 | close-on-exit set on new fd. */ | ||
| 149 | +# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */ | ||
| 150 | +# define F_GETPIPE_SZ 1032 /* Get pipe page size array. */ | ||
| 151 | #endif | ||
| 152 | |||
| 153 | /* for F_[GET|SET]FL */ | ||
| 154 | diff --git a/libc/sysdeps/linux/i386/bits/fcntl.h b/libc/sysdeps/linux/i386/bits/fcntl.h | ||
| 155 | index d48e62a..79b69d4 100644 | ||
| 156 | --- a/libc/sysdeps/linux/i386/bits/fcntl.h | ||
| 157 | +++ b/libc/sysdeps/linux/i386/bits/fcntl.h | ||
| 158 | @@ -99,6 +99,8 @@ | ||
| 159 | # define F_NOTIFY 1026 /* Request notfications on a directory. */ | ||
| 160 | # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with | ||
| 161 | close-on-exit set on new fd. */ | ||
| 162 | +# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */ | ||
| 163 | +# define F_GETPIPE_SZ 1032 /* Get pipe page size array. */ | ||
| 164 | #endif | ||
| 165 | |||
| 166 | /* For F_[GET|SET]FD. */ | ||
| 167 | diff --git a/libc/sysdeps/linux/i960/bits/fcntl.h b/libc/sysdeps/linux/i960/bits/fcntl.h | ||
| 168 | index e2fcbe6..f6e145d 100644 | ||
| 169 | --- a/libc/sysdeps/linux/i960/bits/fcntl.h | ||
| 170 | +++ b/libc/sysdeps/linux/i960/bits/fcntl.h | ||
| 171 | @@ -93,6 +93,8 @@ | ||
| 172 | # define F_NOTIFY 1026 /* Request notfications on a directory. */ | ||
| 173 | # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with | ||
| 174 | close-on-exit set on new fd. */ | ||
| 175 | +# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */ | ||
| 176 | +# define F_GETPIPE_SZ 1032 /* Get pipe page size array. */ | ||
| 177 | #endif | ||
| 178 | |||
| 179 | /* For F_[GET|SET]FL. */ | ||
| 180 | diff --git a/libc/sysdeps/linux/ia64/bits/fcntl.h b/libc/sysdeps/linux/ia64/bits/fcntl.h | ||
| 181 | index 1ff0ed5..fedefb6 100644 | ||
| 182 | --- a/libc/sysdeps/linux/ia64/bits/fcntl.h | ||
| 183 | +++ b/libc/sysdeps/linux/ia64/bits/fcntl.h | ||
| 184 | @@ -95,6 +95,8 @@ | ||
| 185 | # define F_NOTIFY 1026 /* Request notfications on a directory. */ | ||
| 186 | # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with | ||
| 187 | close-on-exit set on new fd. */ | ||
| 188 | +# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */ | ||
| 189 | +# define F_GETPIPE_SZ 1032 /* Get pipe page size array. */ | ||
| 190 | #endif | ||
| 191 | |||
| 192 | /* For F_[GET|SET]FD. */ | ||
| 193 | diff --git a/libc/sysdeps/linux/m68k/bits/fcntl.h b/libc/sysdeps/linux/m68k/bits/fcntl.h | ||
| 194 | index d7beb6c..66df337 100644 | ||
| 195 | --- a/libc/sysdeps/linux/m68k/bits/fcntl.h | ||
| 196 | +++ b/libc/sysdeps/linux/m68k/bits/fcntl.h | ||
| 197 | @@ -98,6 +98,8 @@ | ||
| 198 | # define F_NOTIFY 1026 /* Request notfications on a directory. */ | ||
| 199 | # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with | ||
| 200 | close-on-exit set on new fd. */ | ||
| 201 | +# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */ | ||
| 202 | +# define F_GETPIPE_SZ 1032 /* Get pipe page size array. */ | ||
| 203 | #endif | ||
| 204 | |||
| 205 | /* For F_[GET|SET]FL. */ | ||
| 206 | diff --git a/libc/sysdeps/linux/metag/bits/fcntl.h b/libc/sysdeps/linux/metag/bits/fcntl.h | ||
| 207 | index c4f641b..e10abd7 100644 | ||
| 208 | --- a/libc/sysdeps/linux/metag/bits/fcntl.h | ||
| 209 | +++ b/libc/sysdeps/linux/metag/bits/fcntl.h | ||
| 210 | @@ -100,6 +100,8 @@ | ||
| 211 | # define F_NOTIFY 1026 /* Request notfications on a directory. */ | ||
| 212 | # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with | ||
| 213 | close-on-exit set on new fd. */ | ||
| 214 | +# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */ | ||
| 215 | +# define F_GETPIPE_SZ 1032 /* Get pipe page size array. */ | ||
| 216 | #endif | ||
| 217 | |||
| 218 | /* For F_[GET|SET]FD. */ | ||
| 219 | diff --git a/libc/sysdeps/linux/microblaze/bits/fcntl.h b/libc/sysdeps/linux/microblaze/bits/fcntl.h | ||
| 220 | index a2e3573..20b7597 100644 | ||
| 221 | --- a/libc/sysdeps/linux/microblaze/bits/fcntl.h | ||
| 222 | +++ b/libc/sysdeps/linux/microblaze/bits/fcntl.h | ||
| 223 | @@ -98,6 +98,8 @@ | ||
| 224 | # define F_NOTIFY 1026 /* Request notfications on a directory. */ | ||
| 225 | # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with | ||
| 226 | close-on-exit set on new fd. */ | ||
| 227 | +# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */ | ||
| 228 | +# define F_GETPIPE_SZ 1032 /* Get pipe page size array. */ | ||
| 229 | # define F_SETPIPE_SZ 1031 /* Set of pipe page size array */ | ||
| 230 | # define F_GETPIPE_SZ 1032 /* Get of pipe page size array */ | ||
| 231 | #endif | ||
| 232 | diff --git a/libc/sysdeps/linux/mips/bits/fcntl.h b/libc/sysdeps/linux/mips/bits/fcntl.h | ||
| 233 | index 4291f6e..8c4c115 100644 | ||
| 234 | --- a/libc/sysdeps/linux/mips/bits/fcntl.h | ||
| 235 | +++ b/libc/sysdeps/linux/mips/bits/fcntl.h | ||
| 236 | @@ -111,6 +111,8 @@ | ||
| 237 | # define F_NOTIFY 1026 /* Request notfications on a directory. */ | ||
| 238 | # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with | ||
| 239 | close-on-exit set on new fd. */ | ||
| 240 | +# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */ | ||
| 241 | +# define F_GETPIPE_SZ 1032 /* Get pipe page size array. */ | ||
| 242 | #endif | ||
| 243 | |||
| 244 | /* For F_[GET|SET]FL. */ | ||
| 245 | diff --git a/libc/sysdeps/linux/nios/bits/fcntl.h b/libc/sysdeps/linux/nios/bits/fcntl.h | ||
| 246 | index 5854c18..36ca766 100644 | ||
| 247 | --- a/libc/sysdeps/linux/nios/bits/fcntl.h | ||
| 248 | +++ b/libc/sysdeps/linux/nios/bits/fcntl.h | ||
| 249 | @@ -96,6 +96,8 @@ | ||
| 250 | # define F_NOTIFY 1026 /* Request notfications on a directory. */ | ||
| 251 | # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with | ||
| 252 | close-on-exit set on new fd. */ | ||
| 253 | +# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */ | ||
| 254 | +# define F_GETPIPE_SZ 1032 /* Get pipe page size array. */ | ||
| 255 | #endif | ||
| 256 | |||
| 257 | /* For F_[GET|SET]FL. */ | ||
| 258 | diff --git a/libc/sysdeps/linux/nios2/bits/fcntl.h b/libc/sysdeps/linux/nios2/bits/fcntl.h | ||
| 259 | index d7beb6c..66df337 100644 | ||
| 260 | --- a/libc/sysdeps/linux/nios2/bits/fcntl.h | ||
| 261 | +++ b/libc/sysdeps/linux/nios2/bits/fcntl.h | ||
| 262 | @@ -98,6 +98,8 @@ | ||
| 263 | # define F_NOTIFY 1026 /* Request notfications on a directory. */ | ||
| 264 | # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with | ||
| 265 | close-on-exit set on new fd. */ | ||
| 266 | +# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */ | ||
| 267 | +# define F_GETPIPE_SZ 1032 /* Get pipe page size array. */ | ||
| 268 | #endif | ||
| 269 | |||
| 270 | /* For F_[GET|SET]FL. */ | ||
| 271 | diff --git a/libc/sysdeps/linux/powerpc/bits/fcntl.h b/libc/sysdeps/linux/powerpc/bits/fcntl.h | ||
| 272 | index 217f54a..d150a31 100644 | ||
| 273 | --- a/libc/sysdeps/linux/powerpc/bits/fcntl.h | ||
| 274 | +++ b/libc/sysdeps/linux/powerpc/bits/fcntl.h | ||
| 275 | @@ -99,6 +99,8 @@ | ||
| 276 | # define F_NOTIFY 1026 /* Request notfications on a directory. */ | ||
| 277 | # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with | ||
| 278 | close-on-exit set on new fd. */ | ||
| 279 | +# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */ | ||
| 280 | +# define F_GETPIPE_SZ 1032 /* Get pipe page size array. */ | ||
| 281 | #endif | ||
| 282 | |||
| 283 | /* For F_[GET|SET]FD. */ | ||
| 284 | diff --git a/libc/sysdeps/linux/sh/bits/fcntl.h b/libc/sysdeps/linux/sh/bits/fcntl.h | ||
| 285 | index 5c9f047..aceaec6 100644 | ||
| 286 | --- a/libc/sysdeps/linux/sh/bits/fcntl.h | ||
| 287 | +++ b/libc/sysdeps/linux/sh/bits/fcntl.h | ||
| 288 | @@ -99,6 +99,8 @@ | ||
| 289 | # define F_NOTIFY 1026 /* Request notfications on a directory. */ | ||
| 290 | # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with | ||
| 291 | close-on-exit set on new fd. */ | ||
| 292 | +# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */ | ||
| 293 | +# define F_GETPIPE_SZ 1032 /* Get pipe page size array. */ | ||
| 294 | #endif | ||
| 295 | |||
| 296 | /* For F_[GET|SET]FD. */ | ||
| 297 | diff --git a/libc/sysdeps/linux/sh64/bits/fcntl.h b/libc/sysdeps/linux/sh64/bits/fcntl.h | ||
| 298 | index ff741cb..b319e8b 100644 | ||
| 299 | --- a/libc/sysdeps/linux/sh64/bits/fcntl.h | ||
| 300 | +++ b/libc/sysdeps/linux/sh64/bits/fcntl.h | ||
| 301 | @@ -95,6 +95,8 @@ | ||
| 302 | # define F_NOTIFY 1026 /* Request notfications on a directory. */ | ||
| 303 | # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with | ||
| 304 | close-on-exit set on new fd. */ | ||
| 305 | +# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */ | ||
| 306 | +# define F_GETPIPE_SZ 1032 /* Get pipe page size array. */ | ||
| 307 | #endif | ||
| 308 | |||
| 309 | /* For F_[GET|SET]FL. */ | ||
| 310 | diff --git a/libc/sysdeps/linux/sparc/bits/fcntl.h b/libc/sysdeps/linux/sparc/bits/fcntl.h | ||
| 311 | index 235d2ad..7e80d9e 100644 | ||
| 312 | --- a/libc/sysdeps/linux/sparc/bits/fcntl.h | ||
| 313 | +++ b/libc/sysdeps/linux/sparc/bits/fcntl.h | ||
| 314 | @@ -106,6 +106,8 @@ | ||
| 315 | # define F_NOTIFY 1026 /* Request notfications on a directory. */ | ||
| 316 | # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with | ||
| 317 | close-on-exit set on new fd. */ | ||
| 318 | +# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */ | ||
| 319 | +# define F_GETPIPE_SZ 1032 /* Get pipe page size array. */ | ||
| 320 | #endif | ||
| 321 | |||
| 322 | #if __WORDSIZE == 64 | ||
| 323 | diff --git a/libc/sysdeps/linux/v850/bits/fcntl.h b/libc/sysdeps/linux/v850/bits/fcntl.h | ||
| 324 | index d0b8310..45deec4 100644 | ||
| 325 | --- a/libc/sysdeps/linux/v850/bits/fcntl.h | ||
| 326 | +++ b/libc/sysdeps/linux/v850/bits/fcntl.h | ||
| 327 | @@ -93,6 +93,8 @@ | ||
| 328 | # define F_NOTIFY 1026 /* Request notfications on a directory. */ | ||
| 329 | # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with | ||
| 330 | close-on-exit set on new fd. */ | ||
| 331 | +# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */ | ||
| 332 | +# define F_GETPIPE_SZ 1032 /* Get pipe page size array. */ | ||
| 333 | #endif | ||
| 334 | |||
| 335 | /* For F_[GET|SET]FL. */ | ||
| 336 | diff --git a/libc/sysdeps/linux/vax/bits/fcntl.h b/libc/sysdeps/linux/vax/bits/fcntl.h | ||
| 337 | index ff5bff3..a30d5e1 100644 | ||
| 338 | --- a/libc/sysdeps/linux/vax/bits/fcntl.h | ||
| 339 | +++ b/libc/sysdeps/linux/vax/bits/fcntl.h | ||
| 340 | @@ -92,6 +92,8 @@ | ||
| 341 | # define F_NOTIFY 1026 /* Request notfications on a directory. */ | ||
| 342 | # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with | ||
| 343 | close-on-exit set on new fd. */ | ||
| 344 | +# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */ | ||
| 345 | +# define F_GETPIPE_SZ 1032 /* Get pipe page size array. */ | ||
| 346 | #endif | ||
| 347 | |||
| 348 | /* For F_[GET|SET]FL. */ | ||
| 349 | diff --git a/libc/sysdeps/linux/x86_64/bits/fcntl.h b/libc/sysdeps/linux/x86_64/bits/fcntl.h | ||
| 350 | index a899dcf..02e011d 100644 | ||
| 351 | --- a/libc/sysdeps/linux/x86_64/bits/fcntl.h | ||
| 352 | +++ b/libc/sysdeps/linux/x86_64/bits/fcntl.h | ||
| 353 | @@ -113,6 +113,8 @@ | ||
| 354 | # define F_NOTIFY 1026 /* Request notfications on a directory. */ | ||
| 355 | # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with | ||
| 356 | close-on-exit set on new fd. */ | ||
| 357 | +# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */ | ||
| 358 | +# define F_GETPIPE_SZ 1032 /* Get pipe page size array. */ | ||
| 359 | #endif | ||
| 360 | |||
| 361 | /* For F_[GET|SET]FD. */ | ||
| 362 | diff --git a/libc/sysdeps/linux/xtensa/bits/fcntl.h b/libc/sysdeps/linux/xtensa/bits/fcntl.h | ||
| 363 | index 5d28547..4e9aa7e 100644 | ||
| 364 | --- a/libc/sysdeps/linux/xtensa/bits/fcntl.h | ||
| 365 | +++ b/libc/sysdeps/linux/xtensa/bits/fcntl.h | ||
| 366 | @@ -99,6 +99,8 @@ | ||
| 367 | # define F_NOTIFY 1026 /* Request notfications on a directory. */ | ||
| 368 | # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with | ||
| 369 | close-on-exit set on new fd. */ | ||
| 370 | +# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */ | ||
| 371 | +# define F_GETPIPE_SZ 1032 /* Get pipe page size array. */ | ||
| 372 | #endif | ||
| 373 | |||
| 374 | /* For F_[GET|SET]FD. */ | ||
| 375 | -- | ||
| 376 | 1.9.0 | ||
| 377 | |||
diff --git a/meta/recipes-core/uclibc/uclibc-git/0004-Add-clock_adjtime-syscall.patch b/meta/recipes-core/uclibc/uclibc-git/0004-Add-clock_adjtime-syscall.patch deleted file mode 100644 index c596db67b1..0000000000 --- a/meta/recipes-core/uclibc/uclibc-git/0004-Add-clock_adjtime-syscall.patch +++ /dev/null | |||
| @@ -1,75 +0,0 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | From 8e19e651145554fbcb90179f3dfbc7ea8a07c900 Mon Sep 17 00:00:00 2001 | ||
| 4 | From: Khem Raj <raj.khem@gmail.com> | ||
| 5 | Date: Sat, 15 Mar 2014 09:32:20 -0700 | ||
| 6 | Subject: [PATCH 4/4] Add clock_adjtime syscall | ||
| 7 | |||
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 9 | --- | ||
| 10 | include/sys/timex.h | 5 ++++- | ||
| 11 | libc/sysdeps/linux/common/Makefile.in | 2 +- | ||
| 12 | libc/sysdeps/linux/common/clock_adjtime.c | 15 +++++++++++++++ | ||
| 13 | 3 files changed, 20 insertions(+), 2 deletions(-) | ||
| 14 | create mode 100644 libc/sysdeps/linux/common/clock_adjtime.c | ||
| 15 | |||
| 16 | diff --git a/include/sys/timex.h b/include/sys/timex.h | ||
| 17 | index 621afce..9082a28 100644 | ||
| 18 | --- a/include/sys/timex.h | ||
| 19 | +++ b/include/sys/timex.h | ||
| 20 | @@ -20,6 +20,7 @@ | ||
| 21 | |||
| 22 | #include <features.h> | ||
| 23 | #include <sys/time.h> | ||
| 24 | +#include <time.h> | ||
| 25 | |||
| 26 | /* These definitions from linux/timex.h as of 2.2.0. */ | ||
| 27 | |||
| 28 | @@ -125,7 +126,9 @@ libc_hidden_proto(adjtimex) | ||
| 29 | extern int ntp_gettime (struct ntptimeval *__ntv) __THROW; | ||
| 30 | extern int ntp_adjtime (struct timex *__tntx) __THROW; | ||
| 31 | #endif | ||
| 32 | - | ||
| 33 | +#if defined __UCLIBC_HAS_REALTIME__ | ||
| 34 | +extern int clock_adjtime (clockid_t __clock_id, struct timex *__ntx) __THROW; | ||
| 35 | +#endif | ||
| 36 | __END_DECLS | ||
| 37 | |||
| 38 | #endif /* sys/timex.h */ | ||
| 39 | diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in | ||
| 40 | index 10d9884..bb985b6 100644 | ||
| 41 | --- a/libc/sysdeps/linux/common/Makefile.in | ||
| 42 | +++ b/libc/sysdeps/linux/common/Makefile.in | ||
| 43 | @@ -84,7 +84,7 @@ CSRC-$(ARCH_USE_MMU) += msync.c | ||
| 44 | CSRC-$(UCLIBC_BSD_SPECIFIC) += mincore.c setdomainname.c | ||
| 45 | CSRC-$(UCLIBC_NTP_LEGACY) += ntp_gettime.c | ||
| 46 | # aio_cancel|aio_error|aio_fsync|aio_read|aio_return|aio_suspend|aio_write|clock_getres|clock_gettime|clock_settime|clock_settime|fdatasync|lio_listio|mlockall|munlockall|mlock|munlock|mq_close|mq_getattr|mq_notify|mq_open|mq_receive|mq_timedreceive|mq_send|mq_timedsend|mq_setattr|mq_unlink|nanosleep|sched_getparam|sched_get_priority_max|sched_get_priority_min|sched_getscheduler|sched_rr_get_interval|sched_setparam|sched_setscheduler|sem_close|sem_destroy|sem_getvalue|sem_init|sem_open|sem_post|sem_trywait|sem_wait|sem_unlink|sem_wait|shm_open|shm_unlink|sigqueue|sigtimedwait|sigwaitinfo|timer_create|timer_delete|timer_getoverrun|timer_gettime|timer_settime | ||
| 47 | -CSRC-$(UCLIBC_HAS_REALTIME) += clock_getres.c clock_gettime.c clock_settime.c \ | ||
| 48 | +CSRC-$(UCLIBC_HAS_REALTIME) += clock_adjtime.c clock_getres.c clock_gettime.c clock_settime.c \ | ||
| 49 | fdatasync.c mlockall.c mlock.c munlockall.c munlock.c \ | ||
| 50 | nanosleep.c __rt_sigtimedwait.c __rt_sigwaitinfo.c sched_getparam.c \ | ||
| 51 | sched_get_priority_max.c sched_get_priority_min.c sched_getscheduler.c \ | ||
| 52 | diff --git a/libc/sysdeps/linux/common/clock_adjtime.c b/libc/sysdeps/linux/common/clock_adjtime.c | ||
| 53 | new file mode 100644 | ||
| 54 | index 0000000..968ec27 | ||
| 55 | --- /dev/null | ||
| 56 | +++ b/libc/sysdeps/linux/common/clock_adjtime.c | ||
| 57 | @@ -0,0 +1,15 @@ | ||
| 58 | +/* | ||
| 59 | + * clock_adjtime() for uClibc | ||
| 60 | + * | ||
| 61 | + * Copyright (C) 2005 by Peter Kjellerstedt <pkj@axis.com> | ||
| 62 | + * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> | ||
| 63 | + * | ||
| 64 | + * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. | ||
| 65 | + */ | ||
| 66 | + | ||
| 67 | +#include <sys/syscall.h> | ||
| 68 | +#include <sys/timex.h> | ||
| 69 | + | ||
| 70 | +#ifdef __NR_clock_adjtime | ||
| 71 | +_syscall2(int, clock_adjtime, clockid_t, clock_id, struct timex*, ntx) | ||
| 72 | +#endif | ||
| 73 | -- | ||
| 74 | 1.9.0 | ||
| 75 | |||
diff --git a/meta/recipes-core/uclibc/uclibc-git/remove_attribute_optimize_Os.patch b/meta/recipes-core/uclibc/uclibc-git/remove_attribute_optimize_Os.patch index d2a8a81b94..fb52faa7a0 100644 --- a/meta/recipes-core/uclibc/uclibc-git/remove_attribute_optimize_Os.patch +++ b/meta/recipes-core/uclibc/uclibc-git/remove_attribute_optimize_Os.patch | |||
| @@ -5,8 +5,8 @@ Upstream-Status: Pending | |||
| 5 | 5 | ||
| 6 | Index: git/libpthread/nptl/pthread_mutex_timedlock.c | 6 | Index: git/libpthread/nptl/pthread_mutex_timedlock.c |
| 7 | =================================================================== | 7 | =================================================================== |
| 8 | --- git.orig/libpthread/nptl/pthread_mutex_timedlock.c 2013-01-21 16:22:20.000000000 -0800 | 8 | --- git.orig/libpthread/nptl/pthread_mutex_timedlock.c 2014-08-25 10:58:06.000000000 -0700 |
| 9 | +++ git/libpthread/nptl/pthread_mutex_timedlock.c 2013-01-21 16:24:12.275557670 -0800 | 9 | +++ git/libpthread/nptl/pthread_mutex_timedlock.c 2014-08-25 11:00:42.078242266 -0700 |
| 10 | @@ -28,7 +28,9 @@ | 10 | @@ -28,7 +28,9 @@ |
| 11 | * error: can't find a register in class ‘GENERAL_REGS’ while reloading ‘asm’ | 11 | * error: can't find a register in class ‘GENERAL_REGS’ while reloading ‘asm’ |
| 12 | */ | 12 | */ |
| @@ -17,124 +17,3 @@ Index: git/libpthread/nptl/pthread_mutex_timedlock.c | |||
| 17 | pthread_mutex_timedlock ( | 17 | pthread_mutex_timedlock ( |
| 18 | pthread_mutex_t *mutex, | 18 | pthread_mutex_t *mutex, |
| 19 | const struct timespec *abstime) | 19 | const struct timespec *abstime) |
| 20 | Index: git/libc/sysdeps/linux/powerpc/bits/mathinline.h | ||
| 21 | =================================================================== | ||
| 22 | --- git.orig/libc/sysdeps/linux/powerpc/bits/mathinline.h 2013-01-21 16:22:20.000000000 -0800 | ||
| 23 | +++ git/libc/sysdeps/linux/powerpc/bits/mathinline.h 2013-01-21 16:24:12.275557670 -0800 | ||
| 24 | @@ -26,7 +26,7 @@ | ||
| 25 | #ifdef __cplusplus | ||
| 26 | # define __MATH_INLINE __inline | ||
| 27 | #else | ||
| 28 | -# define __MATH_INLINE extern __inline | ||
| 29 | +# define __MATH_INLINE __extern_inline | ||
| 30 | #endif /* __cplusplus */ | ||
| 31 | |||
| 32 | #if defined __GNUC__ && !defined _SOFT_FLOAT | ||
| 33 | Index: git/libc/sysdeps/linux/alpha/bits/mathinline.h | ||
| 34 | =================================================================== | ||
| 35 | --- git.orig/libc/sysdeps/linux/alpha/bits/mathinline.h 2013-01-21 16:22:20.000000000 -0800 | ||
| 36 | +++ git/libc/sysdeps/linux/alpha/bits/mathinline.h 2013-01-21 16:24:12.275557670 -0800 | ||
| 37 | @@ -24,7 +24,7 @@ | ||
| 38 | #ifdef __cplusplus | ||
| 39 | # define __MATH_INLINE __inline | ||
| 40 | #else | ||
| 41 | -# define __MATH_INLINE extern __inline | ||
| 42 | +# define __MATH_INLINE __extern_inline | ||
| 43 | #endif | ||
| 44 | |||
| 45 | #if defined __USE_ISOC99 && defined __GNUC__ && !__GNUC_PREREQ(3,0) | ||
| 46 | Index: git/libc/sysdeps/linux/i386/bits/mathinline.h | ||
| 47 | =================================================================== | ||
| 48 | --- git.orig/libc/sysdeps/linux/i386/bits/mathinline.h 2013-01-21 16:22:20.000000000 -0800 | ||
| 49 | +++ git/libc/sysdeps/linux/i386/bits/mathinline.h 2013-01-21 16:24:12.275557670 -0800 | ||
| 50 | @@ -25,7 +25,7 @@ | ||
| 51 | #ifdef __cplusplus | ||
| 52 | # define __MATH_INLINE __inline | ||
| 53 | #else | ||
| 54 | -# define __MATH_INLINE extern __inline | ||
| 55 | +# define __MATH_INLINE __extern_inline | ||
| 56 | #endif | ||
| 57 | |||
| 58 | |||
| 59 | Index: git/libc/sysdeps/linux/ia64/bits/mathinline.h | ||
| 60 | =================================================================== | ||
| 61 | --- git.orig/libc/sysdeps/linux/ia64/bits/mathinline.h 2013-01-21 16:22:20.000000000 -0800 | ||
| 62 | +++ git/libc/sysdeps/linux/ia64/bits/mathinline.h 2013-01-21 16:24:12.275557670 -0800 | ||
| 63 | @@ -23,7 +23,7 @@ | ||
| 64 | #ifdef __cplusplus | ||
| 65 | # define __MATH_INLINE __inline | ||
| 66 | #else | ||
| 67 | -# define __MATH_INLINE extern __inline | ||
| 68 | +# define __MATH_INLINE __extern_inline | ||
| 69 | #endif | ||
| 70 | |||
| 71 | #if defined __USE_ISOC99 && defined __GNUC__ && __GNUC__ >= 2 | ||
| 72 | Index: git/libc/sysdeps/linux/m68k/bits/mathinline.h | ||
| 73 | =================================================================== | ||
| 74 | --- git.orig/libc/sysdeps/linux/m68k/bits/mathinline.h 2013-01-21 16:22:20.000000000 -0800 | ||
| 75 | +++ git/libc/sysdeps/linux/m68k/bits/mathinline.h 2013-01-21 16:24:12.275557670 -0800 | ||
| 76 | @@ -91,7 +91,7 @@ | ||
| 77 | # ifdef __cplusplus | ||
| 78 | # define __m81_inline __inline | ||
| 79 | # else | ||
| 80 | -# define __m81_inline extern __inline | ||
| 81 | +# define __m81_inline __extern_inline | ||
| 82 | # endif | ||
| 83 | # define __M81_MATH_INLINES 1 | ||
| 84 | #endif | ||
| 85 | @@ -350,14 +350,14 @@ | ||
| 86 | /* Note that there must be no whitespace before the argument passed for | ||
| 87 | NAME, to make token pasting work correctly with -traditional. */ | ||
| 88 | # define __inline_forward_c(rettype, name, args1, args2) \ | ||
| 89 | -extern __inline rettype __attribute__((__const__)) \ | ||
| 90 | +__extern_inline rettype __attribute__((__const__)) \ | ||
| 91 | name args1 \ | ||
| 92 | { \ | ||
| 93 | return __CONCAT(__,name) args2; \ | ||
| 94 | } | ||
| 95 | |||
| 96 | # define __inline_forward(rettype, name, args1, args2) \ | ||
| 97 | -extern __inline rettype name args1 \ | ||
| 98 | +__extern_inline rettype name args1 \ | ||
| 99 | { \ | ||
| 100 | return __CONCAT(__,name) args2; \ | ||
| 101 | } | ||
| 102 | Index: git/libc/sysdeps/linux/mips/sys/tas.h | ||
| 103 | =================================================================== | ||
| 104 | --- git.orig/libc/sysdeps/linux/mips/sys/tas.h 2013-01-21 16:22:20.000000000 -0800 | ||
| 105 | +++ git/libc/sysdeps/linux/mips/sys/tas.h 2013-01-21 16:24:12.275557670 -0800 | ||
| 106 | @@ -29,7 +29,7 @@ | ||
| 107 | #ifdef __USE_EXTERN_INLINES | ||
| 108 | |||
| 109 | # ifndef _EXTERN_INLINE | ||
| 110 | -# define _EXTERN_INLINE extern __inline | ||
| 111 | +# define _EXTERN_INLINE __extern_inline | ||
| 112 | # endif | ||
| 113 | |||
| 114 | _EXTERN_INLINE int | ||
| 115 | Index: git/libc/sysdeps/linux/sparc/bits/mathinline.h | ||
| 116 | =================================================================== | ||
| 117 | --- git.orig/libc/sysdeps/linux/sparc/bits/mathinline.h 2013-01-21 16:22:20.000000000 -0800 | ||
| 118 | +++ git/libc/sysdeps/linux/sparc/bits/mathinline.h 2013-01-21 16:24:12.279557671 -0800 | ||
| 119 | @@ -130,7 +130,7 @@ | ||
| 120 | # ifdef __cplusplus | ||
| 121 | # define __MATH_INLINE __inline | ||
| 122 | # else | ||
| 123 | -# define __MATH_INLINE extern __inline | ||
| 124 | +# define __MATH_INLINE __extern_inline | ||
| 125 | # endif /* __cplusplus */ | ||
| 126 | |||
| 127 | /* The gcc, version 2.7 or below, has problems with all this inlining | ||
| 128 | Index: git/libc/sysdeps/linux/x86_64/bits/mathinline.h | ||
| 129 | =================================================================== | ||
| 130 | --- git.orig/libc/sysdeps/linux/x86_64/bits/mathinline.h 2013-01-21 16:22:20.000000000 -0800 | ||
| 131 | +++ git/libc/sysdeps/linux/x86_64/bits/mathinline.h 2013-01-21 16:24:12.279557671 -0800 | ||
| 132 | @@ -24,7 +24,7 @@ | ||
| 133 | #ifdef __cplusplus | ||
| 134 | # define __MATH_INLINE __inline | ||
| 135 | #else | ||
| 136 | -# define __MATH_INLINE extern __inline | ||
| 137 | +# define __MATH_INLINE __extern_inline | ||
| 138 | #endif | ||
| 139 | |||
| 140 | |||
diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc index a86ac3ddf7..18587ca273 100644 --- a/meta/recipes-core/uclibc/uclibc.inc +++ b/meta/recipes-core/uclibc/uclibc.inc | |||
| @@ -93,10 +93,10 @@ python () { | |||
| 93 | # if we use TARGET_CC_ARCH="-march=mips32" we end up | 93 | # if we use TARGET_CC_ARCH="-march=mips32" we end up |
| 94 | # with conflicting march options to gcc. Here we | 94 | # with conflicting march options to gcc. Here we |
| 95 | # ask for MIPS32 ISA to match the chosen arch | 95 | # ask for MIPS32 ISA to match the chosen arch |
| 96 | 96 | tune = d.getVar("DEFAULTTUNE", True) | |
| 97 | if "mips32" in d.getVar("TUNE_FEATURES",True): | 97 | if tune in ['mips32', 'mips32r2']: |
| 98 | d.setVar('configmangle_append', | 98 | d.setVar('configmangle_append', |
| 99 | "/^### MIPS32_CHECK$/a\\\nCONFIG_MIPS_ISA_MIPS32=y\n\n") | 99 | "/^### MIPS32_CHECK$/a\\\nCONFIG_MIPS_ISA_%s=y\n\n" % (tune.upper())) |
| 100 | if "${OE_FEATURES}": | 100 | if "${OE_FEATURES}": |
| 101 | d.setVar('configmangle_append', | 101 | d.setVar('configmangle_append', |
| 102 | "/^### DISTRO FEATURES$/a\\\n%s\n\n" % | 102 | "/^### DISTRO FEATURES$/a\\\n%s\n\n" % |
