diff options
| author | Khem Raj <raj.khem@gmail.com> | 2020-12-12 16:34:01 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-15 22:51:56 +0000 |
| commit | d6eac97c3a56885987d618aebd26750ece3868d3 (patch) | |
| tree | b0a7ab4a34544289b162406da41380e2c9136cd8 | |
| parent | 5bc29f4995163122098edd0a22994249d87610e7 (diff) | |
| download | poky-d6eac97c3a56885987d618aebd26750ece3868d3.tar.gz | |
musl: Update to latest master
Refresh patches to apply to this update
Brings in following fixes
* 1e4204d5 use libc-internal malloc for newlocale/freelocale
* 36246b34 drop use of pthread_once in newlocale
* 37fcc13c lift locale lock out of internal __get_locale
* c53e9b23 fix misleading comment in strstr
* b67d56c7 drop use of pthread_once for aio thread stack size init
* 90ff0169 fix omission of non-stub pthread_mutexattr_getprotocol
* 56f0631d riscv64: fix inconsistent ucontext_t struct tag
* 50c7935c fix failure to preserve r6 in s390x asm; per ABI it is call-saved
* 738c4e94 s390x: derive float_t from compiler or default to float
* 821083ac implement reallocarray
* 29ff7599 implement realpath directly instead of using procfs readlink
* 5d464f52 fix mallocng regression in malloc_usable_size with null argument
* d046ec92 configure: do not use obsolescent form of test -a|o
* c5d118eb fix segfault in lutimes when tv argument is NULL
* 67f77462 netinet/in.h: add IP_RECVERR_4884 from linux v5.9
* d078f836 sys/fanotify.h: add new FAN_* macros from linux v5.9
* 3ba370fe bits/syscall.h: add __NR_close_range from linux v5.9
* badc5bb2 add missing personality values
* 6e989248 arm fabs and sqrt: support single-precision-only fpu variants
* c8c3e341 fix typo in INSTALL
* e2fa720b work around linux bug in readlink syscall with zero buffer size
* c17cda6d parse v3 or future-unknown zoneinfo file versions as v2+
* 585a0a78 explicitly prefer 64-bit/v2 zoneinfo tables
* debbddf7 fix regression in pthread_exit
* 3ab2a4e0 rewrite wcsnrtombs to fix buffer overflow and other bugs
* 233bb697 protect destruction of process-shared mutexes against robust list races
* d26e0774 pthread_exit: don't __vm_wait under thread list lock
* 167390f0 lift child restrictions after multi-threaded fork
* 34952fe5 convert malloc use under libc-internal locks to use internal allocator
* 8d37958d give libc access to its own malloc even if public malloc is interposed
* c1e5d243 drop use of getdelim/stdio in dynamic linker
* cbecda0b dlerror: don't gratuitously hold freebuf_queue lock while freeing
* 4ffa7068 fix vector types in aarch64 register file structures
(From OE-Core rev: b70b875c2f405f6481b1179419cf0f086fa31f53)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
3 files changed, 5 insertions, 64 deletions
diff --git a/meta/recipes-core/musl/musl/0001-crt-Add-.file-directive.patch b/meta/recipes-core/musl/musl/0001-crt-Add-.file-directive.patch index d2bd587e39..35c8b65740 100644 --- a/meta/recipes-core/musl/musl/0001-crt-Add-.file-directive.patch +++ b/meta/recipes-core/musl/musl/0001-crt-Add-.file-directive.patch | |||
| @@ -43,8 +43,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
| 43 | crt/x86_64/crtn.s | 1 + | 43 | crt/x86_64/crtn.s | 1 + |
| 44 | 28 files changed, 28 insertions(+) | 44 | 28 files changed, 28 insertions(+) |
| 45 | 45 | ||
| 46 | diff --git a/crt/aarch64/crti.s b/crt/aarch64/crti.s | ||
| 47 | index 775df0ac..0f7c23a9 100644 | ||
| 48 | --- a/crt/aarch64/crti.s | 46 | --- a/crt/aarch64/crti.s |
| 49 | +++ b/crt/aarch64/crti.s | 47 | +++ b/crt/aarch64/crti.s |
| 50 | @@ -1,3 +1,4 @@ | 48 | @@ -1,3 +1,4 @@ |
| @@ -52,8 +50,6 @@ index 775df0ac..0f7c23a9 100644 | |||
| 52 | .section .init | 50 | .section .init |
| 53 | .global _init | 51 | .global _init |
| 54 | .type _init,%function | 52 | .type _init,%function |
| 55 | diff --git a/crt/aarch64/crtn.s b/crt/aarch64/crtn.s | ||
| 56 | index 73cab692..d62fc129 100644 | ||
| 57 | --- a/crt/aarch64/crtn.s | 53 | --- a/crt/aarch64/crtn.s |
| 58 | +++ b/crt/aarch64/crtn.s | 54 | +++ b/crt/aarch64/crtn.s |
| 59 | @@ -1,3 +1,4 @@ | 55 | @@ -1,3 +1,4 @@ |
| @@ -61,8 +57,6 @@ index 73cab692..d62fc129 100644 | |||
| 61 | .section .init | 57 | .section .init |
| 62 | ldp x29,x30,[sp],#16 | 58 | ldp x29,x30,[sp],#16 |
| 63 | ret | 59 | ret |
| 64 | diff --git a/crt/arm/crti.s b/crt/arm/crti.s | ||
| 65 | index 18dc1e41..8df72979 100644 | ||
| 66 | --- a/crt/arm/crti.s | 60 | --- a/crt/arm/crti.s |
| 67 | +++ b/crt/arm/crti.s | 61 | +++ b/crt/arm/crti.s |
| 68 | @@ -1,3 +1,4 @@ | 62 | @@ -1,3 +1,4 @@ |
| @@ -70,8 +64,6 @@ index 18dc1e41..8df72979 100644 | |||
| 70 | .syntax unified | 64 | .syntax unified |
| 71 | 65 | ||
| 72 | .section .init | 66 | .section .init |
| 73 | diff --git a/crt/arm/crtn.s b/crt/arm/crtn.s | ||
| 74 | index dc020f92..7451355b 100644 | ||
| 75 | --- a/crt/arm/crtn.s | 67 | --- a/crt/arm/crtn.s |
| 76 | +++ b/crt/arm/crtn.s | 68 | +++ b/crt/arm/crtn.s |
| 77 | @@ -1,3 +1,4 @@ | 69 | @@ -1,3 +1,4 @@ |
| @@ -79,8 +71,6 @@ index dc020f92..7451355b 100644 | |||
| 79 | .syntax unified | 71 | .syntax unified |
| 80 | 72 | ||
| 81 | .section .init | 73 | .section .init |
| 82 | diff --git a/crt/i386/crti.s b/crt/i386/crti.s | ||
| 83 | index d2682a20..2823fc3b 100644 | ||
| 84 | --- a/crt/i386/crti.s | 74 | --- a/crt/i386/crti.s |
| 85 | +++ b/crt/i386/crti.s | 75 | +++ b/crt/i386/crti.s |
| 86 | @@ -1,3 +1,4 @@ | 76 | @@ -1,3 +1,4 @@ |
| @@ -88,8 +78,6 @@ index d2682a20..2823fc3b 100644 | |||
| 88 | .section .init | 78 | .section .init |
| 89 | .global _init | 79 | .global _init |
| 90 | _init: | 80 | _init: |
| 91 | diff --git a/crt/i386/crtn.s b/crt/i386/crtn.s | ||
| 92 | index f3b61e01..04fb1646 100644 | ||
| 93 | --- a/crt/i386/crtn.s | 81 | --- a/crt/i386/crtn.s |
| 94 | +++ b/crt/i386/crtn.s | 82 | +++ b/crt/i386/crtn.s |
| 95 | @@ -1,3 +1,4 @@ | 83 | @@ -1,3 +1,4 @@ |
| @@ -97,8 +85,6 @@ index f3b61e01..04fb1646 100644 | |||
| 97 | .section .init | 85 | .section .init |
| 98 | add $12,%esp | 86 | add $12,%esp |
| 99 | ret | 87 | ret |
| 100 | diff --git a/crt/microblaze/crti.s b/crt/microblaze/crti.s | ||
| 101 | index ed1c2fa4..29ee4733 100644 | ||
| 102 | --- a/crt/microblaze/crti.s | 88 | --- a/crt/microblaze/crti.s |
| 103 | +++ b/crt/microblaze/crti.s | 89 | +++ b/crt/microblaze/crti.s |
| 104 | @@ -1,3 +1,4 @@ | 90 | @@ -1,3 +1,4 @@ |
| @@ -106,8 +92,6 @@ index ed1c2fa4..29ee4733 100644 | |||
| 106 | .section .init | 92 | .section .init |
| 107 | .global _init | 93 | .global _init |
| 108 | .align 2 | 94 | .align 2 |
| 109 | diff --git a/crt/microblaze/crtn.s b/crt/microblaze/crtn.s | ||
| 110 | index 1e02c984..c2083749 100644 | ||
| 111 | --- a/crt/microblaze/crtn.s | 95 | --- a/crt/microblaze/crtn.s |
| 112 | +++ b/crt/microblaze/crtn.s | 96 | +++ b/crt/microblaze/crtn.s |
| 113 | @@ -1,3 +1,4 @@ | 97 | @@ -1,3 +1,4 @@ |
| @@ -115,8 +99,6 @@ index 1e02c984..c2083749 100644 | |||
| 115 | .section .init | 99 | .section .init |
| 116 | lwi r15, r1, 0 | 100 | lwi r15, r1, 0 |
| 117 | rtsd r15, 8 | 101 | rtsd r15, 8 |
| 118 | diff --git a/crt/mips/crti.s b/crt/mips/crti.s | ||
| 119 | index 39dee380..0211764e 100644 | ||
| 120 | --- a/crt/mips/crti.s | 102 | --- a/crt/mips/crti.s |
| 121 | +++ b/crt/mips/crti.s | 103 | +++ b/crt/mips/crti.s |
| 122 | @@ -1,3 +1,4 @@ | 104 | @@ -1,3 +1,4 @@ |
| @@ -124,8 +106,6 @@ index 39dee380..0211764e 100644 | |||
| 124 | .set noreorder | 106 | .set noreorder |
| 125 | 107 | ||
| 126 | .section .init | 108 | .section .init |
| 127 | diff --git a/crt/mips/crtn.s b/crt/mips/crtn.s | ||
| 128 | index 506a04b7..606490cf 100644 | ||
| 129 | --- a/crt/mips/crtn.s | 109 | --- a/crt/mips/crtn.s |
| 130 | +++ b/crt/mips/crtn.s | 110 | +++ b/crt/mips/crtn.s |
| 131 | @@ -1,3 +1,4 @@ | 111 | @@ -1,3 +1,4 @@ |
| @@ -133,8 +113,6 @@ index 506a04b7..606490cf 100644 | |||
| 133 | .set noreorder | 113 | .set noreorder |
| 134 | 114 | ||
| 135 | .section .init | 115 | .section .init |
| 136 | diff --git a/crt/mips64/crti.s b/crt/mips64/crti.s | ||
| 137 | index c962dd09..f2c19cdd 100644 | ||
| 138 | --- a/crt/mips64/crti.s | 116 | --- a/crt/mips64/crti.s |
| 139 | +++ b/crt/mips64/crti.s | 117 | +++ b/crt/mips64/crti.s |
| 140 | @@ -1,3 +1,4 @@ | 118 | @@ -1,3 +1,4 @@ |
| @@ -142,8 +120,6 @@ index c962dd09..f2c19cdd 100644 | |||
| 142 | .set noreorder | 120 | .set noreorder |
| 143 | 121 | ||
| 144 | .section .init | 122 | .section .init |
| 145 | diff --git a/crt/mips64/crtn.s b/crt/mips64/crtn.s | ||
| 146 | index f3930b24..68903ffa 100644 | ||
| 147 | --- a/crt/mips64/crtn.s | 123 | --- a/crt/mips64/crtn.s |
| 148 | +++ b/crt/mips64/crtn.s | 124 | +++ b/crt/mips64/crtn.s |
| 149 | @@ -1,3 +1,4 @@ | 125 | @@ -1,3 +1,4 @@ |
| @@ -151,8 +127,6 @@ index f3930b24..68903ffa 100644 | |||
| 151 | .set noreorder | 127 | .set noreorder |
| 152 | 128 | ||
| 153 | .section .init | 129 | .section .init |
| 154 | diff --git a/crt/mipsn32/crti.s b/crt/mipsn32/crti.s | ||
| 155 | index 14fa28d9..a35387d3 100644 | ||
| 156 | --- a/crt/mipsn32/crti.s | 130 | --- a/crt/mipsn32/crti.s |
| 157 | +++ b/crt/mipsn32/crti.s | 131 | +++ b/crt/mipsn32/crti.s |
| 158 | @@ -1,3 +1,4 @@ | 132 | @@ -1,3 +1,4 @@ |
| @@ -160,8 +134,6 @@ index 14fa28d9..a35387d3 100644 | |||
| 160 | .set noreorder | 134 | .set noreorder |
| 161 | .section .init | 135 | .section .init |
| 162 | .global _init | 136 | .global _init |
| 163 | diff --git a/crt/mipsn32/crtn.s b/crt/mipsn32/crtn.s | ||
| 164 | index dccd7e89..bdb6e561 100644 | ||
| 165 | --- a/crt/mipsn32/crtn.s | 137 | --- a/crt/mipsn32/crtn.s |
| 166 | +++ b/crt/mipsn32/crtn.s | 138 | +++ b/crt/mipsn32/crtn.s |
| 167 | @@ -1,3 +1,4 @@ | 139 | @@ -1,3 +1,4 @@ |
| @@ -169,8 +141,6 @@ index dccd7e89..bdb6e561 100644 | |||
| 169 | .set noreorder | 141 | .set noreorder |
| 170 | .section .init | 142 | .section .init |
| 171 | ld $gp, 16($sp) | 143 | ld $gp, 16($sp) |
| 172 | diff --git a/crt/or1k/crti.s b/crt/or1k/crti.s | ||
| 173 | index 7e741459..919369ca 100644 | ||
| 174 | --- a/crt/or1k/crti.s | 144 | --- a/crt/or1k/crti.s |
| 175 | +++ b/crt/or1k/crti.s | 145 | +++ b/crt/or1k/crti.s |
| 176 | @@ -1,3 +1,4 @@ | 146 | @@ -1,3 +1,4 @@ |
| @@ -178,8 +148,6 @@ index 7e741459..919369ca 100644 | |||
| 178 | .section .init | 148 | .section .init |
| 179 | .global _init | 149 | .global _init |
| 180 | _init: | 150 | _init: |
| 181 | diff --git a/crt/or1k/crtn.s b/crt/or1k/crtn.s | ||
| 182 | index 4185a027..d670b327 100644 | ||
| 183 | --- a/crt/or1k/crtn.s | 151 | --- a/crt/or1k/crtn.s |
| 184 | +++ b/crt/or1k/crtn.s | 152 | +++ b/crt/or1k/crtn.s |
| 185 | @@ -1,3 +1,4 @@ | 153 | @@ -1,3 +1,4 @@ |
| @@ -187,8 +155,6 @@ index 4185a027..d670b327 100644 | |||
| 187 | .section .init | 155 | .section .init |
| 188 | l.lwz r9,0(r1) | 156 | l.lwz r9,0(r1) |
| 189 | l.jr r9 | 157 | l.jr r9 |
| 190 | diff --git a/crt/powerpc/crti.s b/crt/powerpc/crti.s | ||
| 191 | index 60461ca4..b748ca48 100644 | ||
| 192 | --- a/crt/powerpc/crti.s | 158 | --- a/crt/powerpc/crti.s |
| 193 | +++ b/crt/powerpc/crti.s | 159 | +++ b/crt/powerpc/crti.s |
| 194 | @@ -1,3 +1,4 @@ | 160 | @@ -1,3 +1,4 @@ |
| @@ -196,8 +162,6 @@ index 60461ca4..b748ca48 100644 | |||
| 196 | .section .init | 162 | .section .init |
| 197 | .align 2 | 163 | .align 2 |
| 198 | .global _init | 164 | .global _init |
| 199 | diff --git a/crt/powerpc/crtn.s b/crt/powerpc/crtn.s | ||
| 200 | index 2d14a6f0..d989e36f 100644 | ||
| 201 | --- a/crt/powerpc/crtn.s | 165 | --- a/crt/powerpc/crtn.s |
| 202 | +++ b/crt/powerpc/crtn.s | 166 | +++ b/crt/powerpc/crtn.s |
| 203 | @@ -1,3 +1,4 @@ | 167 | @@ -1,3 +1,4 @@ |
| @@ -205,8 +169,6 @@ index 2d14a6f0..d989e36f 100644 | |||
| 205 | .section .init | 169 | .section .init |
| 206 | .align 2 | 170 | .align 2 |
| 207 | lwz 0,36(1) | 171 | lwz 0,36(1) |
| 208 | diff --git a/crt/powerpc64/crti.s b/crt/powerpc64/crti.s | ||
| 209 | index 9f712f0e..d3323a67 100644 | ||
| 210 | --- a/crt/powerpc64/crti.s | 172 | --- a/crt/powerpc64/crti.s |
| 211 | +++ b/crt/powerpc64/crti.s | 173 | +++ b/crt/powerpc64/crti.s |
| 212 | @@ -1,3 +1,4 @@ | 174 | @@ -1,3 +1,4 @@ |
| @@ -214,8 +176,6 @@ index 9f712f0e..d3323a67 100644 | |||
| 214 | .section .init | 176 | .section .init |
| 215 | .align 2 | 177 | .align 2 |
| 216 | .global _init | 178 | .global _init |
| 217 | diff --git a/crt/powerpc64/crtn.s b/crt/powerpc64/crtn.s | ||
| 218 | index a7a9f4a0..5e71ae66 100644 | ||
| 219 | --- a/crt/powerpc64/crtn.s | 179 | --- a/crt/powerpc64/crtn.s |
| 220 | +++ b/crt/powerpc64/crtn.s | 180 | +++ b/crt/powerpc64/crtn.s |
| 221 | @@ -1,3 +1,4 @@ | 181 | @@ -1,3 +1,4 @@ |
| @@ -223,8 +183,6 @@ index a7a9f4a0..5e71ae66 100644 | |||
| 223 | .section .init | 183 | .section .init |
| 224 | .align 2 | 184 | .align 2 |
| 225 | addi 1, 1, 32 | 185 | addi 1, 1, 32 |
| 226 | diff --git a/crt/s390x/crti.s b/crt/s390x/crti.s | ||
| 227 | index f453205b..3da3c5e1 100644 | ||
| 228 | --- a/crt/s390x/crti.s | 186 | --- a/crt/s390x/crti.s |
| 229 | +++ b/crt/s390x/crti.s | 187 | +++ b/crt/s390x/crti.s |
| 230 | @@ -1,3 +1,4 @@ | 188 | @@ -1,3 +1,4 @@ |
| @@ -232,8 +190,6 @@ index f453205b..3da3c5e1 100644 | |||
| 232 | .section .init | 190 | .section .init |
| 233 | .align 2 | 191 | .align 2 |
| 234 | .global _init | 192 | .global _init |
| 235 | diff --git a/crt/s390x/crtn.s b/crt/s390x/crtn.s | ||
| 236 | index 06066dc9..bfd55caf 100644 | ||
| 237 | --- a/crt/s390x/crtn.s | 193 | --- a/crt/s390x/crtn.s |
| 238 | +++ b/crt/s390x/crtn.s | 194 | +++ b/crt/s390x/crtn.s |
| 239 | @@ -1,3 +1,4 @@ | 195 | @@ -1,3 +1,4 @@ |
| @@ -241,8 +197,6 @@ index 06066dc9..bfd55caf 100644 | |||
| 241 | .section .init | 197 | .section .init |
| 242 | .align 2 | 198 | .align 2 |
| 243 | lmg %r14, %r15, 272(%r15) | 199 | lmg %r14, %r15, 272(%r15) |
| 244 | diff --git a/crt/sh/crti.s b/crt/sh/crti.s | ||
| 245 | index d99bfd5c..77d61c51 100644 | ||
| 246 | --- a/crt/sh/crti.s | 200 | --- a/crt/sh/crti.s |
| 247 | +++ b/crt/sh/crti.s | 201 | +++ b/crt/sh/crti.s |
| 248 | @@ -1,3 +1,4 @@ | 202 | @@ -1,3 +1,4 @@ |
| @@ -250,8 +204,6 @@ index d99bfd5c..77d61c51 100644 | |||
| 250 | .section .init | 204 | .section .init |
| 251 | .global _init | 205 | .global _init |
| 252 | .type _init, @function | 206 | .type _init, @function |
| 253 | diff --git a/crt/sh/crtn.s b/crt/sh/crtn.s | ||
| 254 | index 958ce951..29deb5be 100644 | ||
| 255 | --- a/crt/sh/crtn.s | 207 | --- a/crt/sh/crtn.s |
| 256 | +++ b/crt/sh/crtn.s | 208 | +++ b/crt/sh/crtn.s |
| 257 | @@ -1,3 +1,4 @@ | 209 | @@ -1,3 +1,4 @@ |
| @@ -259,8 +211,6 @@ index 958ce951..29deb5be 100644 | |||
| 259 | .section .init | 211 | .section .init |
| 260 | lds.l @r15+, pr | 212 | lds.l @r15+, pr |
| 261 | mov.l @r15+, r14 | 213 | mov.l @r15+, r14 |
| 262 | diff --git a/crt/x32/crti.s b/crt/x32/crti.s | ||
| 263 | index 4788968b..8668b7c7 100644 | ||
| 264 | --- a/crt/x32/crti.s | 214 | --- a/crt/x32/crti.s |
| 265 | +++ b/crt/x32/crti.s | 215 | +++ b/crt/x32/crti.s |
| 266 | @@ -1,3 +1,4 @@ | 216 | @@ -1,3 +1,4 @@ |
| @@ -268,8 +218,6 @@ index 4788968b..8668b7c7 100644 | |||
| 268 | .section .init | 218 | .section .init |
| 269 | .global _init | 219 | .global _init |
| 270 | _init: | 220 | _init: |
| 271 | diff --git a/crt/x32/crtn.s b/crt/x32/crtn.s | ||
| 272 | index 29198b77..ef73d295 100644 | ||
| 273 | --- a/crt/x32/crtn.s | 221 | --- a/crt/x32/crtn.s |
| 274 | +++ b/crt/x32/crtn.s | 222 | +++ b/crt/x32/crtn.s |
| 275 | @@ -1,3 +1,4 @@ | 223 | @@ -1,3 +1,4 @@ |
| @@ -277,8 +225,6 @@ index 29198b77..ef73d295 100644 | |||
| 277 | .section .init | 225 | .section .init |
| 278 | pop %rax | 226 | pop %rax |
| 279 | ret | 227 | ret |
| 280 | diff --git a/crt/x86_64/crti.s b/crt/x86_64/crti.s | ||
| 281 | index 4788968b..8668b7c7 100644 | ||
| 282 | --- a/crt/x86_64/crti.s | 228 | --- a/crt/x86_64/crti.s |
| 283 | +++ b/crt/x86_64/crti.s | 229 | +++ b/crt/x86_64/crti.s |
| 284 | @@ -1,3 +1,4 @@ | 230 | @@ -1,3 +1,4 @@ |
| @@ -286,8 +232,6 @@ index 4788968b..8668b7c7 100644 | |||
| 286 | .section .init | 232 | .section .init |
| 287 | .global _init | 233 | .global _init |
| 288 | _init: | 234 | _init: |
| 289 | diff --git a/crt/x86_64/crtn.s b/crt/x86_64/crtn.s | ||
| 290 | index 29198b77..ef73d295 100644 | ||
| 291 | --- a/crt/x86_64/crtn.s | 235 | --- a/crt/x86_64/crtn.s |
| 292 | +++ b/crt/x86_64/crtn.s | 236 | +++ b/crt/x86_64/crtn.s |
| 293 | @@ -1,3 +1,4 @@ | 237 | @@ -1,3 +1,4 @@ |
| @@ -295,6 +239,3 @@ index 29198b77..ef73d295 100644 | |||
| 295 | .section .init | 239 | .section .init |
| 296 | pop %rax | 240 | pop %rax |
| 297 | ret | 241 | ret |
| 298 | -- | ||
| 299 | 2.29.1 | ||
| 300 | |||
diff --git a/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch b/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch index f57aae5f3c..0aeb5eb5c2 100644 --- a/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch +++ b/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch | |||
| @@ -34,16 +34,16 @@ Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com> | |||
| 34 | LDFLAGS_ALL = $(LDFLAGS_AUTO) $(LDFLAGS) | 34 | LDFLAGS_ALL = $(LDFLAGS_AUTO) $(LDFLAGS) |
| 35 | --- a/ldso/dynlink.c | 35 | --- a/ldso/dynlink.c |
| 36 | +++ b/ldso/dynlink.c | 36 | +++ b/ldso/dynlink.c |
| 37 | @@ -24,6 +24,8 @@ | 37 | @@ -29,6 +29,8 @@ |
| 38 | #include "libc.h" | 38 | #define realloc __libc_realloc |
| 39 | #include "dynlink.h" | 39 | #define free __libc_free |
| 40 | 40 | ||
| 41 | +#define SYS_PATH_DFLT SYSLIBDIR ":" LIBDIR | 41 | +#define SYS_PATH_DFLT SYSLIBDIR ":" LIBDIR |
| 42 | + | 42 | + |
| 43 | static void error(const char *, ...); | 43 | static void error(const char *, ...); |
| 44 | 44 | ||
| 45 | #define MAXP2(a,b) (-(-(a)&-(b))) | 45 | #define MAXP2(a,b) (-(-(a)&-(b))) |
| 46 | @@ -1071,7 +1073,7 @@ static struct dso *load_library(const ch | 46 | @@ -1094,7 +1096,7 @@ static struct dso *load_library(const ch |
| 47 | sys_path = ""; | 47 | sys_path = ""; |
| 48 | } | 48 | } |
| 49 | } | 49 | } |
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index 23c2072ea3..d4e75f9185 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | require musl.inc | 4 | require musl.inc |
| 5 | inherit linuxloader | 5 | inherit linuxloader |
| 6 | 6 | ||
| 7 | SRCREV = "d91a6cf6e369a79587c5665fce9635e5634ca201" | 7 | SRCREV = "1e4204d522670a1d8b8ab85f1cfefa960547e8af" |
| 8 | 8 | ||
| 9 | BASEVER = "1.2.1" | 9 | BASEVER = "1.2.1" |
| 10 | 10 | ||
