tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

android-2.1_r1 snapshot

Browse source
This commit is contained in:
The Android Open Source Project 2010-01-12 15:18:05 -08:00
parent 194d3fa048
commit a809abb086
6 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libc/kernel/common/linux/msm_kgsl.h
View file

@ -139,6 +139,8 @@ struct kgsl_drawctxt_destroy {
struct kgsl_sharedmem_from_pmem { struct kgsl_sharedmem_from_pmem {
int pmem_fd; int pmem_fd;
unsigned int gpuaddr; unsigned int gpuaddr;
unsigned int len;
unsigned int offset;
}; };
#define IOCTL_KGSL_SHAREDMEM_FROM_PMEM _IOWR(KGSL_IOC_TYPE, 0x20, struct kgsl_sharedmem_from_pmem) #define IOCTL_KGSL_SHAREDMEM_FROM_PMEM _IOWR(KGSL_IOC_TYPE, 0x20, struct kgsl_sharedmem_from_pmem)
@ -188,5 +190,12 @@ struct kgsl_sharedmem_from_vmalloc {
#define IOCTL_KGSL_SHAREDMEM_FLUSH_CACHE _IOW(KGSL_IOC_TYPE, 0x24, struct kgsl_sharedmem_free) #define IOCTL_KGSL_SHAREDMEM_FLUSH_CACHE _IOW(KGSL_IOC_TYPE, 0x24, struct kgsl_sharedmem_free)
struct kgsl_drawctxt_set_bin_base_offset {
unsigned int drawctxt_id;
unsigned int offset;
};
#define IOCTL_KGSL_DRAWCTXT_SET_BIN_BASE_OFFSET _IOW(KGSL_IOC_TYPE, 0x25, struct kgsl_drawctxt_set_bin_base_offset)
#endif #endif

BIN
libc/zoneinfo/zoneinfo.dat
View file

Binary file not shown.

BIN
libc/zoneinfo/zoneinfo.idx
View file

Binary file not shown.

2
libc/zoneinfo/zoneinfo.version
View file

@ -1 +1 @@
2007h 2009s

7
linker/linker.c
View file

@ -1294,6 +1294,13 @@ static int reloc_library(soinfo *si, Elf32_Rel *rel, unsigned count)
reloc, sym_addr, sym_name); reloc, sym_addr, sym_name);
*((unsigned*)reloc) += sym_addr; *((unsigned*)reloc) += sym_addr;
break; break;
case R_ARM_REL32:
COUNT_RELOC(RELOC_RELATIVE);
MARK(rel->r_offset);
TRACE_TYPE(RELO, "%5d RELO REL32 %08x <- %08x - %08x %s\n", pid,
reloc, sym_addr, rel->r_offset, sym_name);
*((unsigned*)reloc) += sym_addr - rel->r_offset;
break;
#elif defined(ANDROID_X86_LINKER) #elif defined(ANDROID_X86_LINKER)
case R_386_JUMP_SLOT: case R_386_JUMP_SLOT:
COUNT_RELOC(RELOC_ABSOLUTE); COUNT_RELOC(RELOC_ABSOLUTE);

13
linker/linker.h
View file

@ -159,6 +159,13 @@ extern soinfo libdl_info;
#define R_ARM_JUMP_SLOT 22 #define R_ARM_JUMP_SLOT 22
#define R_ARM_RELATIVE 23 #define R_ARM_RELATIVE 23
/* According to the AAPCS specification, we only
* need the above relocations. However, in practice,
* the following ones turn up from time to time.
*/
#define R_ARM_ABS32 2
#define R_ARM_REL32 3
#elif defined(ANDROID_X86_LINKER) #elif defined(ANDROID_X86_LINKER)
#define R_386_32 1 #define R_386_32 1
@ -194,12 +201,6 @@ extern soinfo libdl_info;
#define DT_PREINIT_ARRAYSZ 33 #define DT_PREINIT_ARRAYSZ 33
#endif #endif
/* in theory we only need the above relative relocations,
but in practice the following one turns up from time
to time. fushigi na.
*/
#define R_ARM_ABS32 2
soinfo *find_library(const char *name); soinfo *find_library(const char *name);
unsigned unload_library(soinfo *si); unsigned unload_library(soinfo *si);
Elf32_Sym *lookup_in_library(soinfo *si, const char *name); Elf32_Sym *lookup_in_library(soinfo *si, const char *name);