aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-10-27 12:14:55 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-10-27 12:25:12 +0000
commit9dd186c8278db659af0a97cf9f4ad84370933611 (patch)
treec7a27b0242699d9e2776fdebc3123bd6db438b21
parent50bd43f7c5fa7818b318b1fdeefab6e4d05d569d (diff)
downloadalpine_aports-9dd186c8278db659af0a97cf9f4ad84370933611.tar.bz2
alpine_aports-9dd186c8278db659af0a97cf9f4ad84370933611.tar.xz
alpine_aports-9dd186c8278db659af0a97cf9f4ad84370933611.zip
main/libc0.9.32: update snapshot
-rw-r--r--main/libc0.9.32/0001-netdb-increase-line-size-for-etc-services.patch29
-rw-r--r--main/libc0.9.32/APKBUILD12
-rw-r--r--main/libc0.9.32/uclibc-libm-pic.patch67
3 files changed, 3 insertions, 105 deletions
diff --git a/main/libc0.9.32/0001-netdb-increase-line-size-for-etc-services.patch b/main/libc0.9.32/0001-netdb-increase-line-size-for-etc-services.patch
deleted file mode 100644
index 612b03aa27..0000000000
--- a/main/libc0.9.32/0001-netdb-increase-line-size-for-etc-services.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From e351f233334cb5484309133789646e165f4e64db Mon Sep 17 00:00:00 2001
2From: Natanael Copa <natanael.copa@gmail.com>
3Date: Wed, 11 Aug 2010 11:57:46 +0000
4Subject: [PATCH] netdb: increase line size for /etc/services
5
6If /etc/services has lines longer than 80 will getservbyname() fail
7so we set it up to 160.
8
9Signed-off-by: Natanael Copa <natanael.copa@gmail.com>
10---
11 libc/inet/getservice.c | 2 +-
12 1 files changed, 1 insertions(+), 1 deletions(-)
13
14diff --git a/libc/inet/getservice.c b/libc/inet/getservice.c
15index 03f5c29..8248f7a 100644
16--- a/libc/inet/getservice.c
17+++ b/libc/inet/getservice.c
18@@ -29,7 +29,7 @@ aliases: case sensitive optional space or tab separated list of other names
19 __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP);
20
21 #define MAXALIASES 35
22-#define BUFSZ (80) /* one line */
23+#define BUFSZ (160) /* one line */
24 #define SBUFSIZE (BUFSZ + 1 + (sizeof(char *) * MAXALIASES))
25
26 static parser_t *servp = NULL;
27--
281.7.2.1
29
diff --git a/main/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD
index 838972f864..8a646844d7 100644
--- a/main/libc0.9.32/APKBUILD
+++ b/main/libc0.9.32/APKBUILD
@@ -1,9 +1,9 @@
1# Maintainer: Natanael Copa <ncopa@alpinelinux.org> 1# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
2_abiver=0.9.32 2_abiver=0.9.32
3pkgname=libc$_abiver 3pkgname=libc$_abiver
4_gitver=1010161651 4_gitver=1010271211
5pkgver=${_abiver}_alpha0_git$_gitver 5pkgver=${_abiver}_alpha0_git$_gitver
6pkgrel=2 6pkgrel=0
7pkgdesc="C library for developing embedded Linux systems" 7pkgdesc="C library for developing embedded Linux systems"
8url=http://uclibc.org 8url=http://uclibc.org
9license="LGPL-2" 9license="LGPL-2"
@@ -20,15 +20,10 @@ _snapurl="http://git.uclibc.org/uClibc/snapshot/master.tar.bz2"
20_snapfile="$pkgname-$pkgver.tar.bz2" 20_snapfile="$pkgname-$pkgver.tar.bz2"
21source="http://build.alpinelinux.org:8010/distfiles/$_snapfile 21source="http://build.alpinelinux.org:8010/distfiles/$_snapfile
22 compat-stack-guard.patch 22 compat-stack-guard.patch
23 uclibc-libm-pic.patch
24 0001-create-DEVEL_PREFIX-MULTILIB_DIR-dir-rather-than-DEV.patch 23 0001-create-DEVEL_PREFIX-MULTILIB_DIR-dir-rather-than-DEV.patch
25 uclibcconfig.x86 24 uclibcconfig.x86
26 uclibcconfig.i486 25 uclibcconfig.i486
27 " 26 "
28# uclibc-resolv-tls.patch
29# 0001-config-parser-fix-memory-corruption.patch
30# 0001-nptl-fix-calling-convention-for-__pthread_mutex_cond.patch
31# ld-tls.patch
32 27
33_config="$srcdir"/uclibcconfig.${ARCH:-x86} 28_config="$srcdir"/uclibcconfig.${ARCH:-x86}
34_builddir="$srcdir"/master 29_builddir="$srcdir"/master
@@ -116,9 +111,8 @@ libthread_db() {
116 mv "$pkgdir"/lib/libthread_db* "$subpkgdir"/lib/ 111 mv "$pkgdir"/lib/libthread_db* "$subpkgdir"/lib/
117} 112}
118 113
119md5sums="02ab241c13849911695c31b01f98a73e libc0.9.32-0.9.32_alpha0_git1010161651.tar.bz2 114md5sums="39a2e30a2bf5db70851e45d386ebdf73 libc0.9.32-0.9.32_alpha0_git1010271211.tar.bz2
1204d408f72142ce55a0754948cc9cfe447 compat-stack-guard.patch 1154d408f72142ce55a0754948cc9cfe447 compat-stack-guard.patch
1212f9739a980be24a842c57516155c7885 uclibc-libm-pic.patch
1229dd8192227f54d6d3ccb49dc54137ff3 0001-create-DEVEL_PREFIX-MULTILIB_DIR-dir-rather-than-DEV.patch 1169dd8192227f54d6d3ccb49dc54137ff3 0001-create-DEVEL_PREFIX-MULTILIB_DIR-dir-rather-than-DEV.patch
123145aaeb1833159397cfac9902e3877ab uclibcconfig.x86 117145aaeb1833159397cfac9902e3877ab uclibcconfig.x86
124145aaeb1833159397cfac9902e3877ab uclibcconfig.i486" 118145aaeb1833159397cfac9902e3877ab uclibcconfig.i486"
diff --git a/main/libc0.9.32/uclibc-libm-pic.patch b/main/libc0.9.32/uclibc-libm-pic.patch
deleted file mode 100644
index ad87b78b24..0000000000
--- a/main/libc0.9.32/uclibc-libm-pic.patch
+++ /dev/null
@@ -1,67 +0,0 @@
1GCC can emit prologue/epilogue code for the functions in various
2different cases:
3 - frame pointers
4 - PIC build (to load ebx for indirect calls/jumps)
5 - forced stack smashing protection
6
7If we used jump in such cases, we'd corrupt the call stack and
8crash.
9
10Signed-off-by: Timo Teräs <timo.teras at iki.fi>
11---
12 libm/ldouble_wrappers.c | 12 +++++++-----
13 1 files changed, 7 insertions(+), 5 deletions(-)
14
15diff --git a/libm/ldouble_wrappers.c b/libm/ldouble_wrappers.c
16index 7d5af90..5b424dc 100644
17--- a/libm/ldouble_wrappers.c
18+++ b/libm/ldouble_wrappers.c
19@@ -60,7 +60,9 @@ long long func##l(long double x) \
20 * The return value is returned in st(0) per ABI in both cases (returning
21 * a long double or returning a double). So we can simply jump to func.
22 * Using __GI_func in jump to make optimized intra-library jump.
23- * gcc will still generate a useless "ret" after asm. Oh well...
24+ *
25+ * We do need to use call (instead of tail jump) as gcc can create
26+ * stack frame, and push/modify/pop ebx during PIC build.
27 */
28 # define WRAPPER1(func) \
29 long double func##l(long double x) \
30@@ -69,7 +71,7 @@ long double func##l(long double x) \
31 __asm ( \
32 " fldt %1\n" \
33 " fstpl %1\n" \
34- " jmp " __stringify(__GI_##func) "\n" \
35+ " call " __stringify(__GI_##func) "\n" \
36 : "=t" (st_top) \
37 : "m" (x) \
38 ); \
39@@ -82,7 +84,7 @@ int func##l(long double x) \
40 __asm ( \
41 " fldt %1\n" \
42 " fstpl %1\n" \
43- " jmp " __stringify(__GI_##func) "\n" \
44+ " call " __stringify(__GI_##func) "\n" \
45 : "=a" (ret) \
46 : "m" (x) \
47 ); \
48@@ -95,7 +97,7 @@ long func##l(long double x) \
49 __asm ( \
50 " fldt %1\n" \
51 " fstpl %1\n" \
52- " jmp " __stringify(__GI_##func) "\n" \
53+ " call " __stringify(__GI_##func) "\n" \
54 : "=a" (ret) \
55 : "m" (x) \
56 ); \
57@@ -108,7 +110,7 @@ long long func##l(long double x) \
58 __asm ( \
59 " fldt %1\n" \
60 " fstpl %1\n" \
61- " jmp " __stringify(__GI_##func) "\n" \
62+ " call " __stringify(__GI_##func) "\n" \
63 : "=A" (ret) \
64 : "m" (x) \
65 ); \
66--
671.7.0.4