Merge lp://qastaging/~lool/ubuntu-toolchain/glibc-neon-and-misc-hwcaps into lp://qastaging/~ubuntu-toolchain/ubuntu-toolchain/glibc-2.5-package

Proposed by Loïc Minier
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~lool/ubuntu-toolchain/glibc-neon-and-misc-hwcaps
Merge into: lp://qastaging/~ubuntu-toolchain/ubuntu-toolchain/glibc-2.5-package
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~lool/ubuntu-toolchain/glibc-neon-and-misc-hwcaps
To post a comment you must log in.
216. By Loïc Minier

Release 2.9-4ubuntu5

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'changelog'
--- changelog 2009-03-27 21:33:57 +0000
+++ changelog 2009-03-30 15:52:57 +0000
@@ -1,3 +1,14 @@
1glibc (2.9-4ubuntu5) UNRELEASED; urgency=low
2
3 * This upload allows NEON hwcap usage; FFE LP: #343602.
4 * New patch, arm/local-hwcap-updates, add support for some recent ARM hwcaps
5 additions.
6 * Update patch arm/local-no-hwcap to also flag HWCAP_ARM_NEON as an
7 important hwcap; this adds /lib/neon, /usr/lib/neon etc. to the ldconfig
8 and ld.so search pathes.
9
10 -- Loic Minier <lool@dooz.org> Mon, 30 Mar 2009 14:13:13 +0200
11
1glibc (2.9-4ubuntu4) jaunty; urgency=low12glibc (2.9-4ubuntu4) jaunty; urgency=low
213
3 * Don't declare the fwrite and fwrite_unlocked functions with14 * Don't declare the fwrite and fwrite_unlocked functions with
415
=== added file 'patches/arm/local-hwcap-updates.diff'
--- patches/arm/local-hwcap-updates.diff 1970-01-01 00:00:00 +0000
+++ patches/arm/local-hwcap-updates.diff 2009-03-30 12:24:07 +0000
@@ -0,0 +1,47 @@
1Add support for some recent ARM hwcaps additions.
2---
3 ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.c | 4 ++--
4 ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.h | 2 +-
5 ports/sysdeps/unix/sysv/linux/arm/sysdep.h | 3 +++
6 3 files changed, 6 insertions(+), 3 deletions(-)
7
8--- a/ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.c
9+++ b/ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.c
10@@ -47,12 +47,12 @@
11 #if !defined PROCINFO_DECL && defined SHARED
12 ._dl_arm_cap_flags
13 #else
14-PROCINFO_CLASS const char _dl_arm_cap_flags[10][10]
15+PROCINFO_CLASS const char _dl_arm_cap_flags[13][10]
16 #endif
17 #ifndef PROCINFO_DECL
18 = {
19 "swp", "half", "thumb", "26bit", "fast-mult", "fpa", "vfp", "edsp",
20- "java", "iwmmxt",
21+ "java", "iwmmxt", "crunch", "thumbee", "neon",
22 }
23 #endif
24 #if !defined SHARED || defined PROCINFO_DECL
25--- a/ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.h
26+++ b/ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.h
27@@ -24,7 +24,7 @@
28 #include <ldsodefs.h>
29 #include <sysdep.h>
30
31-#define _DL_HWCAP_COUNT 10
32+#define _DL_HWCAP_COUNT 13
33
34 /* The kernel provides platform data but it is not interesting. */
35 #define _DL_HWCAP_PLATFORM 0
36--- a/ports/sysdeps/unix/sysv/linux/arm/sysdep.h
37+++ b/ports/sysdeps/unix/sysv/linux/arm/sysdep.h
38@@ -48,6 +48,9 @@
39 #define HWCAP_ARM_EDSP 128
40 #define HWCAP_ARM_JAVA 256
41 #define HWCAP_ARM_IWMMXT 512
42+#define HWCAP_ARM_CRUNCH 1024
43+#define HWCAP_ARM_THUMBEE 2048
44+#define HWCAP_ARM_NEON 4096
45
46 #ifdef __ASSEMBLER__
47
048
=== modified file 'patches/arm/local-no-hwcap.diff'
--- patches/arm/local-no-hwcap.diff 2009-02-20 13:58:43 +0000
+++ patches/arm/local-no-hwcap.diff 2009-03-30 12:26:27 +0000
@@ -11,7 +11,7 @@
11 };11 };
12 12
13-#define HWCAP_IMPORTANT (HWCAP_ARM_HALF | HWCAP_ARM_FAST_MULT)13-#define HWCAP_IMPORTANT (HWCAP_ARM_HALF | HWCAP_ARM_FAST_MULT)
14+#define HWCAP_IMPORTANT HWCAP_ARM_VFP14+#define HWCAP_IMPORTANT (HWCAP_ARM_VFP | HWCAP_ARM_NEON)
15 15
16 static inline int16 static inline int
17 __attribute__ ((unused))17 __attribute__ ((unused))
1818
=== modified file 'patches/series'
--- patches/series 2009-03-27 21:33:57 +0000
+++ patches/series 2009-03-30 12:24:07 +0000
@@ -53,6 +53,7 @@
53arm/local-no-hwcap.diff53arm/local-no-hwcap.diff
54arm/submitted-setjmp.diff54arm/submitted-setjmp.diff
55arm/local-memset.diff55arm/local-memset.diff
56arm/local-hwcap-updates.diff
5657
57hppa/local-inlining.diff58hppa/local-inlining.diff
58hppa/local-linuxthreads.diff59hppa/local-linuxthreads.diff

Subscribers

People subscribed via source and target branches

to all changes: