From 33767fc71ba9b77953e55b78a9672f6101008599 Mon Sep 17 00:00:00 2001 From: Ben Cheng Date: Thu, 23 Oct 2008 16:00:08 -0700 Subject: [PATCH 1/6] Implement scandir() for OProfile. --- libc/include/dirent.h | 6 ++++- libc/unistd/opendir.c | 62 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/libc/include/dirent.h b/libc/include/dirent.h index edfb63953..6e7b20456 100644 --- a/libc/include/dirent.h +++ b/libc/include/dirent.h @@ -68,7 +68,11 @@ extern int readdir_r(DIR* dirp, struct dirent *entry, struct dire extern int closedir(DIR* dirp); extern void rewinddir(DIR *dirp); extern int dirfd(DIR* dirp); - +extern int alphasort(const void *a, const void *b); +extern int scandir(const char *dir, struct dirent ***namelist, + int(*filter)(const struct dirent *), + int(*compar)(const struct dirent **, + const struct dirent **)); __END_DECLS #endif /* _DIRENT_H_ */ diff --git a/libc/unistd/opendir.c b/libc/unistd/opendir.c index 1b0605788..afa3ea0ee 100644 --- a/libc/unistd/opendir.c +++ b/libc/unistd/opendir.c @@ -203,3 +203,65 @@ void rewinddir(DIR *dir) pthread_mutex_unlock( &dir->_DIR_lock ); } + +int alphasort(const void *a, const void *b) +{ + struct dirent **d1, **d2; + + d1 = (struct dirent **) a; + d2 = (struct dirent **) b; + return strcmp((*d1)->d_name, (*d2)->d_name); +} + + +int scandir(const char *dir, struct dirent ***namelist, + int(*filter)(const struct dirent *), + int(*compar)(const struct dirent **, const struct dirent **)) +{ + DIR *d; + int n_elem = 0; + struct dirent *this_de, *de; + struct dirent **de_list = NULL; + int de_list_size = 0; + + d = opendir(dir); + if (d == NULL) { + return -1; + } + + while ((this_de = readdir(d)) != NULL) { + if (filter && (*filter)(this_de) == 0) { + continue; + } + if (n_elem == 0) { + de_list_size = 4; + de_list = (struct dirent **) + malloc(sizeof(struct dirent *)*de_list_size); + if (de_list == NULL) { + return -1; + } + } + else if (n_elem == de_list_size) { + struct dirent **de_list_new; + + de_list_size += 10; + de_list_new = (struct dirent **) + realloc(de_list, sizeof(struct dirent *)*de_list_size); + if (de_list_new == NULL) { + free(de_list); + return -1; + } + de_list = de_list_new; + } + de = (struct dirent *) malloc(sizeof(struct dirent)); + *de = *this_de; + de_list[n_elem++] = de; + } + closedir(d); + if (n_elem && compar) { + qsort(de_list, n_elem, sizeof(struct dirent *), + (int (*)(const void *, const void *)) compar); + } + *namelist = de_list; + return n_elem; +} From 74dca8530234ad6feba3f24f72af3329b4705720 Mon Sep 17 00:00:00 2001 From: Iliyan Malchev Date: Wed, 29 Oct 2008 16:06:14 -0700 Subject: [PATCH 2/6] Add processed kernel header for msm_snd driver. Signed-off-by: Iliyan Malchev --- libc/kernel/common/linux/msm_audio.h | 79 ++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 libc/kernel/common/linux/msm_audio.h diff --git a/libc/kernel/common/linux/msm_audio.h b/libc/kernel/common/linux/msm_audio.h new file mode 100644 index 000000000..f314a8213 --- /dev/null +++ b/libc/kernel/common/linux/msm_audio.h @@ -0,0 +1,79 @@ +/**************************************************************************** + **************************************************************************** + *** + *** This header was automatically generated from a Linux kernel header + *** of the same name, to make information necessary for userspace to + *** call into the kernel available to libc. It contains only constants, + *** structures, and macros generated from the original header, and thus, + *** contains no copyrightable information. + *** + **************************************************************************** + ****************************************************************************/ +#ifndef __LINUX_MSM_AUDIO_H +#define __LINUX_MSM_AUDIO_H + +#include +#include +#include + +#define AUDIO_IOCTL_MAGIC 'a' + +#define AUDIO_START _IOW(AUDIO_IOCTL_MAGIC, 0, unsigned) +#define AUDIO_STOP _IOW(AUDIO_IOCTL_MAGIC, 1, unsigned) +#define AUDIO_FLUSH _IOW(AUDIO_IOCTL_MAGIC, 2, unsigned) +#define AUDIO_GET_CONFIG _IOR(AUDIO_IOCTL_MAGIC, 3, unsigned) +#define AUDIO_SET_CONFIG _IOW(AUDIO_IOCTL_MAGIC, 4, unsigned) +#define AUDIO_GET_STATS _IOR(AUDIO_IOCTL_MAGIC, 5, unsigned) +#define AUDIO_ENABLE_AUDPP _IOW(AUDIO_IOCTL_MAGIC, 6, unsigned) +#define AUDIO_SET_ADRC _IOW(AUDIO_IOCTL_MAGIC, 7, unsigned) +#define AUDIO_SET_EQ _IOW(AUDIO_IOCTL_MAGIC, 8, unsigned) +#define AUDIO_SET_RX_IIR _IOW(AUDIO_IOCTL_MAGIC, 9, unsigned) +#define AUDIO_SET_VOLUME _IOW(AUDIO_IOCTL_MAGIC, 10, unsigned) + +struct msm_audio_config { + uint32_t buffer_size; + uint32_t buffer_count; + uint32_t channel_count; + uint32_t sample_rate; + uint32_t type; + uint32_t unused[3]; +}; + +struct msm_audio_stats { + uint32_t byte_count; + uint32_t sample_count; + uint32_t unused[2]; +}; + +#define SND_IOCTL_MAGIC 's' + +#define SND_MUTE_UNMUTED 0 +#define SND_MUTE_MUTED 1 + +struct snd_device_config { + uint32_t device; + uint32_t ear_mute; + uint32_t mic_mute; +}; + +#define SND_SET_DEVICE _IOW(SND_IOCTL_MAGIC, 2, struct device_config *) + +#define SND_METHOD_VOICE 0 + +struct snd_volume_config { + uint32_t device; + uint32_t method; + uint32_t volume; +}; + +#define SND_SET_VOLUME _IOW(SND_IOCTL_MAGIC, 3, struct snd_volume_config *) + +struct snd_endpoint { + const char name[50]; + int id; +}; + +#define SND_GET_ENDPOINTS _IOR(SND_IOCTL_MAGIC, 4, struct snd_endpoint *) + +#endif + From 39c8f369ef965e83e2a660b09221da94d54f1146 Mon Sep 17 00:00:00 2001 From: Iliyan Malchev Date: Wed, 5 Nov 2008 17:32:53 -0800 Subject: [PATCH 3/6] Update msm_audio.h with latest SND-driver API. Signed-off-by: Iliyan Malchev --- libc/kernel/common/linux/msm_audio.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/libc/kernel/common/linux/msm_audio.h b/libc/kernel/common/linux/msm_audio.h index f314a8213..58dc6f3f9 100644 --- a/libc/kernel/common/linux/msm_audio.h +++ b/libc/kernel/common/linux/msm_audio.h @@ -50,30 +50,32 @@ struct msm_audio_stats { #define SND_MUTE_UNMUTED 0 #define SND_MUTE_MUTED 1 -struct snd_device_config { +struct msm_snd_device_config { uint32_t device; uint32_t ear_mute; uint32_t mic_mute; }; -#define SND_SET_DEVICE _IOW(SND_IOCTL_MAGIC, 2, struct device_config *) +#define SND_SET_DEVICE _IOW(SND_IOCTL_MAGIC, 2, struct msm_device_config *) #define SND_METHOD_VOICE 0 -struct snd_volume_config { +struct msm_snd_volume_config { uint32_t device; uint32_t method; uint32_t volume; }; -#define SND_SET_VOLUME _IOW(SND_IOCTL_MAGIC, 3, struct snd_volume_config *) +#define SND_SET_VOLUME _IOW(SND_IOCTL_MAGIC, 3, struct msm_snd_volume_config *) -struct snd_endpoint { - const char name[50]; +#define SND_GET_NUM_ENDPOINTS _IOR(SND_IOCTL_MAGIC, 4, unsigned *) + +struct msm_snd_endpoint { int id; + char name[64]; }; -#define SND_GET_ENDPOINTS _IOR(SND_IOCTL_MAGIC, 4, struct snd_endpoint *) +#define SND_GET_ENDPOINT _IOWR(SND_IOCTL_MAGIC, 5, struct msm_snd_endpoint *) #endif From e0055e0f99732dbaea81fd1c7055efb7b506c221 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Thu, 4 Dec 2008 12:02:39 -0800 Subject: [PATCH 4/6] Introduce a new ARM header file Introduce a new header file containing ARM-specific feature test macros (e.g. __ARM_HAVE_PAIR_LOAD_STORE corresponding to ldrd/strd instructions). Also modify a few files in our system to use the macros in order to build for ARMv4T. --- libc/arch-arm/bionic/memcmp.S | 19 ++- libc/arch-arm/bionic/memcmp16.S | 19 ++- libc/arch-arm/bionic/memcpy.S | 21 ++- libc/arch-arm/bionic/strlen.c | 3 + libc/arch-arm/include/machine/cpu-features.h | 164 +++++++++++++++++++ 5 files changed, 201 insertions(+), 25 deletions(-) create mode 100644 libc/arch-arm/include/machine/cpu-features.h diff --git a/libc/arch-arm/bionic/memcmp.S b/libc/arch-arm/bionic/memcmp.S index d19dfb97f..f45b56bc3 100644 --- a/libc/arch-arm/bionic/memcmp.S +++ b/libc/arch-arm/bionic/memcmp.S @@ -25,6 +25,9 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ + +#include + .text .global memcmp @@ -41,8 +44,8 @@ */ memcmp: - pld [r0, #0] - pld [r1, #0] + PLD (r0, #0) + PLD (r1, #0) /* take of the case where length is 0 or the buffers are the same */ cmp r0, r1 @@ -53,8 +56,8 @@ memcmp: /* save registers */ stmfd sp!, {r4, lr} - pld [r0, #32] - pld [r1, #32] + PLD (r0, #32) + PLD (r1, #32) /* since r0 hold the result, move the first source * pointer somewhere else @@ -104,8 +107,8 @@ memcmp: subs r2, r2, #(32 + 4) bmi 1f -0: pld [r4, #64] - pld [r1, #64] +0: PLD (r4, #64) + PLD (r1, #64) ldr r0, [r4], #4 ldr lr, [r1, #4]! eors r0, r0, ip @@ -192,8 +195,8 @@ memcmp: bic r1, r1, #3 ldr lr, [r1], #4 -6: pld [r1, #64] - pld [r4, #64] +6: PLD (r1, #64) + PLD (r4, #64) mov ip, lr, lsr #16 ldr lr, [r1], #4 ldr r0, [r4], #4 diff --git a/libc/arch-arm/bionic/memcmp16.S b/libc/arch-arm/bionic/memcmp16.S index c6e6d397e..38d8b6232 100644 --- a/libc/arch-arm/bionic/memcmp16.S +++ b/libc/arch-arm/bionic/memcmp16.S @@ -25,6 +25,9 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ + +#include + .text .global __memcmp16 @@ -41,8 +44,8 @@ */ __memcmp16: - pld [r0, #0] - pld [r1, #0] + PLD (r0, #0) + PLD (r1, #0) /* take of the case where length is nul or the buffers are the same */ cmp r0, r1 @@ -64,8 +67,8 @@ __memcmp16: bpl 0f /* small blocks (less then 12 words) */ - pld [r0, #32] - pld [r1, #32] + PLD (r0, #32) + PLD (r1, #32) 1: ldrh r0, [r3], #2 ldrh ip, [r1], #2 @@ -113,8 +116,8 @@ __memcmp16: bmi 1f 0: - pld [r3, #64] - pld [r1, #64] + PLD (r3, #64) + PLD (r1, #64) ldr r0, [r3], #4 ldr lr, [r1, #4]! eors r0, r0, ip @@ -195,8 +198,8 @@ __memcmp16: sub r2, r2, #8 6: - pld [r3, #64] - pld [r1, #64] + PLD (r3, #64) + PLD (r1, #64) mov ip, lr, lsr #16 ldr lr, [r1], #4 ldr r0, [r3], #4 diff --git a/libc/arch-arm/bionic/memcpy.S b/libc/arch-arm/bionic/memcpy.S index f6e4a7d9b..fcb58cd19 100644 --- a/libc/arch-arm/bionic/memcpy.S +++ b/libc/arch-arm/bionic/memcpy.S @@ -25,6 +25,9 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ + +#include + .text .global memcpy @@ -52,9 +55,9 @@ memcpy: // preload the destination because we'll align it to a cache line // with small writes. Also start the source "pump". - pld [r0, #0] - pld [r1, #0] - pld [r1, #32] + PLD (r0, #0) + PLD (r1, #0) + PLD (r1, #32) /* it simplifies things to take care of len<4 early */ cmp r2, #4 @@ -141,8 +144,8 @@ cached_aligned32: bic r12, r1, #0x1F add r12, r12, #64 -1: ldmia r1!, { r4-r11 } - pld [r12, #64] +1: ldmia r1!, { r4-r11 } + PLD (r12, #64) subs r2, r2, #32 // NOTE: if r12 is more than 64 ahead of r1, the following ldrhi @@ -263,8 +266,8 @@ loop16: ldr r12, [r1], #4 1: mov r4, r12 ldmia r1!, { r5,r6,r7, r8,r9,r10,r11} - pld [r1, #64] - subs r2, r2, #32 + PLD (r1, #64) + subs r2, r2, #32 ldrhs r12, [r1], #4 orr r3, r3, r4, lsl #16 mov r4, r4, lsr #16 @@ -290,7 +293,7 @@ loop8: ldr r12, [r1], #4 1: mov r4, r12 ldmia r1!, { r5,r6,r7, r8,r9,r10,r11} - pld [r1, #64] + PLD (r1, #64) subs r2, r2, #32 ldrhs r12, [r1], #4 orr r3, r3, r4, lsl #24 @@ -317,7 +320,7 @@ loop24: ldr r12, [r1], #4 1: mov r4, r12 ldmia r1!, { r5,r6,r7, r8,r9,r10,r11} - pld [r1, #64] + PLD (r1, #64) subs r2, r2, #32 ldrhs r12, [r1], #4 orr r3, r3, r4, lsl #8 diff --git a/libc/arch-arm/bionic/strlen.c b/libc/arch-arm/bionic/strlen.c index 3d1fe455e..01632e33d 100644 --- a/libc/arch-arm/bionic/strlen.c +++ b/libc/arch-arm/bionic/strlen.c @@ -27,6 +27,7 @@ */ #include #include +#include size_t strlen(const char *s) { @@ -62,7 +63,9 @@ size_t strlen(const char *s) "ldr %[v], [ %[s] ], #4 \n" "sub %[l], %[l], %[s] \n" "0: \n" +#if __ARM_HAVE_PLD "pld [ %[s], #64 ] \n" +#endif "sub %[t], %[v], %[mask], lsr #7\n" "and %[t], %[t], %[mask] \n" "bics %[t], %[t], %[v] \n" diff --git a/libc/arch-arm/include/machine/cpu-features.h b/libc/arch-arm/include/machine/cpu-features.h new file mode 100644 index 000000000..f83600648 --- /dev/null +++ b/libc/arch-arm/include/machine/cpu-features.h @@ -0,0 +1,164 @@ +/* + * Copyright (C) 2008 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ +#ifndef _ARM_MACHINE_CPU_FEATURES_H +#define _ARM_MACHINE_CPU_FEATURES_H + +/* The purpose of this file is to define several macros corresponding + * to CPU features that may or may not be available at build time on + * on the target CPU. + * + * This is done to abstract us from the various ARM Architecture + * quirks and alphabet soup. + * + * IMPORTANT: We have no intention to support anything below an ARMv4T ! + */ + +/* _ARM_ARCH_REVISION is a number corresponding to the ARM revision + * we're going to support + * + * it looks like our toolchain doesn't define __ARM_ARCH__ + * so try to guess it. + * + * + * + */ +#ifndef __ARM_ARCH__ + +# if defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ || \ + defined __ARM_ARCH_7R__ || defined __ARM_ARCH_7M__ + +# define __ARM_ARCH__ 7 + +# elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ || \ + defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6Z__ || \ + defined __ARM_ARCH_6KZ__ || defined __ARM_ARCH_6T2__ +# +# define __ARM_ARCH__ 6 +# +# elif defined __ARM_ARCH_5__ || defined __ARM_ARCH_5T__ || \ + defined __ARM_ARCH_5TE__ || defined __ARM_ARCH_5TEJ__ +# +# define __ARM_ARCH__ 5 +# +# elif defined __ARM_ARCH_4T__ +# +# define __ARM_ARCH__ 4 +# +# elif defined __ARM_ARCH_4__ +# error ARMv4 is not supported, please use ARMv4T at a minimum +# else +# error Unknown or unsupported ARM architecture +# endif +#endif + +/* experimental feature used to check that our ARMv4 workarounds + * work correctly without a real ARMv4 machine */ +#ifdef BIONIC_EXPERIMENTAL_FORCE_ARMV4 +# undef __ARM_ARCH__ +# define __ARM_ARCH__ 4 +#endif + +/* define __ARM_HAVE_5TE if we have the ARMv5TE instructions */ +#if __ARM_ARCH__ > 5 +# define __ARM_HAVE_5TE 1 +#elif __ARM_ARCH__ == 5 +# if defined __ARM_ARCH_5TE__ || defined __ARM_ARCH_5TEJ__ +# define __ARM_HAVE_5TE 1 +# endif +#endif + +/* instructions introduced in ARMv5 */ +#if __ARM_ARCH__ >= 5 +# define __ARM_HAVE_BLX 1 +# define __ARM_HAVE_CLZ 1 +# define __ARM_HAVE_LDC2 1 +# define __ARM_HAVE_MCR2 1 +# define __ARM_HAVE_MRC2 1 +# define __ARM_HAVE_STC2 1 +#endif + +/* ARMv5TE introduces a few instructions */ +#if __ARM_HAVE_5TE +# define __ARM_HAVE_PLD 1 +# define __ARM_HAVE_MCRR 1 +# define __ARM_HAVE_MRRC 1 +#endif + +/* define __ARM_HAVE_HALFWORD_MULTIPLY when half-word multiply instructions + * this means variants of: smul, smulw, smla, smlaw, smlal + */ +#if __ARM_HAVE_5TE +# define __ARM_HAVE_HALFWORD_MULTIPLY 1 +#endif + +/* define __ARM_HAVE_PAIR_LOAD_STORE when 64-bit memory loads and stored + * into/from a pair of 32-bit registers is supported throuhg 'ldrd' and 'strd' + */ +#if __ARM_HAVE_5TE +# define __ARM_HAVE_PAIR_LOAD_STORE 1 +#endif + +/* define __ARM_HAVE_SATURATED_ARITHMETIC is you have the saturated integer + * arithmetic instructions: qdd, qdadd, qsub, qdsub + */ +#if __ARM_HAVE_5TE +# define __ARM_HAVE_SATURATED_ARITHMETIC 1 +#endif + +/* define __ARM_HAVE_PC_INTERWORK when a direct assignment to the + * pc register will switch into thumb/ARM mode depending on bit 0 + * of the new instruction address. Before ARMv5, this was not the + * case, and you have to write: + * + * mov r0, [] + * bx r0 + * + * instead of: + * + * ldr pc, [] + * + * note that this affects any instruction that explicitely changes the + * value of the pc register, including ldm { ...,pc } or 'add pc, #offset' + */ +#if __ARM_ARCH__ >= 5 +# define __ARM_HAVE_PC_INTERWORK +#endif + + +/* Assembly-only macros */ + +/* define a handy PLD(address) macro since the cache preload + * is an optional opcode + */ +#if __ARM_HAVE_PLD +# define PLD(reg,offset) pld [reg, offset] +#else +# define PLD(reg,offset) /* nothing */ +#endif + +#endif /* _ARM_MACHINE_CPU_FEATURES_H */ From 7b31dd66808cda2f14377d2d4b46194d9a99e06b Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Thu, 19 Mar 2009 23:08:36 -0700 Subject: [PATCH 5/6] auto import from //branches/cupcake_rel/...@141571 --- linker/linker.c | 53 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/linker/linker.c b/linker/linker.c index 91435de19..300a95c0d 100644 --- a/linker/linker.c +++ b/linker/linker.c @@ -37,7 +37,7 @@ #include #include -//#include +#include #include @@ -110,15 +110,11 @@ unsigned bitmask[4096]; */ extern void __attribute__((noinline)) rtld_db_dlactivity(void); -extern void sched_yield(void); - static struct r_debug _r_debug = {1, NULL, &rtld_db_dlactivity, RT_CONSISTENT, 0}; static struct link_map *r_debug_tail = 0; -//static pthread_mutex_t _r_debug_lock = PTHREAD_MUTEX_INITIALIZER; - -static volatile int loader_lock = 0; +static pthread_mutex_t _r_debug_lock = PTHREAD_MUTEX_INITIALIZER; static void insert_soinfo_into_debug_map(soinfo * info) { @@ -147,6 +143,17 @@ static void insert_soinfo_into_debug_map(soinfo * info) r_debug_tail = map; } +static void remove_soinfo_from_debug_map(soinfo * info) +{ + struct link_map * map = &(info->linkmap); + + if (r_debug_tail == map) + r_debug_tail = map->l_prev; + + if (map->l_prev) map->l_prev->l_next = map->l_next; + if (map->l_next) map->l_next->l_prev = map->l_prev; +} + void notify_gdb_of_load(soinfo * info) { if (info->flags & FLAG_EXE) { @@ -154,14 +161,7 @@ void notify_gdb_of_load(soinfo * info) return; } - /* yes, this is a little gross, but it does avoid - ** pulling in pthread_*() and at the moment we don't - ** dlopen() anything anyway - */ - while(__atomic_swap(1, &loader_lock) != 0) { - sched_yield(); - usleep(5000); - } + pthread_mutex_lock(&_r_debug_lock); _r_debug.r_state = RT_ADD; rtld_db_dlactivity(); @@ -171,7 +171,27 @@ void notify_gdb_of_load(soinfo * info) _r_debug.r_state = RT_CONSISTENT; rtld_db_dlactivity(); - __atomic_swap(0, &loader_lock); + pthread_mutex_unlock(&_r_debug_lock); +} + +void notify_gdb_of_unload(soinfo * info) +{ + if (info->flags & FLAG_EXE) { + // GDB already knows about the main executable + return; + } + + pthread_mutex_lock(&_r_debug_lock); + + _r_debug.r_state = RT_DELETE; + rtld_db_dlactivity(); + + remove_soinfo_from_debug_map(info); + + _r_debug.r_state = RT_CONSISTENT; + rtld_db_dlactivity(); + + pthread_mutex_unlock(&_r_debug_lock); } void notify_gdb_of_libraries() @@ -1066,6 +1086,7 @@ unsigned unload_library(soinfo *si) pid, si->name, si->base); ba_free(si->ba_index); } + notify_gdb_of_unload(si); free_info(si); si->refcount = 0; } @@ -1213,6 +1234,8 @@ static int reloc_library(soinfo *si, Elf32_Rel *rel, unsigned count) reloc, s->st_size, sym_addr, sym_name); memcpy((void*)reloc, (void*)sym_addr, s->st_size); break; + case R_ARM_NONE: + break; #endif /* ANDROID_ARM_LINKER */ default: From 6ed739e1d3b5088bf1cd56f09ba3afba792b969d Mon Sep 17 00:00:00 2001 From: Mathias Agopian <> Date: Wed, 25 Mar 2009 21:43:43 -0700 Subject: [PATCH 6/6] Automated import from //branches/cupcake/...@142857,142857 --- libc/kernel/common/linux/msm_mdp.h | 1 + 1 file changed, 1 insertion(+) diff --git a/libc/kernel/common/linux/msm_mdp.h b/libc/kernel/common/linux/msm_mdp.h index d10ed4383..43fdac3dd 100644 --- a/libc/kernel/common/linux/msm_mdp.h +++ b/libc/kernel/common/linux/msm_mdp.h @@ -45,6 +45,7 @@ enum { #define MDP_ROT_180 (MDP_FLIP_UD|MDP_FLIP_LR) #define MDP_ROT_270 (MDP_ROT_90|MDP_FLIP_UD|MDP_FLIP_LR) #define MDP_DITHER 0x8 +#define MDP_BLUR 0x10 #define MDP_TRANSP_NOP 0xffffffff #define MDP_ALPHA_NOP 0xff