summaryrefslogtreecommitdiff
path: root/toolchain
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-08-21 12:34:41 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-08-21 12:34:41 +0200
commitf80eda0c17801058135f47e7f5ac3f6970e718ff (patch)
treeb0881d47fe31009736e4836d8ae358893c00136e /toolchain
parentd07acf5eacf62cd8b5495f12e3b37427050270c9 (diff)
cleanup eglibc/glibc Makefiles
- make it simpler and more equal - add dependency to gperf needed for new config system
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/eglibc/Makefile18
-rw-r--r--toolchain/glibc/Makefile24
-rw-r--r--toolchain/glibc/patches/gcc_eh.patch18
-rw-r--r--toolchain/glibc/patches/install-lib.patch17
-rw-r--r--toolchain/glibc/patches/mips-compile-error.patch577
5 files changed, 611 insertions, 43 deletions
diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile
index 374439100..c41752bfa 100644
--- a/toolchain/eglibc/Makefile
+++ b/toolchain/eglibc/Makefile
@@ -15,11 +15,15 @@ EGLIBC_CONFOPTS:= \
--without-cvs \
--disable-profile \
--disable-debug \
+ --enable-kernel=2.6.0 \
--without-gd \
+ --with-__thread \
+ --with-tls \
--enable-add-ons
EGLIBC_ENV:= PATH='${TARGET_PATH}' \
BUILD_CC=${HOSTCC} \
+ CFLAGS="$(TARGET_CFLAGS)" \
CC=${REAL_GNU_TARGET_NAME}-gcc \
CXX=${REAL_GNU_TARGET_NAME}-g++ \
AR=${REAL_GNU_TARGET_NAME}-ar \
@@ -36,10 +40,10 @@ EGLIBC_BUILD_DIR_INITIAL:= ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-headers
EGLIBC_BUILD_DIR_FINAL:= ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-final
$(WRKBUILD)/.headers_configure:
+ mkdir -p $(EGLIBC_BUILD_DIR_INITIAL)
(cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION); \
ln -sf ../ports ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)/libc);
(cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)/libc; autoconf --force);
- mkdir -p $(EGLIBC_BUILD_DIR_INITIAL)
$(CP) ${TOPDIR}/toolchain/eglibc/eglibc.config \
$(EGLIBC_BUILD_DIR_INITIAL)
(cd $(EGLIBC_BUILD_DIR_INITIAL); \
@@ -78,24 +82,16 @@ $(WRKBUILD)/.configured:
--prefix=/usr \
--enable-shared \
--enable-stackguard-randomization \
- --with-__thread \
- --with-tls \
- --enable-kernel=2.6.0 \
${EGLIBC_CONFOPTS} \
);
touch $@
$(WRKBUILD)/.compiled:
- ${EGLIBC_ENV} \
- CFLAGS="$(TARGET_CFLAGS)" \
- $(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL) all
+ ${EGLIBC_ENV} $(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL) all
touch $@
$(WRKBUILD)/.installed:
- PATH='${TARGET_PATH}' \
- $(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL) \
- install_root=$(STAGING_DIR) \
- install
+ ${EGLIBC_ENV} $(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL) install_root=$(STAGING_DIR) install
touch $@
include ${TOPDIR}/mk/toolchain.mk
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index 0a93e123e..e1b48f4e9 100644
--- a/toolchain/glibc/Makefile
+++ b/toolchain/glibc/Makefile
@@ -1,14 +1,15 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-#_IN_CVTC= 1
-
include $(TOPDIR)/rules.mk
include ../rules.mk
include Makefile.inc
include ${TOPDIR}/mk/buildhlp.mk
+# glibc does not compile with Os
+TARGET_CFLAGS:=$(subst Os,O2,$(TARGET_CFLAGS))
+
GLIBC_CONFOPTS:= \
--build=$(GNU_HOST_NAME) \
--host=$(REAL_GNU_TARGET_NAME) \
@@ -27,7 +28,7 @@ GLIBC_CONFOPTS:= \
GLIBC_ENV:= PATH='${TARGET_PATH}' \
BUILD_CC=${HOSTCC} \
- CFLAGS="$(TARGET_CFLAGS_ARCH) -O2 -pipe" \
+ CFLAGS="$(TARGET_CFLAGS)" \
CC=${REAL_GNU_TARGET_NAME}-gcc \
CXX=${REAL_GNU_TARGET_NAME}-g++ \
AR=${REAL_GNU_TARGET_NAME}-ar \
@@ -35,10 +36,10 @@ GLIBC_ENV:= PATH='${TARGET_PATH}' \
LD=${REAL_GNU_TARGET_NAME}-ld \
libc_cv_forced_unwind=yes \
libc_cv_c_cleanup=yes \
- libc_cv_gnu99_inline=yes \
+ libc_cv_gnu99_inline=yes
ifeq ($(ADK_DEVICE_NO_FPU),y)
-GLIBC_CONFOPTS+= --without-fp
+GLIBC_CONFOPTS+= --without-fp
endif
GLIBC_BUILD_DIR_INITIAL:= ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-headers
@@ -58,7 +59,7 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
$(MAKE) -C $(GLIBC_BUILD_DIR_INITIAL) \
cross-compiling=yes \
install_root=$(TOOLCHAIN_SYSROOT) \
- CFLAGS="-DBOOTSTRAP_GCC" install-headers
+ install-headers
touch $(TOOLCHAIN_SYSROOT)/usr/include/gnu/stubs.h
touch $(TOOLCHAIN_SYSROOT)/usr/include/bits/stdio_lim.h
touch $@
@@ -76,18 +77,11 @@ $(WRKBUILD)/.configured:
touch $@
$(WRKBUILD)/.compiled:
- ${GLIBC_ENV} \
- CFLAGS="$(TARGET_CFLAGS_ARCH) -O2 -pipe" \
- $(MAKE) -C $(GLIBC_BUILD_DIR_FINAL) lib \
- cross-compiling=yes
+ ${GLIBC_ENV} $(MAKE) -C $(GLIBC_BUILD_DIR_FINAL) all
touch $@
$(WRKBUILD)/.installed:
- PATH='${TARGET_PATH}' \
- $(MAKE) -C $(GLIBC_BUILD_DIR_FINAL) \
- install_root=$(STAGING_DIR) \
- install-lib-all install-headers \
- install-others cross-compiling=yes
+ ${GLIBC_ENV} $(MAKE) -C $(GLIBC_BUILD_DIR_FINAL) install_root=$(STAGING_DIR) install
touch $(STAGING_DIR)/usr/include/gnu/stubs.h
touch $@
diff --git a/toolchain/glibc/patches/gcc_eh.patch b/toolchain/glibc/patches/gcc_eh.patch
new file mode 100644
index 000000000..10749dcdb
--- /dev/null
+++ b/toolchain/glibc/patches/gcc_eh.patch
@@ -0,0 +1,18 @@
+diff -Nur glibc-2.10.1.orig/Makeconfig glibc-2.10.1/Makeconfig
+--- glibc-2.10.1.orig/Makeconfig 2009-08-20 08:51:54.000000000 +0200
++++ glibc-2.10.1/Makeconfig 2009-08-21 01:53:59.000000000 +0200
+@@ -525,12 +525,12 @@
+ libunwind = -lunwind
+ endif
+ ifneq ($(have-as-needed),yes)
+- libgcc_eh := -lgcc_eh $(libunwind)
++ libgcc_eh := $(libunwind)
+ else
+ libgcc_eh := -Wl,--as-needed -lgcc_s$(libgcc_s_suffix) $(libunwind) -Wl,--no-as-needed
+ endif
+ gnulib := -lgcc $(libgcc_eh)
+-static-gnulib := -lgcc -lgcc_eh $(libunwind)
++static-gnulib := -lgcc $(libunwind)
+ libc.so-gnulib := -lgcc
+ endif
+ ifeq ($(elf),yes)
diff --git a/toolchain/glibc/patches/install-lib.patch b/toolchain/glibc/patches/install-lib.patch
deleted file mode 100644
index 9be206def..000000000
--- a/toolchain/glibc/patches/install-lib.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Nur glibc-2.9.orig/Makerules glibc-2.9/Makerules
---- glibc-2.9.orig/Makerules 2008-02-07 01:39:18.000000000 +0100
-+++ glibc-2.9/Makerules 2009-05-27 00:30:47.000000000 +0200
-@@ -853,6 +853,13 @@
- installed-libcs := $(foreach o,$(filter-out .os,$(object-suffixes-for-libc)),\
- $(inst_libdir)/$(patsubst %,$(libtype$o),\
- $(libprefix)$(libc-name)))
-+
-+install-lib-all: $(inst_slibdir)/libc.so$(libc.so-version) \
-+ $(inst_slibdir)/libc-$(version).so \
-+ $(inst_libdir)/libc.so \
-+ $(inst_libdir)/libc.a \
-+ install-lib
-+
- install: $(installed-libcs)
- $(installed-libcs): $(inst_libdir)/lib$(libprefix)%: lib $(+force)
- $(make-target-directory)
diff --git a/toolchain/glibc/patches/mips-compile-error.patch b/toolchain/glibc/patches/mips-compile-error.patch
new file mode 100644
index 000000000..a07aab16a
--- /dev/null
+++ b/toolchain/glibc/patches/mips-compile-error.patch
@@ -0,0 +1,577 @@
+diff -Nur glibc-2.10.1/ports/sysdeps/mips/dl-lookup.c glibc-2.10.90/ports/sysdeps/mips/dl-lookup.c
+--- glibc-2.10.1/ports/sysdeps/mips/dl-lookup.c 2009-08-20 08:59:52.000000000 +0200
++++ glibc-2.10.90/ports/sysdeps/mips/dl-lookup.c 2009-05-26 22:53:27.000000000 +0200
+@@ -1,6 +1,9 @@
+ /* Look up a symbol in the loaded objects.
+- MIPS/Linux version - special handling of non-PIC undefined symbol rules.
+- Copyright (C) 1995-2005, 2006, 2007, 2009 Free Software Foundation, Inc.
++ MIPS/Linux version - this is identical to the common version, but
++ because it is in sysdeps/mips, it gets sysdeps/mips/do-lookup.h.
++ Using <do-lookup.h> instead of "do-lookup.h" would work too.
++
++ Copyright (C) 1995-2005, 2006, 2007 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+@@ -70,387 +73,8 @@
+ #endif
+
+
+-/* Inner part of the lookup functions. We return a value > 0 if we
+- found the symbol, the value 0 if nothing is found and < 0 if
+- something bad happened. */
+-static int
+-__attribute_noinline__
+-do_lookup_x (const char *undef_name, uint_fast32_t new_hash,
+- unsigned long int *old_hash, const ElfW(Sym) *ref,
+- struct sym_val *result, struct r_scope_elem *scope, size_t i,
+- const struct r_found_version *const version, int flags,
+- struct link_map *skip, int type_class, struct link_map *undef_map)
+-{
+- size_t n = scope->r_nlist;
+- /* Make sure we read the value before proceeding. Otherwise we
+- might use r_list pointing to the initial scope and r_nlist being
+- the value after a resize. That is the only path in dl-open.c not
+- protected by GSCOPE. A read barrier here might be to expensive. */
+- __asm volatile ("" : "+r" (n), "+m" (scope->r_list));
+- struct link_map **list = scope->r_list;
+-
+- do
+- {
+- /* These variables are used in the nested function. */
+- Elf_Symndx symidx;
+- int num_versions = 0;
+- const ElfW(Sym) *versioned_sym = NULL;
+-
+- const struct link_map *map = list[i]->l_real;
+-
+- /* Here come the extra test needed for `_dl_lookup_symbol_skip'. */
+- if (map == skip)
+- continue;
+-
+- /* Don't search the executable when resolving a copy reloc. */
+- if ((type_class & ELF_RTYPE_CLASS_COPY) && map->l_type == lt_executable)
+- continue;
+-
+- /* Do not look into objects which are going to be removed. */
+- if (map->l_removed)
+- continue;
+-
+- /* Print some debugging info if wanted. */
+- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SYMBOLS, 0))
+- _dl_debug_printf ("symbol=%s; lookup in file=%s [%lu]\n",
+- undef_name,
+- map->l_name[0] ? map->l_name : rtld_progname,
+- map->l_ns);
+-
+- /* If the hash table is empty there is nothing to do here. */
+- if (map->l_nbuckets == 0)
+- continue;
+-
+- /* The tables for this map. */
+- const ElfW(Sym) *symtab = (const void *) D_PTR (map, l_info[DT_SYMTAB]);
+- const char *strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]);
+-
+-
+- /* Nested routine to check whether the symbol matches. */
+- const ElfW(Sym) *
+- __attribute_noinline__
+- check_match (const ElfW(Sym) *sym)
+- {
+- unsigned int stt = ELFW(ST_TYPE) (sym->st_info);
+- assert (ELF_RTYPE_CLASS_PLT == 1);
+- /* The semantics of zero/non-zero values of undefined symbols
+- differs depending on whether the non-PIC ABI is in use.
+- Under the non-PIC ABI, a non-zero value indicates that
+- there is an address reference to the symbol and thus it
+- must always be resolved (except when resolving a jump slot
+- relocation) to the PLT entry whose address is provided as
+- the symbol's value; a zero value indicates that this
+- canonical-address behaviour is not required. Yet under the
+- classic MIPS psABI, a zero value indicates that there is an
+- address reference to the function and the dynamic linker
+- must resolve the symbol immediately upon loading. To avoid
+- conflict, symbols for which the dynamic linker must assume
+- the non-PIC ABI semantics are marked with the STO_MIPS_PLT
+- flag. */
+- if (__builtin_expect ((sym->st_value == 0 /* No value. */
+- && stt != STT_TLS)
+- || (sym->st_shndx == SHN_UNDEF
+- && !(sym->st_other & STO_MIPS_PLT))
+- || (type_class & (sym->st_shndx == SHN_UNDEF)),
+- 0))
+- return NULL;
+-
+- /* Ignore all but STT_NOTYPE, STT_OBJECT, STT_FUNC,
+- STT_COMMON, STT_TLS, and STT_GNU_IFUNC since these are no
+- code/data definitions. */
+-#define ALLOWED_STT \
+- ((1 << STT_NOTYPE) | (1 << STT_OBJECT) | (1 << STT_FUNC) \
+- | (1 << STT_COMMON) | (1 << STT_TLS) | (1 << STT_GNU_IFUNC))
+- if (__builtin_expect (((1 << stt) & ALLOWED_STT) == 0, 0))
+- return NULL;
+-
+- if (sym != ref && strcmp (strtab + sym->st_name, undef_name))
+- /* Not the symbol we are looking for. */
+- return NULL;
+-
+- const ElfW(Half) *verstab = map->l_versyms;
+- if (version != NULL)
+- {
+- if (__builtin_expect (verstab == NULL, 0))
+- {
+- /* We need a versioned symbol but haven't found any. If
+- this is the object which is referenced in the verneed
+- entry it is a bug in the library since a symbol must
+- not simply disappear.
+-
+- It would also be a bug in the object since it means that
+- the list of required versions is incomplete and so the
+- tests in dl-version.c haven't found a problem.*/
+- assert (version->filename == NULL
+- || ! _dl_name_match_p (version->filename, map));
+-
+- /* Otherwise we accept the symbol. */
+- }
+- else
+- {
+- /* We can match the version information or use the
+- default one if it is not hidden. */
+- ElfW(Half) ndx = verstab[symidx] & 0x7fff;
+- if ((map->l_versions[ndx].hash != version->hash
+- || strcmp (map->l_versions[ndx].name, version->name))
+- && (version->hidden || map->l_versions[ndx].hash
+- || (verstab[symidx] & 0x8000)))
+- /* It's not the version we want. */
+- return NULL;
+- }
+- }
+- else
+- {
+- /* No specific version is selected. There are two ways we
+- can got here:
+-
+- - a binary which does not include versioning information
+- is loaded
+-
+- - dlsym() instead of dlvsym() is used to get a symbol which
+- might exist in more than one form
+-
+- If the library does not provide symbol version information
+- there is no problem at at: we simply use the symbol if it
+- is defined.
+-
+- These two lookups need to be handled differently if the
+- library defines versions. In the case of the old
+- unversioned application the oldest (default) version
+- should be used. In case of a dlsym() call the latest and
+- public interface should be returned. */
+- if (verstab != NULL)
+- {
+- if ((verstab[symidx] & 0x7fff)
+- >= ((flags & DL_LOOKUP_RETURN_NEWEST) ? 2 : 3))
+- {
+- /* Don't accept hidden symbols. */
+- if ((verstab[symidx] & 0x8000) == 0
+- && num_versions++ == 0)
+- /* No version so far. */
+- versioned_sym = sym;
+-
+- return NULL;
+- }
+- }
+- }
+-
+- /* There cannot be another entry for this symbol so stop here. */
+- return sym;
+- }
+-
+- const ElfW(Sym) *sym;
+- const ElfW(Addr) *bitmask = map->l_gnu_bitmask;
+- if (__builtin_expect (bitmask != NULL, 1))
+- {
+- ElfW(Addr) bitmask_word
+- = bitmask[(new_hash / __ELF_NATIVE_CLASS)
+- & map->l_gnu_bitmask_idxbits];
+-
+- unsigned int hashbit1 = new_hash & (__ELF_NATIVE_CLASS - 1);
+- unsigned int hashbit2 = ((new_hash >> map->l_gnu_shift)
+- & (__ELF_NATIVE_CLASS - 1));
+-
+- if (__builtin_expect ((bitmask_word >> hashbit1)
+- & (bitmask_word >> hashbit2) & 1, 0))
+- {
+- Elf32_Word bucket = map->l_gnu_buckets[new_hash
+- % map->l_nbuckets];
+- if (bucket != 0)
+- {
+- const Elf32_Word *hasharr = &map->l_gnu_chain_zero[bucket];
+-
+- do
+- if (((*hasharr ^ new_hash) >> 1) == 0)
+- {
+- symidx = hasharr - map->l_gnu_chain_zero;
+- sym = check_match (&symtab[symidx]);
+- if (sym != NULL)
+- goto found_it;
+- }
+- while ((*hasharr++ & 1u) == 0);
+- }
+- }
+- /* No symbol found. */
+- symidx = SHN_UNDEF;
+- }
+- else
+- {
+- if (*old_hash == 0xffffffff)
+- *old_hash = _dl_elf_hash (undef_name);
+-
+- /* Use the old SysV-style hash table. Search the appropriate
+- hash bucket in this object's symbol table for a definition
+- for the same symbol name. */
+- for (symidx = map->l_buckets[*old_hash % map->l_nbuckets];
+- symidx != STN_UNDEF;
+- symidx = map->l_chain[symidx])
+- {
+- sym = check_match (&symtab[symidx]);
+- if (sym != NULL)
+- goto found_it;
+- }
+- }
+-
+- /* If we have seen exactly one versioned symbol while we are
+- looking for an unversioned symbol and the version is not the
+- default version we still accept this symbol since there are
+- no possible ambiguities. */
+- sym = num_versions == 1 ? versioned_sym : NULL;
+-
+- if (sym != NULL)
+- {
+- found_it:
+- switch (__builtin_expect (ELFW(ST_BIND) (sym->st_info), STB_GLOBAL))
+- {
+- case STB_WEAK:
+- /* Weak definition. Use this value if we don't find another. */
+- if (__builtin_expect (GLRO(dl_dynamic_weak), 0))
+- {
+- if (! result->s)
+- {
+- result->s = sym;
+- result->m = (struct link_map *) map;
+- }
+- break;
+- }
+- /* FALLTHROUGH */
+- case STB_GLOBAL:
+- success:
+- /* Global definition. Just what we need. */
+- result->s = sym;
+- result->m = (struct link_map *) map;
+- return 1;
+-
+- case STB_GNU_UNIQUE:;
+- /* We have to determine whether we already found a
+- symbol with this name before. If not then we have to
+- add it to the search table. If we already found a
+- definition we have to use it. */
+- void enter (struct unique_sym *table, size_t size,
+- unsigned int hash, const char *name,
+- const ElfW(Sym) *sym, const struct link_map *map)
+- {
+- size_t idx = hash % size;
+- size_t hash2 = 1 + hash % (size - 2);
+- while (1)
+- {
+- if (table[idx].hashval == 0)
+- {
+- table[idx].hashval = hash;
+- table[idx].name = strtab + sym->st_name;
+- if ((type_class & ELF_RTYPE_CLASS_COPY) != 0)
+- {
+- table[idx].sym = ref;
+- table[idx].map = undef_map;
+- }
+- else
+- {
+- table[idx].sym = sym;
+- table[idx].map = map;
+- }
+- return;
+- }
+-
+- idx += hash2;
+- if (idx >= size)
+- idx -= size;
+- }
+- }
+-
+- struct unique_sym_table *tab
+- = &GL(dl_ns)[map->l_ns]._ns_unique_sym_table;
+-
+- __rtld_lock_lock_recursive (tab->lock);
+-
+- struct unique_sym *entries = tab->entries;
+- size_t size = tab->size;
+- if (entries != NULL)
+- {
+- size_t idx = new_hash % size;
+- size_t hash2 = 1 + new_hash % (size - 2);
+- while (1)
+- {
+- if (entries[idx].hashval == new_hash
+- && strcmp (entries[idx].name, undef_name) == 0)
+- {
+- result->s = entries[idx].sym;
+- result->m = (struct link_map *) entries[idx].map;
+- __rtld_lock_unlock_recursive (tab->lock);
+- return 1;
+- }
+-
+- if (entries[idx].hashval == 0
+- && entries[idx].name == NULL)
+- break;
+-
+- idx += hash2;
+- if (idx >= size)
+- idx -= size;
+- }
+-
+- if (size * 3 <= tab->n_elements)
+- {
+- /* Expand the table. */
+- size_t newsize = _dl_higher_prime_number (size);
+- struct unique_sym *newentries
+- = calloc (sizeof (struct unique_sym), newsize);
+- if (newentries == NULL)
+- {
+- nomem:
+- __rtld_lock_unlock_recursive (tab->lock);
+- _dl_fatal_printf ("out of memory\n");
+- }
+-
+- for (idx = 0; idx < size; ++idx)
+- if (entries[idx].hashval != 0)
+- enter (newentries, newsize, entries[idx].hashval,
+- entries[idx].name, entries[idx].sym,
+- entries[idx].map);
+-
+- tab->free (entries);
+- tab->size = newsize;
+- entries = tab->entries = newentries;
+- tab->free = free;
+- }
+- }
+- else
+- {
+-#define INITIAL_NUNIQUE_SYM_TABLE 31
+- size = INITIAL_NUNIQUE_SYM_TABLE;
+- entries = calloc (sizeof (struct unique_sym), size);
+- if (entries == NULL)
+- goto nomem;
+-
+- tab->entries = entries;
+- tab->size = size;
+- tab->free = free;
+- }
+-
+- enter (entries, size, new_hash, strtab + sym->st_name, sym, map);
+- ++tab->n_elements;
+-
+- __rtld_lock_unlock_recursive (tab->lock);
+-
+- goto success;
+-
+- default:
+- /* Local symbols are ignored. */
+- break;
+- }
+- }
+-
+- /* If this current map is the one mentioned in the verneed entry
+- and we have not found a weak entry, it is a bug. */
+- if (symidx == STN_UNDEF && version != NULL && version->filename != NULL
+- && __builtin_expect (_dl_name_match_p (version->filename, map), 0))
+- return -1;
+- }
+- while (++i < n);
+-
+- /* We have not found anything until now. */
+- return 0;
+-}
++/* The actual lookup code. */
++#include "do-lookup.h"
+
+
+ static uint_fast32_t
+@@ -717,7 +341,7 @@
+ {
+ int res = do_lookup_x (undef_name, new_hash, &old_hash, *ref,
+ &current_value, *scope, start, version, flags,
+- skip_map, type_class, undef_map);
++ skip_map, type_class);
+ if (res > 0)
+ break;
+
+@@ -790,7 +414,7 @@
+ for (scope = symbol_scope; *scope != NULL; i = 0, ++scope)
+ if (do_lookup_x (undef_name, new_hash, &old_hash, *ref,
+ &protected_value, *scope, i, version, flags,
+- skip_map, ELF_RTYPE_CLASS_PLT, NULL) != 0)
++ skip_map, ELF_RTYPE_CLASS_PLT) != 0)
+ break;
+
+ if (protected_value.s != NULL && protected_value.m != undef_map)
+@@ -916,26 +540,21 @@
+
+ do_lookup_x (undef_name, new_hash, &old_hash, *ref, &val,
+ undef_map->l_local_scope[0], 0, version, 0, NULL,
+- type_class, undef_map);
++ type_class);
+
+ if (val.s != value->s || val.m != value->m)
+ conflict = 1;
+ }
+
+- if (value->s)
+- {
+- if (__builtin_expect (ELFW(ST_TYPE) (value->s->st_info)
+- == STT_TLS, 0))
+- type_class = 4;
+- else if (__builtin_expect (ELFW(ST_TYPE) (value->s->st_info)
+- == STT_GNU_IFUNC, 0))
+- type_class |= 8;
+- }
++ if (value->s
++ && (__builtin_expect (ELFW(ST_TYPE) (value->s->st_info)
++ == STT_TLS, 0)))
++ type_class = 4;
+
+ if (conflict
+ || GLRO(dl_trace_prelink_map) == undef_map
+ || GLRO(dl_trace_prelink_map) == NULL
+- || type_class >= 4)
++ || type_class == 4)
+ {
+ _dl_printf ("%s 0x%0*Zx 0x%0*Zx -> 0x%0*Zx 0x%0*Zx ",
+ conflict ? "conflict" : "lookup",
+diff -Nur glibc-2.10.1/ports/sysdeps/mips/do-lookup.h glibc-2.10.90/ports/sysdeps/mips/do-lookup.h
+--- glibc-2.10.1/ports/sysdeps/mips/do-lookup.h 1970-01-01 01:00:00.000000000 +0100
++++ glibc-2.10.90/ports/sysdeps/mips/do-lookup.h 2009-05-26 22:53:27.000000000 +0200
+@@ -0,0 +1,37 @@
++/* MIPS-specific veneer to GLIBC's do-lookup.h.
++ Copyright (C) 2008 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, write to the Free
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
++
++/* The semantics of zero/non-zero values of undefined symbols differs
++ depending on whether the non-PIC ABI is in use. Under the non-PIC ABI,
++ a non-zero value indicates that there is an address reference to the
++ symbol and thus it must always be resolved (except when resolving a jump
++ slot relocation) to the PLT entry whose address is provided as the
++ symbol's value; a zero value indicates that this canonical-address
++ behaviour is not required. Yet under the classic MIPS psABI, a zero value
++ indicates that there is an address reference to the function and the
++ dynamic linker must resolve the symbol immediately upon loading. To
++ avoid conflict, symbols for which the dynamic linker must assume the
++ non-PIC ABI semantics are marked with the STO_MIPS_PLT flag. The
++ following ugly hack causes the code in the platform-independent
++ do-lookup.h file to check this flag correctly. */
++#define st_value st_shndx == SHN_UNDEF && !(sym->st_other & STO_MIPS_PLT)) \
++ || (sym->st_value
++#include_next "do-lookup.h"
++#undef st_value
++
+diff -Nur glibc-2.10.1/ports/sysdeps/mips/__longjmp.c glibc-2.10.90/ports/sysdeps/mips/__longjmp.c
+--- glibc-2.10.1/ports/sysdeps/mips/__longjmp.c 2009-08-20 08:59:52.000000000 +0200
++++ glibc-2.10.90/ports/sysdeps/mips/__longjmp.c 2009-05-26 22:53:26.000000000 +0200
+@@ -25,19 +25,19 @@
+ #endif
+
+ void
+-__longjmp (env_arg, val_arg)
+- __jmp_buf env_arg;
++__longjmp (env, val_arg)
++ __jmp_buf env;
+ int val_arg;
+ {
+ /* gcc 1.39.19 miscompiled the longjmp routine (as it did setjmp before
+ the hack around it); force it to use $a1 for the longjmp value.
+ Without this it saves $a1 in a register which gets clobbered
+ along the way. */
+- register struct __jmp_buf_internal_tag *env asm ("a0");
+ register int val asm ("a1");
+ #ifdef CHECK_SP
+ register long sp asm ("$29");
+- CHECK_SP (env[0].__sp, sp, long);
++ if ((long) (env[0].__sp) < sp)
++ __fortify_fail ("longjmp causes uninitialized stack frame");
+ #endif
+
+ #ifdef __mips_hard_float
+diff -Nur glibc-2.10.1/ports/sysdeps/mips/____longjmp_chk.c glibc-2.10.90/ports/sysdeps/mips/____longjmp_chk.c
+--- glibc-2.10.1/ports/sysdeps/mips/____longjmp_chk.c 1970-01-01 01:00:00.000000000 +0100
++++ glibc-2.10.90/ports/sysdeps/mips/____longjmp_chk.c 2009-05-26 22:53:26.000000000 +0200
+@@ -0,0 +1,22 @@
++/* Copyright (C) 2009 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, write to the Free
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
++
++#include <stdio.h>
++#define __longjmp ____longjmp_chk
++#define CHECK_SP
++#include <__longjmp.c>
+diff -Nur glibc-2.10.1/ports/sysdeps/mips/mips64/__longjmp.c glibc-2.10.90/ports/sysdeps/mips/mips64/__longjmp.c
+--- glibc-2.10.1/ports/sysdeps/mips/mips64/__longjmp.c 2009-08-20 08:59:52.000000000 +0200
++++ glibc-2.10.90/ports/sysdeps/mips/mips64/__longjmp.c 2009-05-26 22:53:27.000000000 +0200
+@@ -27,19 +27,19 @@
+ #endif
+
+ void
+-__longjmp (env_arg, val_arg)
+- __jmp_buf env_arg;
++__longjmp (env, val_arg)
++ __jmp_buf env;
+ int val_arg;
+ {
+ /* gcc 1.39.19 miscompiled the longjmp routine (as it did setjmp before
+ the hack around it); force it to use $a1 for the longjmp value.
+ Without this it saves $a1 in a register which gets clobbered
+ along the way. */
+- register struct __jmp_buf_internal_tag *env asm ("a0");
+ register int val asm ("a1");
+ #ifdef CHECK_SP
+ register long long sp asm ("$29");
+- CHECK_SP (env[0].__sp, sp, long long);
++ if ((long long) (env[0].__sp) < sp)
++ __fortify_fail ("longjmp causes uninitialized stack frame");
+ #endif
+
+ #ifdef __mips_hard_float