From 0df68f0e98c048b2ca501f4f9b7e920588a615c5 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Sun, 19 Jul 2009 19:54:30 +0400 Subject: uclibc: fix building for bfin architecture Signed-off-by: Dmitry Eremin-Solenikov --- recipes/uclibc/files/uclibc-bfin-dl-sysdeps.patch | 127 ++++++++++++++++++++++ recipes/uclibc/files/uclibc-bfin-ldd.patch | 18 +++ recipes/uclibc/files/uclibc-check-ld-fix.patch | 13 +++ recipes/uclibc/uclibc.inc | 4 + 4 files changed, 162 insertions(+) create mode 100644 recipes/uclibc/files/uclibc-bfin-dl-sysdeps.patch create mode 100644 recipes/uclibc/files/uclibc-bfin-ldd.patch create mode 100644 recipes/uclibc/files/uclibc-check-ld-fix.patch diff --git a/recipes/uclibc/files/uclibc-bfin-dl-sysdeps.patch b/recipes/uclibc/files/uclibc-bfin-dl-sysdeps.patch new file mode 100644 index 0000000000..11ecb1aaa4 --- /dev/null +++ b/recipes/uclibc/files/uclibc-bfin-dl-sysdeps.patch @@ -0,0 +1,127 @@ +Index: uClibc-0.9.30/ldso/ldso/bfin/dl-sysdep.h +=================================================================== +--- uClibc-0.9.30.orig/ldso/ldso/bfin/dl-sysdep.h 2009-07-19 19:18:00.626446884 +0400 ++++ uClibc-0.9.30/ldso/ldso/bfin/dl-sysdep.h 2009-07-19 19:18:22.282448430 +0400 +@@ -227,3 +227,11 @@ + } while (--relative_count); + #endif + } ++ ++/* Value is unused, so just return 0 */ ++static __always_inline Elf32_Addr ++elf_machine_load_address (void) ++{ ++ return 0; ++} ++ +Index: uClibc-0.9.30/ldso/ldso/ldso.c +=================================================================== +--- uClibc-0.9.30.orig/ldso/ldso/ldso.c 2009-07-19 19:18:00.638447488 +0400 ++++ uClibc-0.9.30/ldso/ldso/ldso.c 2009-07-19 19:18:22.286447764 +0400 +@@ -180,10 +180,12 @@ + _dl_progname = argv[0]; + } + ++#if 0 + if (_start == (void *) auxvt[AT_ENTRY].a_un.a_val) { + _dl_dprintf(_dl_debug_file, "Standalone execution is not supported yet\n"); + _dl_exit(1); + } ++#endif + + /* Start to build the tables of the modules that are required for + * this beast to run. We start with the basic executable, and then +Index: uClibc-0.9.30/libc/sysdeps/linux/bfin/sys/user.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ uClibc-0.9.30/libc/sysdeps/linux/bfin/sys/user.h 2009-07-19 19:18:45.062448426 +0400 +@@ -0,0 +1,89 @@ ++#ifndef _BFIN_USER_H ++#define _BFIN_USER_H ++ ++/* Changes by Tony Kou Lineo, Inc. July, 2001 ++ * ++ * Based include/asm-m68knommu/user.h ++ * ++ */ ++ ++/* Core file format: The core file is written in such a way that gdb ++ can understand it and provide useful information to the user (under ++ linux we use the 'trad-core' bfd). There are quite a number of ++ obstacles to being able to view the contents of the floating point ++ registers, and until these are solved you will not be able to view the ++ contents of them. Actually, you can read in the core file and look at ++ the contents of the user struct to find out what the floating point ++ registers contain. ++ The actual file contents are as follows: ++ UPAGE: 1 page consisting of a user struct that tells gdb what is present ++ in the file. Directly after this is a copy of the task_struct, which ++ is currently not used by gdb, but it may come in useful at some point. ++ All of the registers are stored as part of the upage. The upage should ++ always be only one page. ++ DATA: The data area is stored. We use current->end_text to ++ current->brk to pick up all of the user variables, plus any memory ++ that may have been malloced. No attempt is made to determine if a page ++ is demand-zero or if a page is totally unused, we just cover the entire ++ range. All of the addresses are rounded in such a way that an integral ++ number of pages is written. ++ STACK: We need the stack information in order to get a meaningful ++ backtrace. We need to write the data from (esp) to ++ current->start_stack, so we round each of these off in order to be able ++ to write an integer number of pages. ++ The minimum core file size is 3 pages, or 12288 bytes. ++*/ ++struct user_bfinfp_struct { ++}; ++ ++/* This is the old layout of "struct pt_regs" as of Linux 1.x, and ++ is still the layout used by user (the new pt_regs doesn't have ++ all registers). */ ++struct user_regs_struct { ++ long r0, r1, r2, r3, r4, r5, r6, r7; ++ long p0, p1, p2, p3, p4, p5, usp, fp; ++ long i0, i1, i2, i3; ++ long l0, l1, l2, l3; ++ long b0, b1, b2, b3; ++ long m0, m1, m2, m3; ++ long a0w, a1w; ++ long a0x, a1x; ++ unsigned long rets; ++ unsigned long astat; ++ unsigned long pc; ++ unsigned long orig_p0; ++}; ++ ++/* When the kernel dumps core, it starts by dumping the user struct - ++ this will be used by gdb to figure out where the data and stack segments ++ are within the file, and what virtual addresses to use. */ ++ ++struct user { ++/* We start with the registers, to mimic the way that "memory" is returned ++ from the ptrace(3,...) function. */ ++ ++ struct user_regs_struct regs; /* Where the registers are actually stored */ ++ ++/* The rest of this junk is to help gdb figure out what goes where */ ++ unsigned long int u_tsize; /* Text segment size (pages). */ ++ unsigned long int u_dsize; /* Data segment size (pages). */ ++ unsigned long int u_ssize; /* Stack segment size (pages). */ ++ unsigned long start_code; /* Starting virtual address of text. */ ++ unsigned long start_stack; /* Starting virtual address of stack area. ++ This is actually the bottom of the stack, ++ the top of the stack is always found in the ++ esp register. */ ++ long int signal; /* Signal that caused the core dump. */ ++ int reserved; /* No longer used */ ++ unsigned long u_ar0; ++ /* Used by gdb to help find the values for */ ++ /* the registers. */ ++ unsigned long magic; /* To uniquely identify a core file */ ++ char u_comm[32]; /* User command that was responsible */ ++}; ++#define NBPG PAGE_SIZE ++#define UPAGES 1 ++#define HOST_TEXT_START_ADDR (u.start_code) ++#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG) ++ ++#endif diff --git a/recipes/uclibc/files/uclibc-bfin-ldd.patch b/recipes/uclibc/files/uclibc-bfin-ldd.patch new file mode 100644 index 0000000000..dc86554321 --- /dev/null +++ b/recipes/uclibc/files/uclibc-bfin-ldd.patch @@ -0,0 +1,18 @@ +Index: a/utils/ldd.c +=================================================================== +--- a/utils/ldd.c (revision 3342) ++++ a/utils/ldd.c (working copy) +@@ -120,6 +120,11 @@ + #define ELFCLASSM ELFCLASS64 + #endif + ++#if defined(__bfin__) ++#define MATCH_MACHINE(x) (x == EM_BLACKFIN) ++#define ELFCLASSM ELFCLASS32 ++#endif ++ + #ifndef MATCH_MACHINE + # ifdef __linux__ + # include + + diff --git a/recipes/uclibc/files/uclibc-check-ld-fix.patch b/recipes/uclibc/files/uclibc-check-ld-fix.patch new file mode 100644 index 0000000000..48de925f29 --- /dev/null +++ b/recipes/uclibc/files/uclibc-check-ld-fix.patch @@ -0,0 +1,13 @@ +Index: uClibc-0.9.30/Rules.mak +=================================================================== +--- uClibc-0.9.30.orig/Rules.mak 2009-07-19 14:09:46.842444177 +0400 ++++ uClibc-0.9.30/Rules.mak 2009-07-19 14:10:00.962446173 +0400 +@@ -146,7 +146,7 @@ + if $(CC) -Wa,$(1) -Wa,-Z -c -o /dev/null -xassembler /dev/null > /dev/null 2>&1; \ + then echo "-Wa,$(1)"; fi) + check_ld=$(shell \ +- if $(LD) $(1) -o /dev/null -b binary /dev/null > /dev/null 2>&1; \ ++ if $(LD) $(1) --oformat binary -o /dev/null -b binary /dev/null > /dev/null 2>&1; \ + then echo "$(1)"; fi) + + ARFLAGS:=cr diff --git a/recipes/uclibc/uclibc.inc b/recipes/uclibc/uclibc.inc index 3769c73c52..40ccd31de9 100644 --- a/recipes/uclibc/uclibc.inc +++ b/recipes/uclibc/uclibc.inc @@ -71,7 +71,11 @@ UCLIBC_LOCALE_URI_arm = "http://wiki.openembedded.net/dl/uclibc-locale/${UCLIBC_ SRC_URI = "${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} \ file://uClibc.config \ http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2 \ + file://uclibc-bfin-ldd.patch;patch=1 \ " +SRC_URI_append_bfin += "file://uclibc-check-ld-fix.patch;patch=1 \ + file://uclibc-bfin-dl-sysdeps.patch;patch=1 " + UCLIBC_STAGE_PREFIX = "${STAGING_DIR_HOST}${layout_prefix}" # do_stage barfs on a CC with whitepspace, therefore put the 'HOST_CC_ARCH' in -- cgit 1.2.3-korg