generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 5fd31f68: am 4b582142: Merge "Fix x86 dynamic linker build."

Browse Source 
* commit '5fd31f6891a6e0b5db84c4c7992d0a4b08f3dddd':
  Fix x86 dynamic linker build.
This commit is contained in:
Elliott Hughes 2012-12-19 09:51:36 -08:00 committed by Android Git Automerger
commit d020802e37
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
linker/arch/x86/begin.c
View File

@ -26,14 +26,15 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <stdint.h>
extern unsigned __linker_init(unsigned int *elfdata); extern unsigned __linker_init(unsigned int *elfdata);
__attribute__((visibility("hidden"))) __attribute__((visibility("hidden")))
void _start() { void _start() {
void *elfdata;
void (*start)(void); void (*start)(void);
elfdata = __builtin_frame_address(0) + sizeof(void *); void* elfdata = (void*) ((uintptr_t) __builtin_frame_address(0) + sizeof(void*));
start = (void(*)(void))__linker_init(elfdata); start = (void(*)(void))__linker_init(elfdata);
/* linker init returns (%eax) the _entry address in the main image */ /* linker init returns (%eax) the _entry address in the main image */

6
linker/linker_format.cpp
View File

@ -371,14 +371,14 @@ format_number(char *buffer, size_t bufsize, uint64_t value, int base, const char
while (value) { while (value) {
unsigned d = value % base; unsigned d = value % base;
value /= base; value /= base;
if (pos < end) { if (pos != end) {
*pos++ = digits[d]; *pos++ = digits[d];
} }
} }
/* special case for 0 */ /* special case for 0 */
if (pos == buffer) { if (pos == buffer) {
if (pos < end) { if (pos != end) {
*pos++ = '0'; *pos++ = '0';
} }
} }
@ -387,7 +387,7 @@ format_number(char *buffer, size_t bufsize, uint64_t value, int base, const char
/* now reverse digit string in-place */ /* now reverse digit string in-place */
end = pos - 1; end = pos - 1;
pos = buffer; pos = buffer;
while (pos < end) { while (pos != end) {
int ch = pos[0]; int ch = pos[0];
pos[0] = end[0]; pos[0] = end[0];
end[0] = (char) ch; end[0] = (char) ch;