From a809abb086b5cb5cd5545048b12f64b899c6a253 Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Tue, 12 Jan 2010 15:18:05 -0800 Subject: [PATCH] android-2.1_r1 snapshot --- libc/kernel/common/linux/msm_kgsl.h | 9 +++++++++ libc/zoneinfo/zoneinfo.dat | Bin 169880 -> 168809 bytes libc/zoneinfo/zoneinfo.idx | Bin 29016 -> 29172 bytes libc/zoneinfo/zoneinfo.version | 2 +- linker/linker.c | 7 +++++++ linker/linker.h | 13 +++++++------ 6 files changed, 24 insertions(+), 7 deletions(-) diff --git a/libc/kernel/common/linux/msm_kgsl.h b/libc/kernel/common/linux/msm_kgsl.h index d717e57e9..740ba60f4 100644 --- a/libc/kernel/common/linux/msm_kgsl.h +++ b/libc/kernel/common/linux/msm_kgsl.h @@ -139,6 +139,8 @@ struct kgsl_drawctxt_destroy { struct kgsl_sharedmem_from_pmem { int pmem_fd; 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) @@ -188,5 +190,12 @@ struct kgsl_sharedmem_from_vmalloc { #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 diff --git a/libc/zoneinfo/zoneinfo.dat b/libc/zoneinfo/zoneinfo.dat index e5bf25a937fd706b74afc536b6dc01a4b33c5864..c9f0b6f3f4662f1eb9738e7e2e87384164629c38 100644 GIT binary patch delta 3148 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 diff --git a/libc/zoneinfo/zoneinfo.idx b/libc/zoneinfo/zoneinfo.idx index 78a36509307fb7078eceaf3b5e859518f03bc83a..cb560db4fe578d89e1373716d58fc06568ae0bfb 100644 GIT binary patch delta 4269 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 GCjSFH{i?kH delta 4142 zcmY+{e^gXu8VB&17o3nY;GiUprSkEq@aVMl8%ajhJXl)3JS>jr^ZvL$-uJ%u zx%UoU)pvfOufNMj{~r8&BK1j#@rlwqkjr=!)r{YxgK;(de53R)!ok>wJjVH`VT?y7 zVKXIV%XkrHzbJhO5*f4LVQfYNV-)%rfzXjsjJ<`Vkx}}!C}BK~MplIkp?~Bio}Jr2 zYDAPyC&FJV^WUr&;v~|HAsA&0F@*Q9`fV1?h%=7;wP-U;KgO0f*fJI;jb?)_nZ2wb;y+*yuo-5Z=3lkPu{gz+IXi#p_(gzuq+^awr+-eT)4?Zj zx*_(%U-~W%G#i}IirIlSvA_*)pcD&Ep^YruUok36EDAvOC@EZfQAHBQpk47jd`(g; z*@zg$XUHXq?WiV8?dUMgQo}U{*+fzW96?g7tUw-Foq?Jl>7V>K&n4w&%R(J`f~%vG@2-TCTsVsY(l!mXGlppIOA5~sCSNZ_J?TG*Ud4AX-y_ApZy}Kkc;F$|1sceW(dfHJ`u~)}YyO>f z%`KCy;zkORCQI>MEJ_qrXe9qRf`0Pf6$rCPaVraMi!}VmdrrR(Wft52@1wXEo?VUdzBBofy&&!cKWrmMlTt=DF$BSmAAqRs~w6z&NRh!IIGBN_?Byb5@6qUHC z=tjgeDMn32nqoUDiD@-j6@SAJ89fMlxVCIF$+#`>l1a`k>tlPFhlyUoyqNUwR4D&R>NAR zcl}AEN}EVof-)&ZY8je||6egk9!^4d6zM@KNt=gql97%U#ml%EB@J0yxVIN!kGA=5 z^5@@r?P^s;Tg9exXpR2OuzhD*MfPskXG*ap9+`@(@RHm!XjA-LF-t{6lWjI+le`rJ?6||7k`*4%I{wyLMkmAg2q!G4NlCw+EN}ASVNbw%* z^QCw*ADQIs40uWNNwjIDiUmxzHxNy@bvEH%wm@e*cYbL`OLa~CP%lRFdZB0VTZ%+3OF#Am77%V zj*oXEXuV|wZ>mc=m=mP<=w&1-{s~V)mbl%DK9)YQAat=tk|Gr)iX&)LTtYwTG$L#X zSp>IYH%b-f(WLku1LV_4SQ1GNk`*tZOwo;I!Xpfl&q5Hslst%3MH$K!7tlgJ7r3d2 zMZ_{vgfzuzR4V$>O1h?ENRbBna`HSf6&>)B?m)DWPb?Kl+To%}w+q<{52}V~AIA4V zRyHDrT=@pMq?f6ijB7^+`PX6it&rlIWpEJ32IP@zUeu85@1Tvc_nU=l+}nx z(RQ6i)^($jq}@g<$((^9vMB`iRP8{SWOF~fsnW2OZv)~Lw5QrcUUkJfZTQi{WD~BR zs$tsK$-qyTZFMpH=@u<@+tmv9)#=$KX1&%km*kH?^?DgF{5(-lfP{>V6&oiaY?{By zG=2}WODr6U6UbBih#ImZ3Z05AFs6|PI2Avkfb3j|+B9j{d5E{uv*<~)iNdKcZIH&o z?L3tP-RI|Y2|M6SnRqzN-$&0(TeLyTv~`5I1Eqg~CSElcLwr ztGEVphW470NchU=$&ki(^qid)>Na2YkQ%Of?GR6Vh(31N6Nk`D?IkHGQ;sSbV$%sV z;G~uAm?T_JpCXDS8Z)KgiCt_;!9b=>Z5p;w+tf|=g`t!@xf)I6fC&SN3|O+H;lNRD zv>B;cHu2O5lx0crR4kemUJNR}K=>w(i%UXLh;qdbXdzEW;-=!yh{)E)oJI~>P^rj4 ztKu~bkwcSV&mo79skj0!DYv3cajIgo6o;oHT9JWlMIEXXU!t8=pL5%MHalB<8s4A_-0;AI4$*rUlF~8-&p26?Sdr|enohO uX&^lLKEjL@ny-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) case R_386_JUMP_SLOT: COUNT_RELOC(RELOC_ABSOLUTE); diff --git a/linker/linker.h b/linker/linker.h index d289c81a8..551cf93c7 100644 --- a/linker/linker.h +++ b/linker/linker.h @@ -159,6 +159,13 @@ extern soinfo libdl_info; #define R_ARM_JUMP_SLOT 22 #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) #define R_386_32 1 @@ -194,12 +201,6 @@ extern soinfo libdl_info; #define DT_PREINIT_ARRAYSZ 33 #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); unsigned unload_library(soinfo *si); Elf32_Sym *lookup_in_library(soinfo *si, const char *name);