Ubuntu Toolchain

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

  1. glibc-neon-and-misc-hwcaps
  2. Merge into 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.
lp://qastaging/~lool/ubuntu-toolchain/glibc-neon-and-misc-hwcaps updated
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
1=== modified file 'changelog'
2--- changelog 2009-03-27 21:33:57 +0000
3+++ changelog 2009-03-30 15:52:57 +0000
4@@ -1,3 +1,14 @@
5+glibc (2.9-4ubuntu5) UNRELEASED; urgency=low
6+
7+ * This upload allows NEON hwcap usage; FFE LP: #343602.
8+ * New patch, arm/local-hwcap-updates, add support for some recent ARM hwcaps
9+ additions.
10+ * Update patch arm/local-no-hwcap to also flag HWCAP_ARM_NEON as an
11+ important hwcap; this adds /lib/neon, /usr/lib/neon etc. to the ldconfig
12+ and ld.so search pathes.
13+
14+ -- Loic Minier <lool@dooz.org> Mon, 30 Mar 2009 14:13:13 +0200
15+
16 glibc (2.9-4ubuntu4) jaunty; urgency=low
17
18 * Don't declare the fwrite and fwrite_unlocked functions with
19
20=== added file 'patches/arm/local-hwcap-updates.diff'
21--- patches/arm/local-hwcap-updates.diff 1970-01-01 00:00:00 +0000
22+++ patches/arm/local-hwcap-updates.diff 2009-03-30 12:24:07 +0000
23@@ -0,0 +1,47 @@
24+Add support for some recent ARM hwcaps additions.
25+---
26+ ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.c | 4 ++--
27+ ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.h | 2 +-
28+ ports/sysdeps/unix/sysv/linux/arm/sysdep.h | 3 +++
29+ 3 files changed, 6 insertions(+), 3 deletions(-)
30+
31+--- a/ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.c
32++++ b/ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.c
33+@@ -47,12 +47,12 @@
34+ #if !defined PROCINFO_DECL && defined SHARED
35+ ._dl_arm_cap_flags
36+ #else
37+-PROCINFO_CLASS const char _dl_arm_cap_flags[10][10]
38++PROCINFO_CLASS const char _dl_arm_cap_flags[13][10]
39+ #endif
40+ #ifndef PROCINFO_DECL
41+ = {
42+ "swp", "half", "thumb", "26bit", "fast-mult", "fpa", "vfp", "edsp",
43+- "java", "iwmmxt",
44++ "java", "iwmmxt", "crunch", "thumbee", "neon",
45+ }
46+ #endif
47+ #if !defined SHARED || defined PROCINFO_DECL
48+--- a/ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.h
49++++ b/ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.h
50+@@ -24,7 +24,7 @@
51+ #include <ldsodefs.h>
52+ #include <sysdep.h>
53+
54+-#define _DL_HWCAP_COUNT 10
55++#define _DL_HWCAP_COUNT 13
56+
57+ /* The kernel provides platform data but it is not interesting. */
58+ #define _DL_HWCAP_PLATFORM 0
59+--- a/ports/sysdeps/unix/sysv/linux/arm/sysdep.h
60++++ b/ports/sysdeps/unix/sysv/linux/arm/sysdep.h
61+@@ -48,6 +48,9 @@
62+ #define HWCAP_ARM_EDSP 128
63+ #define HWCAP_ARM_JAVA 256
64+ #define HWCAP_ARM_IWMMXT 512
65++#define HWCAP_ARM_CRUNCH 1024
66++#define HWCAP_ARM_THUMBEE 2048
67++#define HWCAP_ARM_NEON 4096
68+
69+ #ifdef __ASSEMBLER__
70+
71
72=== modified file 'patches/arm/local-no-hwcap.diff'
73--- patches/arm/local-no-hwcap.diff 2009-02-20 13:58:43 +0000
74+++ patches/arm/local-no-hwcap.diff 2009-03-30 12:26:27 +0000
75@@ -11,7 +11,7 @@
76 };
77
78 -#define HWCAP_IMPORTANT (HWCAP_ARM_HALF | HWCAP_ARM_FAST_MULT)
79-+#define HWCAP_IMPORTANT HWCAP_ARM_VFP
80++#define HWCAP_IMPORTANT (HWCAP_ARM_VFP | HWCAP_ARM_NEON)
81
82 static inline int
83 __attribute__ ((unused))
84
85=== modified file 'patches/series'
86--- patches/series 2009-03-27 21:33:57 +0000
87+++ patches/series 2009-03-30 12:24:07 +0000
88@@ -53,6 +53,7 @@
89 arm/local-no-hwcap.diff
90 arm/submitted-setjmp.diff
91 arm/local-memset.diff
92+arm/local-hwcap-updates.diff
93
94 hppa/local-inlining.diff
95 hppa/local-linuxthreads.diff

Subscribers

People subscribed via source and target branches

to all changes: