mirror of
https://git.yoctoproject.org/poky
synced 2026-02-13 12:13:02 +01:00
eglibc-2.15: Delete
eglibc 2.15 is not buildable with current toolchain build sequence and is not used as default on OE-Core. So lets remove it. (From OE-Core rev: d8c47eeb09d1bc2a6a7a335cc94658f6bdfe4026) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -1,44 +0,0 @@
|
||||
DESCRIPTION = "Cross locale generation tool for eglibc"
|
||||
HOMEPAGE = "http://www.eglibc.org/home"
|
||||
SECTION = "libs"
|
||||
LICENSE = "LGPL"
|
||||
|
||||
LIC_DIR = "${WORKDIR}/${EGLIBC_BRANCH}/libc"
|
||||
LIC_FILES_CHKSUM = "file://${LIC_DIR}/LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9\
|
||||
file://${LIC_DIR}/COPYING;md5=393a5ca445f6965873eca0259a17f833 \
|
||||
file://${LIC_DIR}/posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
|
||||
file://${LIC_DIR}/COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff "
|
||||
|
||||
|
||||
inherit native
|
||||
inherit autotools
|
||||
|
||||
PR = "r0"
|
||||
SRCREV="15225"
|
||||
EGLIBC_BRANCH="eglibc-2_14"
|
||||
SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=http "
|
||||
S = "${WORKDIR}/${EGLIBC_BRANCH}/localedef"
|
||||
|
||||
do_unpack_append() {
|
||||
bb.build.exec_func('do_move_ports', d)
|
||||
}
|
||||
|
||||
do_move_ports() {
|
||||
if test -d ${WORKDIR}/${EGLIBC_BRANCH}/ports ; then
|
||||
rm -rf ${WORKDIR}/libc/ports
|
||||
mv ${WORKDIR}/${EGLIBC_BRANCH}/ports ${WORKDIR}/libc/
|
||||
fi
|
||||
}
|
||||
|
||||
EXTRA_OECONF = "--with-glibc=${WORKDIR}/${EGLIBC_BRANCH}/libc"
|
||||
CFLAGS += "-DNOT_IN_libc=1"
|
||||
|
||||
do_configure () {
|
||||
./configure ${EXTRA_OECONF}
|
||||
}
|
||||
|
||||
|
||||
do_install() {
|
||||
install -d ${D}${bindir}
|
||||
install -m 0755 ${S}/localedef ${D}${bindir}/cross-localedef
|
||||
}
|
||||
@@ -1,108 +0,0 @@
|
||||
Its controlled by __OPTION_EGLIBC_RTLD_DEBUG
|
||||
so we should use GLRO_dl_debug_mask
|
||||
|
||||
Singed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
Upstream-Status: Pending
|
||||
Index: libc/elf/dl-open.c
|
||||
===================================================================
|
||||
--- libc.orig/elf/dl-open.c 2012-03-09 08:54:34.691443995 -0800
|
||||
+++ libc/elf/dl-open.c 2012-03-09 08:55:31.275446730 -0800
|
||||
@@ -154,7 +154,7 @@
|
||||
ns->_ns_main_searchlist->r_list[new_nlist++] = map;
|
||||
|
||||
/* We modify the global scope. Report this. */
|
||||
- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES, 0))
|
||||
+ if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_SCOPES, 0))
|
||||
_dl_debug_printf ("\nadd %s [%lu] to global scope\n",
|
||||
map->l_name, map->l_ns);
|
||||
}
|
||||
@@ -294,7 +294,7 @@
|
||||
_dl_debug_state ();
|
||||
|
||||
/* Print scope information. */
|
||||
- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES, 0))
|
||||
+ if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_SCOPES, 0))
|
||||
_dl_show_scope (new, 0);
|
||||
|
||||
/* Only do lazy relocation if `LD_BIND_NOW' is not set. */
|
||||
@@ -438,7 +438,7 @@
|
||||
}
|
||||
|
||||
/* Print scope information. */
|
||||
- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES, 0))
|
||||
+ if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_SCOPES, 0))
|
||||
_dl_show_scope (imap, from_scope);
|
||||
}
|
||||
|
||||
Index: libc/ports/sysdeps/mips/dl-lookup.c
|
||||
===================================================================
|
||||
--- libc.orig/ports/sysdeps/mips/dl-lookup.c 2012-03-09 08:54:34.707443996 -0800
|
||||
+++ libc/ports/sysdeps/mips/dl-lookup.c 2012-03-09 09:02:36.903467324 -0800
|
||||
@@ -111,7 +111,7 @@
|
||||
continue;
|
||||
|
||||
/* Print some debugging info if wanted. */
|
||||
- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SYMBOLS, 0))
|
||||
+ 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,
|
||||
@@ -432,7 +432,7 @@
|
||||
hash table. */
|
||||
if (__builtin_expect (tab->size, 0))
|
||||
{
|
||||
- assert (GLRO(dl_debug_mask) & DL_DEBUG_PRELINK);
|
||||
+ assert (GLRO_dl_debug_mask & DL_DEBUG_PRELINK);
|
||||
__rtld_lock_unlock_recursive (tab->lock);
|
||||
goto success;
|
||||
}
|
||||
@@ -681,7 +681,7 @@
|
||||
}
|
||||
|
||||
/* Display information if we are debugging. */
|
||||
- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
|
||||
+ if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_FILES, 0))
|
||||
_dl_debug_printf ("\
|
||||
\nfile=%s [%lu]; needed by %s [%lu] (relocation dependency)\n\n",
|
||||
map->l_name[0] ? map->l_name : rtld_progname,
|
||||
@@ -860,7 +860,7 @@
|
||||
if (__builtin_expect (current_value.m->l_used == 0, 0))
|
||||
current_value.m->l_used = 1;
|
||||
|
||||
- if (__builtin_expect (GLRO(dl_debug_mask)
|
||||
+ if (__builtin_expect (GLRO_dl_debug_mask
|
||||
& (DL_DEBUG_BINDINGS|DL_DEBUG_PRELINK), 0))
|
||||
_dl_debug_bindings (undef_name, undef_map, ref,
|
||||
¤t_value, version, type_class, protected);
|
||||
@@ -925,7 +925,7 @@
|
||||
{
|
||||
const char *reference_name = undef_map->l_name;
|
||||
|
||||
- if (GLRO(dl_debug_mask) & DL_DEBUG_BINDINGS)
|
||||
+ if (GLRO_dl_debug_mask & DL_DEBUG_BINDINGS)
|
||||
{
|
||||
_dl_debug_printf ("binding file %s [%lu] to %s [%lu]: %s symbol `%s'",
|
||||
(reference_name[0]
|
||||
@@ -941,7 +941,7 @@
|
||||
_dl_debug_printf_c ("\n");
|
||||
}
|
||||
#ifdef SHARED
|
||||
- if (GLRO(dl_debug_mask) & DL_DEBUG_PRELINK)
|
||||
+ if (GLRO_dl_debug_mask & DL_DEBUG_PRELINK)
|
||||
{
|
||||
int conflict = 0;
|
||||
struct sym_val val = { NULL, NULL };
|
||||
Index: libc/elf/rtld.c
|
||||
===================================================================
|
||||
--- libc.orig/elf/rtld.c 2012-03-09 09:01:35.159464344 -0800
|
||||
+++ libc/elf/rtld.c 2012-03-09 09:01:56.247465364 -0800
|
||||
@@ -2198,7 +2198,7 @@
|
||||
GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
|
||||
|
||||
/* Print scope information. */
|
||||
- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES, 0))
|
||||
+ if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_SCOPES, 0))
|
||||
{
|
||||
_dl_debug_printf ("\nInitial object scopes\n");
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
import http://sourceware.org/ml/libc-ports/2007-12/msg00000.html
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Index: libc/bits/stdio-lock.h
|
||||
===================================================================
|
||||
--- libc.orig/bits/stdio-lock.h 2009-10-28 14:34:19.000000000 -0700
|
||||
+++ libc/bits/stdio-lock.h 2009-10-28 14:34:54.000000000 -0700
|
||||
@@ -50,6 +50,8 @@ __libc_lock_define_recursive (typedef, _
|
||||
_IO_cleanup_region_start ((void (*) (void *)) _IO_funlockfile, (_fp)); \
|
||||
_IO_flockfile (_fp)
|
||||
|
||||
+# define _IO_acquire_lock_clear_flags2(_fp) _IO_acquire_lock (_fp)
|
||||
+
|
||||
# define _IO_release_lock(_fp) \
|
||||
_IO_funlockfile (_fp); \
|
||||
_IO_cleanup_region_end (0)
|
||||
@@ -1,28 +0,0 @@
|
||||
From: Carlos O'Donell <carlos_odonell@mentor.com>
|
||||
Date: Mon, 7 May 2012 20:04:41 +0000 (-0400)
|
||||
Subject: ARM: Define HAVE_ARM_PCS_VFP in config.h.
|
||||
X-Git-Url: http://sourceware.org/git/?p=glibc.git;a=commitdiff_plain;h=6a43ec980c5a0500149ef37d4854eac0e270da6f;hp=05c2c9618f583ea4acd69b3fe5ae2a2922dd2ddc
|
||||
|
||||
ARM: Define HAVE_ARM_PCS_VFP in config.h.
|
||||
|
||||
If the compiler and flags would select the hard-float ABI
|
||||
then the ARM configure fragment will set HAVE_ARM_PCS_VFP.
|
||||
This is later used by the ARM shlib-versions to select
|
||||
the appropriately named dynamic linker.
|
||||
---
|
||||
|
||||
Upstream-Status: Backport
|
||||
-Khem
|
||||
|
||||
Index: libc/config.h.in
|
||||
===================================================================
|
||||
--- libc.orig/config.h.in 2012-01-04 22:06:28.000000000 -0800
|
||||
+++ libc/config.h.in 2012-05-08 11:25:56.581079069 -0700
|
||||
@@ -233,4 +233,7 @@
|
||||
|
||||
#define HAVE_REGEX 1
|
||||
|
||||
+/* The ARM hard-float ABI is being used. */
|
||||
+#undef HAVE_ARM_PCS_VFP
|
||||
+
|
||||
#endif
|
||||
@@ -1,72 +0,0 @@
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
export the rpc symbols and headers again until we can get libtirpc sorted
|
||||
out as a proper and full replacement
|
||||
|
||||
patch from fedora (if redhat can't get it to work as the maintainers of all
|
||||
these packages, then what chance do we have!)
|
||||
|
||||
Index: libc/NEWS
|
||||
===================================================================
|
||||
--- libc.orig/NEWS 2011-09-09 10:46:36.000000000 -0700
|
||||
+++ libc/NEWS 2011-09-09 10:58:21.196279725 -0700
|
||||
@@ -20,16 +20,6 @@
|
||||
12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792,
|
||||
12795, 12811, 12813, 12814, 12841
|
||||
|
||||
-* The RPC implementation in libc is obsoleted. Old programs keep working
|
||||
- but new programs cannot be linked with the routines in libc anymore.
|
||||
- Programs in need of RPC functionality must be linked against TI-RPC.
|
||||
- The TI-RPC implementation is IPv6 enabled and there are other benefits.
|
||||
-
|
||||
- Visible changes of this change include (obviously) the inability to link
|
||||
- programs using RPC functions without referencing the TI-RPC library and the
|
||||
- removal of the RPC headers from the glibc headers.
|
||||
- Implemented by Ulrich Drepper.
|
||||
-
|
||||
* New Linux interfaces: clock_adjtime, name_to_handle_at, open_by_handle_at,
|
||||
syncfs, setns, sendmmsg
|
||||
|
||||
Index: libc/include/libc-symbols.h
|
||||
===================================================================
|
||||
--- libc.orig/include/libc-symbols.h 2011-09-09 10:45:34.000000000 -0700
|
||||
+++ libc/include/libc-symbols.h 2011-09-09 10:58:21.196279725 -0700
|
||||
@@ -656,7 +656,7 @@
|
||||
# define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
|
||||
# define libc_hidden_def(name) hidden_def (name)
|
||||
# define libc_hidden_weak(name) hidden_weak (name)
|
||||
-# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version)
|
||||
+# define libc_hidden_nolink(name, version) hidden_def (name)
|
||||
# define libc_hidden_ver(local, name) hidden_ver (local, name)
|
||||
# define libc_hidden_data_def(name) hidden_data_def (name)
|
||||
# define libc_hidden_data_weak(name) hidden_data_weak (name)
|
||||
Index: libc/nis/Makefile
|
||||
===================================================================
|
||||
--- libc.orig/nis/Makefile 2011-09-09 10:46:34.000000000 -0700
|
||||
+++ libc/nis/Makefile 2011-09-09 10:58:21.196279725 -0700
|
||||
@@ -25,9 +25,9 @@
|
||||
|
||||
aux := nis_hash
|
||||
|
||||
+headers := $(wildcard rpcsvc/*.[hx])
|
||||
distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \
|
||||
- nisplus-parser.h nis_xdr.h nss \
|
||||
- $(wildcard rpcsvc/*.[hx])
|
||||
+ nisplus-parser.h nis_xdr.h nss
|
||||
|
||||
# These are the databases available for the nis (and perhaps later nisplus)
|
||||
# service. This must be a superset of the services in nss.
|
||||
Index: libc/sunrpc/Makefile
|
||||
===================================================================
|
||||
--- libc.orig/sunrpc/Makefile 2011-09-09 10:46:30.000000000 -0700
|
||||
+++ libc/sunrpc/Makefile 2011-09-09 10:59:10.726352375 -0700
|
||||
@@ -55,7 +55,7 @@
|
||||
des_crypt.h)
|
||||
headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
|
||||
$(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
|
||||
-headers = rpc/netdb.h
|
||||
+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc)
|
||||
generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
|
||||
$(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
|
||||
generated-dirs := rpcsvc
|
||||
@@ -1,21 +0,0 @@
|
||||
In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21:
|
||||
../nptl/sysdeps/unix/sysv/linux/lowlevellock.c: In function '__lll_lock_wait_private':
|
||||
../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: warning: implicit declaration of function 'THREAD_GETMEM'
|
||||
../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: 'THREAD_SELF' undeclared (first use in this function)
|
||||
../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: (Each undeclared identifier is reported only once
|
||||
../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: for each function it appears in.)
|
||||
../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: 'header' undeclared (first use in this function)
|
||||
make[4]: *** [/var/tmp/portage/sys-libs/glibc-2.7-r1/work/build-default-armv4l-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os] Error 1
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
--- libc/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h.orig
|
||||
+++ libc/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
|
||||
@@ -25,6 +25,7 @@
|
||||
#include <atomic.h>
|
||||
#include <sysdep.h>
|
||||
#include <kernel-features.h>
|
||||
+#include <tls.h>
|
||||
|
||||
#define FUTEX_WAIT 0
|
||||
#define FUTEX_WAKE 1
|
||||
@@ -1,38 +0,0 @@
|
||||
Upstream-Status: backport
|
||||
|
||||
Imported patch from: http://www.eglibc.org/archives/patches/msg01124.html
|
||||
|
||||
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
|
||||
2012/05/09
|
||||
|
||||
Index: libc/posix/xregex.c
|
||||
===================================================================
|
||||
--- libc.orig/posix/xregex.c
|
||||
+++ libc/posix/xregex.c
|
||||
@@ -2943,7 +2943,7 @@ PREFIX(regex_compile) (const char *ARG_P
|
||||
_NL_CURRENT (LC_COLLATE,
|
||||
_NL_COLLATE_INDIRECTWC);
|
||||
|
||||
- idx = findidx ((const wint_t**)&cp);
|
||||
+ idx = findidx ((const wint_t**)&cp, -1);
|
||||
if (idx == 0 || cp < (wint_t*) str + c1)
|
||||
/* This is no valid character. */
|
||||
FREE_STACK_RETURN (REG_ECOLLATE);
|
||||
@@ -3392,7 +3392,7 @@ PREFIX(regex_compile) (const char *ARG_P
|
||||
indirect = (const int32_t *)
|
||||
_NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTMB);
|
||||
|
||||
- idx = findidx (&cp);
|
||||
+ idx = findidx (&cp, -1);
|
||||
if (idx == 0 || cp < str + c1)
|
||||
/* This is no valid character. */
|
||||
FREE_STACK_RETURN (REG_ECOLLATE);
|
||||
@@ -6363,7 +6363,7 @@ byte_re_match_2_internal (struct re_patt
|
||||
}
|
||||
str_buf[i] = TRANSLATE(*(d+i));
|
||||
str_buf[i+1] = '\0'; /* sentinel */
|
||||
- idx2 = findidx ((const wint_t**)&cp);
|
||||
+ idx2 = findidx ((const wint_t**)&cp, -1);
|
||||
}
|
||||
|
||||
/* Update d, however d will be incremented at
|
||||
@@ -1,11 +0,0 @@
|
||||
#!/usr/bin/make
|
||||
|
||||
include $(IN)
|
||||
|
||||
all:
|
||||
rm -f $(OUT)
|
||||
touch $(OUT)
|
||||
for locale in $(SUPPORTED-LOCALES); do \
|
||||
[ $$locale = true ] && continue; \
|
||||
echo $$locale | sed 's,/, ,' >> $(OUT); \
|
||||
done
|
||||
@@ -1,133 +0,0 @@
|
||||
Without this patch programs using alsa-lib crash (alsamixer for example).
|
||||
Removed Copyright reverts
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9
|
||||
http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
|
||||
|
||||
many distributions are using this already
|
||||
http://chakra-project.org/ccr/packages/glibc/glibc/PKGBUILD
|
||||
http://mailman.archlinux.org/pipermail/arch-commits/2011-June/137142.html
|
||||
http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/glibc/current/SOURCES/glibc-2.14-libdl-crash.patch?view=markup&pathrev=691343
|
||||
http://repos.archlinuxppc.org/wsvn/filedetails.php?repname=packages&path=%2Fglibc%2Ftrunk%2Fglibc-2.14-libdl-crash.patch
|
||||
|
||||
Index: libc/elf/dl-close.c
|
||||
===================================================================
|
||||
--- libc.orig/elf/dl-close.c 2011-12-05 20:16:38.000000000 -0800
|
||||
+++ libc/elf/dl-close.c 2011-12-05 20:17:15.863326893 -0800
|
||||
@@ -119,17 +119,8 @@
|
||||
if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
|
||||
|| dl_close_state != not_pending)
|
||||
{
|
||||
- if (map->l_direct_opencount == 0)
|
||||
- {
|
||||
- if (map->l_type == lt_loaded)
|
||||
- dl_close_state = rerun;
|
||||
- else if (map->l_type == lt_library)
|
||||
- {
|
||||
- struct link_map **oldp = map->l_initfini;
|
||||
- map->l_initfini = map->l_orig_initfini;
|
||||
- _dl_scope_free (oldp);
|
||||
- }
|
||||
- }
|
||||
+ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded)
|
||||
+ dl_close_state = rerun;
|
||||
|
||||
/* There are still references to this object. Do nothing more. */
|
||||
if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_FILES, 0))
|
||||
Index: libc/elf/dl-deps.c
|
||||
===================================================================
|
||||
--- libc.orig/elf/dl-deps.c 2011-12-05 20:16:38.000000000 -0800
|
||||
+++ libc/elf/dl-deps.c 2011-12-05 20:19:33.179326877 -0800
|
||||
@@ -478,6 +478,7 @@
|
||||
nneeded * sizeof needed[0]);
|
||||
atomic_write_barrier ();
|
||||
l->l_initfini = l_initfini;
|
||||
+ l->l_free_initfini = 1;
|
||||
}
|
||||
|
||||
/* If we have no auxiliary objects just go on to the next map. */
|
||||
@@ -678,6 +679,7 @@
|
||||
l_initfini[nlist] = NULL;
|
||||
atomic_write_barrier ();
|
||||
map->l_initfini = l_initfini;
|
||||
+ map->l_free_initfini = 1;
|
||||
if (l_reldeps != NULL)
|
||||
{
|
||||
atomic_write_barrier ();
|
||||
@@ -686,7 +688,7 @@
|
||||
_dl_scope_free (old_l_reldeps);
|
||||
}
|
||||
if (old_l_initfini != NULL)
|
||||
- map->l_orig_initfini = old_l_initfini;
|
||||
+ _dl_scope_free (old_l_initfini);
|
||||
|
||||
if (errno_reason)
|
||||
_dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,
|
||||
Index: libc/elf/dl-libc.c
|
||||
===================================================================
|
||||
--- libc.orig/elf/dl-libc.c 2011-10-22 09:34:03.000000000 -0700
|
||||
+++ libc/elf/dl-libc.c 2011-12-05 20:17:15.863326893 -0800
|
||||
@@ -265,13 +265,13 @@
|
||||
|
||||
for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
|
||||
{
|
||||
- /* Remove all additional names added to the objects. */
|
||||
for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
|
||||
{
|
||||
struct libname_list *lnp = l->l_libname->next;
|
||||
|
||||
l->l_libname->next = NULL;
|
||||
|
||||
+ /* Remove all additional names added to the objects. */
|
||||
while (lnp != NULL)
|
||||
{
|
||||
struct libname_list *old = lnp;
|
||||
@@ -279,6 +279,10 @@
|
||||
if (! old->dont_free)
|
||||
free (old);
|
||||
}
|
||||
+
|
||||
+ /* Free the initfini dependency list. */
|
||||
+ if (l->l_free_initfini)
|
||||
+ free (l->l_initfini);
|
||||
}
|
||||
|
||||
if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
|
||||
Index: libc/elf/rtld.c
|
||||
===================================================================
|
||||
--- libc.orig/elf/rtld.c 2011-10-22 09:34:03.000000000 -0700
|
||||
+++ libc/elf/rtld.c 2011-12-05 20:17:15.863326893 -0800
|
||||
@@ -2264,6 +2264,7 @@
|
||||
lnp->dont_free = 1;
|
||||
lnp = lnp->next;
|
||||
}
|
||||
+ l->l_free_initfini = 0;
|
||||
|
||||
if (l != &GL(dl_rtld_map))
|
||||
_dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0,
|
||||
Index: libc/include/link.h
|
||||
===================================================================
|
||||
--- libc.orig/include/link.h 2011-10-22 09:32:35.000000000 -0700
|
||||
+++ libc/include/link.h 2011-12-05 20:17:15.863326893 -0800
|
||||
@@ -192,6 +192,9 @@
|
||||
during LD_TRACE_PRELINKING=1
|
||||
contains any DT_SYMBOLIC
|
||||
libraries. */
|
||||
+ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be
|
||||
+ freed, ie. not allocated with
|
||||
+ the dummy malloc in ld.so. */
|
||||
|
||||
/* Collected information about own RPATH directories. */
|
||||
struct r_search_path_struct l_rpath_dirs;
|
||||
@@ -240,9 +243,6 @@
|
||||
|
||||
/* List of object in order of the init and fini calls. */
|
||||
struct link_map **l_initfini;
|
||||
- /* The init and fini list generated at startup, saved when the
|
||||
- object is also loaded dynamically. */
|
||||
- struct link_map **l_orig_initfini;
|
||||
|
||||
/* List of the dependencies introduced through symbol binding. */
|
||||
struct link_map_reldeps
|
||||
@@ -1,20 +0,0 @@
|
||||
This is needed since initgroups belongs to NET group
|
||||
so when NET is disabled in eglibc build then it reports
|
||||
as undefined symbol
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Upstream-Status: Pending
|
||||
|
||||
Index: libc/nss/getent.c
|
||||
===================================================================
|
||||
--- libc.orig/nss/getent.c 2012-03-09 09:41:57.099581559 -0800
|
||||
+++ libc/nss/getent.c 2012-03-09 09:42:13.095582334 -0800
|
||||
@@ -898,7 +898,7 @@
|
||||
D(group)
|
||||
D(gshadow)
|
||||
DN(hosts)
|
||||
-D(initgroups)
|
||||
+DN(initgroups)
|
||||
DN(netgroup)
|
||||
DN(networks)
|
||||
D(passwd)
|
||||
@@ -1,56 +0,0 @@
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
The default lib search path order is:
|
||||
|
||||
1) LD_LIBRARY_PATH
|
||||
2) RPATH from the binary
|
||||
3) ld.so.cache
|
||||
4) default search paths embedded in the linker
|
||||
|
||||
For nativesdk binaries which are being used alongside binaries on a host system, we
|
||||
need the search paths to firstly search the shipped nativesdk libs but then also
|
||||
cover the host system. For example we want the host system's libGL and this may be
|
||||
in a non-standard location like /usr/lib/mesa. The only place the location is know
|
||||
about is in the ld.so.cache of the host system.
|
||||
|
||||
Since nativesdk has a simple structure and doesn't need to use a cache itself, we
|
||||
repurpose the cache for use as a last resort in finding host system binaries. This
|
||||
means we need to switch the order of 3 and 4 above to make this work effectively.
|
||||
|
||||
RP 14/10/2010
|
||||
|
||||
Index: libc/elf/dl-load.c
|
||||
===================================================================
|
||||
--- libc.orig/elf/dl-load.c
|
||||
+++ libc/elf/dl-load.c
|
||||
@@ -2107,6 +2107,15 @@ _dl_map_object (struct link_map *loader,
|
||||
&loader->l_runpath_dirs, &realname, &fb, loader,
|
||||
LA_SER_RUNPATH, &found_other_class);
|
||||
|
||||
+ /* try the default path. */
|
||||
+ if (fd == -1
|
||||
+ && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL
|
||||
+ || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1))
|
||||
+ && rtld_search_dirs.dirs != (void *) -1)
|
||||
+ fd = open_path (name, namelen, mode & __RTLD_SECURE, &rtld_search_dirs,
|
||||
+ &realname, &fb, l, LA_SER_DEFAULT, &found_other_class);
|
||||
+
|
||||
+ /* Finally try ld.so.cache */
|
||||
if (fd == -1
|
||||
&& (__builtin_expect (! (mode & __RTLD_SECURE), 1)
|
||||
|| ! INTUSE(__libc_enable_secure)))
|
||||
@@ -2169,14 +2178,6 @@ _dl_map_object (struct link_map *loader,
|
||||
}
|
||||
}
|
||||
|
||||
- /* Finally, try the default path. */
|
||||
- if (fd == -1
|
||||
- && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL
|
||||
- || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1))
|
||||
- && rtld_search_dirs.dirs != (void *) -1)
|
||||
- fd = open_path (name, namelen, mode & __RTLD_SECURE, &rtld_search_dirs,
|
||||
- &realname, &fb, l, LA_SER_DEFAULT, &found_other_class);
|
||||
-
|
||||
/* Add another newline when we are tracing the library loading. */
|
||||
if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_LIBS, 0))
|
||||
_dl_debug_printf ("\n");
|
||||
@@ -1,338 +0,0 @@
|
||||
From d3b36017d43af570ca7f79e711749dd4ade76979 Mon Sep 17 00:00:00 2001
|
||||
From: Carlos O'Donell <carlos_odonell@mentor.com>
|
||||
Date: Mon, 7 May 2012 22:14:44 -0400
|
||||
Subject: [PATCH] ARM: Use /lib/ld-linux-armhf.so.3 for the hard-float ABI.
|
||||
|
||||
The hard-float ABI will now use /lib/ld-linux-armhf.so.3.
|
||||
We detect the use of the hard-float ABI and select the
|
||||
appropriate dynamic linker name. You must have a new or
|
||||
patched compiler which also uses the new dynamic loader
|
||||
name when the hard-float ABI is selected.
|
||||
---
|
||||
ChangeLog.arm | 8 ++
|
||||
sysdeps/arm/configure | 184 ++++++++++++++++++++++++++++++++++++++++++++
|
||||
sysdeps/arm/configure.in | 17 ++++
|
||||
sysdeps/arm/shlib-versions | 8 ++-
|
||||
4 files changed, 216 insertions(+), 1 deletions(-)
|
||||
mode change 100644 => 100755 sysdeps/arm/configure
|
||||
|
||||
Upstream-Status: Backport
|
||||
-Khem
|
||||
|
||||
Index: libc/ports/sysdeps/arm/configure.in
|
||||
===================================================================
|
||||
--- libc.orig/ports/sysdeps/arm/configure.in 2012-05-08 11:42:59.161128560 -0700
|
||||
+++ libc/ports/sysdeps/arm/configure.in 2012-05-08 11:43:29.373130066 -0700
|
||||
@@ -18,3 +18,20 @@
|
||||
if test $libc_cv_asm_cfi_directive_sections != yes; then
|
||||
AC_MSG_ERROR([need .cfi_sections in this configuration])
|
||||
fi
|
||||
+
|
||||
+# We check to see if the compiler and flags are
|
||||
+# selecting the hard-float ABI and if they are then
|
||||
+# we set libc_cv_arm_pcs_vfp to yes which causes
|
||||
+# HAVE_ARM_PCS_VFP to be defined in config.h and
|
||||
+# in include/libc-symbols.h and thus available to
|
||||
+# shlib-versions to select the appropriate name for
|
||||
+# the dynamic linker via %ifdef.
|
||||
+AC_CACHE_CHECK([whether the compiler is using the ARM hard-float ABI],
|
||||
+ [libc_cv_arm_pcs_vfp],
|
||||
+ [AC_EGREP_CPP(yes,[#ifdef __ARM_PCS_VFP
|
||||
+ yes
|
||||
+ #endif
|
||||
+ ], libc_cv_arm_pcs_vfp=yes, libc_cv_arm_pcs_vfp=no)])
|
||||
+if test $libc_cv_arm_pcs_vfp = yes; then
|
||||
+ AC_DEFINE(HAVE_ARM_PCS_VFP)
|
||||
+fi
|
||||
Index: libc/ports/sysdeps/arm/shlib-versions
|
||||
===================================================================
|
||||
--- libc.orig/ports/sysdeps/arm/shlib-versions 2012-05-08 11:42:59.145128546 -0700
|
||||
+++ libc/ports/sysdeps/arm/shlib-versions 2012-05-08 11:43:29.409130022 -0700
|
||||
@@ -1,4 +1,10 @@
|
||||
arm.*-.*-linux-gnueabi.* DEFAULT GLIBC_2.4
|
||||
|
||||
-arm.*-.*-linux-gnueabi.* ld=ld-linux.so.3
|
||||
+%ifdef HAVE_ARM_PCS_VFP
|
||||
+# The EABI-derived hard-float ABI uses a new dynamic linker.
|
||||
+arm.*-.*-linux-gnueabi.* ld=ld-linux-armhf.so.3
|
||||
+%else
|
||||
+# The EABI-derived soft-float ABI continues to use ld-linux.so.3.
|
||||
+arm.*-.*-linux-gnueabi.* ld=ld-linux.so.3
|
||||
+%endif
|
||||
arm.*-.*-linux.* ld=ld-linux.so.2
|
||||
Index: libc/ports/sysdeps/arm/configure
|
||||
===================================================================
|
||||
--- libc.orig/ports/sysdeps/arm/configure 2012-05-08 11:43:46.437130836 -0700
|
||||
+++ libc/ports/sysdeps/arm/configure 2012-05-08 11:49:10.393145653 -0700
|
||||
@@ -1,3 +1,100 @@
|
||||
+# as_fn_set_status STATUS
|
||||
+# -----------------------
|
||||
+# Set $? to STATUS, without forking.
|
||||
+as_fn_set_status ()
|
||||
+{
|
||||
+ return $1
|
||||
+} # as_fn_set_status
|
||||
+
|
||||
+# as_fn_exit STATUS
|
||||
+# -----------------
|
||||
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
|
||||
+as_fn_exit ()
|
||||
+{
|
||||
+ set +e
|
||||
+ as_fn_set_status $1
|
||||
+ exit $1
|
||||
+} # as_fn_exit
|
||||
+# as_fn_arith ARG...
|
||||
+# ------------------
|
||||
+# Perform arithmetic evaluation on the ARGs, and store the result in the
|
||||
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
|
||||
+# must be portable across $(()) and expr.
|
||||
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
|
||||
+ eval 'as_fn_arith ()
|
||||
+ {
|
||||
+ as_val=$(( $* ))
|
||||
+ }'
|
||||
+else
|
||||
+ as_fn_arith ()
|
||||
+ {
|
||||
+ as_val=`expr "$@" || test $? -eq 1`
|
||||
+ }
|
||||
+fi # as_fn_arith
|
||||
+
|
||||
+if expr a : '\(a\)' >/dev/null 2>&1 &&
|
||||
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
||||
+ as_expr=expr
|
||||
+else
|
||||
+ as_expr=false
|
||||
+fi
|
||||
+
|
||||
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
|
||||
+ as_basename=basename
|
||||
+else
|
||||
+ as_basename=false
|
||||
+fi
|
||||
+
|
||||
+as_me=`$as_basename -- "$0" ||
|
||||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
||||
+ X"$0" : 'X\(//\)$' \| \
|
||||
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
||||
+$as_echo X/"$0" |
|
||||
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
|
||||
+ s//\1/
|
||||
+ q
|
||||
+ }
|
||||
+ /^X\/\(\/\/\)$/{
|
||||
+ s//\1/
|
||||
+ q
|
||||
+ }
|
||||
+ /^X\/\(\/\).*/{
|
||||
+ s//\1/
|
||||
+ q
|
||||
+ }
|
||||
+ s/.*/./; q'`
|
||||
+
|
||||
+
|
||||
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
|
||||
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
|
||||
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
|
||||
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
|
||||
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
|
||||
+ sed -n '
|
||||
+ p
|
||||
+ /[$]LINENO/=
|
||||
+ ' <$as_myself |
|
||||
+ sed '
|
||||
+ s/[$]LINENO.*/&-/
|
||||
+ t lineno
|
||||
+ b
|
||||
+ :lineno
|
||||
+ N
|
||||
+ :loop
|
||||
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
|
||||
+ t loop
|
||||
+ s/-\n.*//
|
||||
+ ' >$as_me.lineno &&
|
||||
+ chmod +x "$as_me.lineno" ||
|
||||
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
|
||||
+
|
||||
+ # Don't try to exec as it changes $[0], causing all sort of problems
|
||||
+ # (the dirname of $[0] is not the place where we might find the
|
||||
+ # original and so on. Autoconf is especially sensitive to this).
|
||||
+ . "./$as_me.lineno"
|
||||
+ # Exit status is that of the last command.
|
||||
+ exit
|
||||
+}
|
||||
# This file is generated from configure.in by Autoconf. DO NOT EDIT!
|
||||
# Local configure fragment for sysdeps/arm.
|
||||
|
||||
@@ -31,3 +128,170 @@
|
||||
$as_echo "$as_me: error: need .cfi_sections in this configuration" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
+
|
||||
+# We check to see if the compiler and flags are
|
||||
+# selecting the hard-float ABI and if they are then
|
||||
+# we set libc_cv_arm_pcs_vfp to yes which causes
|
||||
+# HAVE_ARM_PCS_VFP to be defined in config.h and
|
||||
+# in include/libc-symbols.h and thus available to
|
||||
+# shlib-versions to select the appropriate name for
|
||||
+# the dynamic linker via %ifdef.
|
||||
+
|
||||
+
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
|
||||
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
|
||||
+if ${ac_cv_path_GREP+:} false; then :
|
||||
+ $as_echo_n "(cached) " >&6
|
||||
+else
|
||||
+ if test -z "$GREP"; then
|
||||
+ ac_path_GREP_found=false
|
||||
+ # Loop through the user's path and test for each of PROGNAME-LIST
|
||||
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
|
||||
+do
|
||||
+ IFS=$as_save_IFS
|
||||
+ test -z "$as_dir" && as_dir=.
|
||||
+ for ac_prog in grep ggrep; do
|
||||
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
|
||||
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
|
||||
+# Check for GNU ac_path_GREP and select it if it is found.
|
||||
+ # Check for GNU $ac_path_GREP
|
||||
+case `"$ac_path_GREP" --version 2>&1` in
|
||||
+*GNU*)
|
||||
+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
|
||||
+*)
|
||||
+ ac_count=0
|
||||
+ $as_echo_n 0123456789 >"conftest.in"
|
||||
+ while :
|
||||
+ do
|
||||
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
|
||||
+ mv "conftest.tmp" "conftest.in"
|
||||
+ cp "conftest.in" "conftest.nl"
|
||||
+ $as_echo 'GREP' >> "conftest.nl"
|
||||
+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
||||
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
||||
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
|
||||
+ if test $ac_count -gt ${ac_path_GREP_max-0}; then
|
||||
+ # Best one so far, save it but keep looking for a better one
|
||||
+ ac_cv_path_GREP="$ac_path_GREP"
|
||||
+ ac_path_GREP_max=$ac_count
|
||||
+ fi
|
||||
+ # 10*(2^10) chars as input seems more than enough
|
||||
+ test $ac_count -gt 10 && break
|
||||
+ done
|
||||
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
||||
+esac
|
||||
+
|
||||
+ $ac_path_GREP_found && break 3
|
||||
+ done
|
||||
+ done
|
||||
+ done
|
||||
+IFS=$as_save_IFS
|
||||
+ if test -z "$ac_cv_path_GREP"; then
|
||||
+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
||||
+ fi
|
||||
+else
|
||||
+ ac_cv_path_GREP=$GREP
|
||||
+fi
|
||||
+
|
||||
+fi
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
|
||||
+$as_echo "$ac_cv_path_GREP" >&6; }
|
||||
+ GREP="$ac_cv_path_GREP"
|
||||
+
|
||||
+
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
|
||||
+$as_echo_n "checking for egrep... " >&6; }
|
||||
+if ${ac_cv_path_EGREP+:} false; then :
|
||||
+ $as_echo_n "(cached) " >&6
|
||||
+else
|
||||
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
|
||||
+ then ac_cv_path_EGREP="$GREP -E"
|
||||
+ else
|
||||
+ if test -z "$EGREP"; then
|
||||
+ ac_path_EGREP_found=false
|
||||
+ # Loop through the user's path and test for each of PROGNAME-LIST
|
||||
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
|
||||
+do
|
||||
+ IFS=$as_save_IFS
|
||||
+ test -z "$as_dir" && as_dir=.
|
||||
+ for ac_prog in egrep; do
|
||||
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
|
||||
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
|
||||
+# Check for GNU ac_path_EGREP and select it if it is found.
|
||||
+ # Check for GNU $ac_path_EGREP
|
||||
+case `"$ac_path_EGREP" --version 2>&1` in
|
||||
+*GNU*)
|
||||
+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
|
||||
+*)
|
||||
+ ac_count=0
|
||||
+ $as_echo_n 0123456789 >"conftest.in"
|
||||
+ while :
|
||||
+ do
|
||||
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
|
||||
+ mv "conftest.tmp" "conftest.in"
|
||||
+ cp "conftest.in" "conftest.nl"
|
||||
+ $as_echo 'EGREP' >> "conftest.nl"
|
||||
+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
||||
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
||||
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
|
||||
+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
|
||||
+ # Best one so far, save it but keep looking for a better one
|
||||
+ ac_cv_path_EGREP="$ac_path_EGREP"
|
||||
+ ac_path_EGREP_max=$ac_count
|
||||
+ fi
|
||||
+ # 10*(2^10) chars as input seems more than enough
|
||||
+ test $ac_count -gt 10 && break
|
||||
+ done
|
||||
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
||||
+esac
|
||||
+
|
||||
+ $ac_path_EGREP_found && break 3
|
||||
+ done
|
||||
+ done
|
||||
+ done
|
||||
+IFS=$as_save_IFS
|
||||
+ if test -z "$ac_cv_path_EGREP"; then
|
||||
+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
||||
+ fi
|
||||
+else
|
||||
+ ac_cv_path_EGREP=$EGREP
|
||||
+fi
|
||||
+
|
||||
+ fi
|
||||
+fi
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
|
||||
+$as_echo "$ac_cv_path_EGREP" >&6; }
|
||||
+ EGREP="$ac_cv_path_EGREP"
|
||||
+
|
||||
+
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler is using the ARM hard-float ABI" >&5
|
||||
+$as_echo_n "checking whether the compiler is using the ARM hard-float ABI... " >&6; }
|
||||
+if ${libc_cv_arm_pcs_vfp+:} false; then :
|
||||
+ $as_echo_n "(cached) " >&6
|
||||
+else
|
||||
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
+/* end confdefs.h. */
|
||||
+#ifdef __ARM_PCS_VFP
|
||||
+ yes
|
||||
+ #endif
|
||||
+
|
||||
+_ACEOF
|
||||
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||
+ $EGREP "yes" >/dev/null 2>&1; then :
|
||||
+ libc_cv_arm_pcs_vfp=yes
|
||||
+else
|
||||
+ libc_cv_arm_pcs_vfp=no
|
||||
+fi
|
||||
+rm -f conftest*
|
||||
+
|
||||
+fi
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_arm_pcs_vfp" >&5
|
||||
+$as_echo "$libc_cv_arm_pcs_vfp" >&6; }
|
||||
+if test $libc_cv_arm_pcs_vfp = yes; then
|
||||
+ $as_echo "#define HAVE_ARM_PCS_VFP 1" >>confdefs.h
|
||||
+
|
||||
+fi
|
||||
@@ -1,26 +0,0 @@
|
||||
|
||||
On mips target, binutils currently sets DT_MIPS_RLD_MAP to 0 in dynamic
|
||||
section if a --version-script sets _RLD_MAP to local. This is apparently
|
||||
a binutils bug, but libc shouldn't segfault in this case.
|
||||
|
||||
see also: http://sourceware.org/bugilla/show_bug.cgi?id=11615
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
9/19/2010 - added by Qing He <qing.he@intel.com>
|
||||
|
||||
|
||||
---
|
||||
diff -ru glibc-2.10.1.orig/ports/sysdeps/mips/dl-machine.h glibc-2.10.1/ports/sysdeps/mips/dl-machine.h
|
||||
--- glibc-2.10.1.orig/ports/sysdeps/mips/dl-machine.h 2009-05-16 16:36:20.000000000 +0800
|
||||
+++ glibc-2.10.1/ports/sysdeps/mips/dl-machine.h 2010-09-19 09:11:53.000000000 +0800
|
||||
@@ -70,7 +70,8 @@
|
||||
/* If there is a DT_MIPS_RLD_MAP entry in the dynamic section, fill it in
|
||||
with the run-time address of the r_debug structure */
|
||||
#define ELF_MACHINE_DEBUG_SETUP(l,r) \
|
||||
-do { if ((l)->l_info[DT_MIPS (RLD_MAP)]) \
|
||||
+do { if ((l)->l_info[DT_MIPS (RLD_MAP)] && \
|
||||
+ (l)->l_info[DT_MIPS (RLD_MAP)]->d_un.d_ptr) \
|
||||
*(ElfW(Addr) *)((l)->l_info[DT_MIPS (RLD_MAP)]->d_un.d_ptr) = \
|
||||
(ElfW(Addr)) (r); \
|
||||
} while (0)
|
||||
@@ -1,17 +0,0 @@
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Replace the OECORE_KNOWN_INTERPRETER_NAMES with the value of
|
||||
variable EGLIBC_KNOWN_INTERPRETER_NAMES.
|
||||
|
||||
Lianhao Lu, 08/01/2011
|
||||
|
||||
--- libc/elf/readlib.c.orig 2011-08-12 17:05:51.864470837 +0800
|
||||
+++ libc/elf/readlib.c 2011-08-12 17:06:39.346942074 +0800
|
||||
@@ -52,6 +52,7 @@
|
||||
#ifdef SYSDEP_KNOWN_INTERPRETER_NAMES
|
||||
SYSDEP_KNOWN_INTERPRETER_NAMES
|
||||
#endif
|
||||
+ OECORE_KNOWN_INTERPRETER_NAMES
|
||||
};
|
||||
|
||||
static struct known_names known_libs[] =
|
||||
@@ -1,538 +0,0 @@
|
||||
Upstream-Status: Pending
|
||||
|
||||
2011-03-22 Joseph Myers <joseph@codesourcery.com>
|
||||
|
||||
Merge from SG++ 2.11:
|
||||
|
||||
2010-10-05 Nathan Froyd <froydnj@codesourcery.com>
|
||||
|
||||
Issue #9382
|
||||
|
||||
* sysdeps/powerpc/powerpc32/603e/: New directory.
|
||||
* sysdeps/unix/sysv/linux/powerpc/powerpc32/e500mc/: New directory.
|
||||
* sysdeps/unix/sysv/linux/powerpc/powerpc32/603e/: New directory.
|
||||
* sysdeps/unix/sysv/linux/powerpc/powerpc32/7400/: New directory.
|
||||
* sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c: Update.
|
||||
* sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c: Update.
|
||||
* sysdeps/powerpc/powerpc64/e5500/fpu/Implies: New file.
|
||||
|
||||
Index: libc/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ libc/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c
|
||||
@@ -0,0 +1,134 @@
|
||||
+/* Double-precision floating point square root.
|
||||
+ Copyright (C) 2010 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 <math.h>
|
||||
+#include <math_private.h>
|
||||
+#include <fenv_libc.h>
|
||||
+#include <inttypes.h>
|
||||
+
|
||||
+#include <sysdep.h>
|
||||
+#include <ldsodefs.h>
|
||||
+
|
||||
+static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
|
||||
+static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
|
||||
+static const float two108 = 3.245185536584267269e+32;
|
||||
+static const float twom54 = 5.551115123125782702e-17;
|
||||
+static const float half = 0.5;
|
||||
+
|
||||
+/* The method is based on the descriptions in:
|
||||
+
|
||||
+ _The Handbook of Floating-Pointer Arithmetic_ by Muller et al., chapter 5;
|
||||
+ _IA-64 and Elementary Functions: Speed and Precision_ by Markstein, chapter 9
|
||||
+
|
||||
+ We find the actual square root and half of its reciprocal
|
||||
+ simultaneously. */
|
||||
+
|
||||
+#ifdef __STDC__
|
||||
+double
|
||||
+__ieee754_sqrt (double b)
|
||||
+#else
|
||||
+double
|
||||
+__ieee754_sqrt (b)
|
||||
+ double b;
|
||||
+#endif
|
||||
+{
|
||||
+ if (__builtin_expect (b > 0, 1))
|
||||
+ {
|
||||
+ double y, g, h, d, r;
|
||||
+ ieee_double_shape_type u;
|
||||
+
|
||||
+ if (__builtin_expect (b != a_inf.value, 1))
|
||||
+ {
|
||||
+ fenv_t fe;
|
||||
+
|
||||
+ fe = fegetenv_register ();
|
||||
+
|
||||
+ u.value = b;
|
||||
+
|
||||
+ relax_fenv_state ();
|
||||
+
|
||||
+ __asm__ ("frsqrte %[estimate], %[x]\n"
|
||||
+ : [estimate] "=f" (y) : [x] "f" (b));
|
||||
+
|
||||
+ /* Following Muller et al, page 168, equation 5.20.
|
||||
+
|
||||
+ h goes to 1/(2*sqrt(b))
|
||||
+ g goes to sqrt(b).
|
||||
+
|
||||
+ We need three iterations to get within 1ulp. */
|
||||
+
|
||||
+ /* Indicate that these can be performed prior to the branch. GCC
|
||||
+ insists on sinking them below the branch, however; it seems like
|
||||
+ they'd be better before the branch so that we can cover any latency
|
||||
+ from storing the argument and loading its high word. Oh well. */
|
||||
+
|
||||
+ g = b * y;
|
||||
+ h = 0.5 * y;
|
||||
+
|
||||
+ /* Handle small numbers by scaling. */
|
||||
+ if (__builtin_expect ((u.parts.msw & 0x7ff00000) <= 0x02000000, 0))
|
||||
+ return __ieee754_sqrt (b * two108) * twom54;
|
||||
+
|
||||
+#define FMADD(a_, c_, b_) \
|
||||
+ ({ double __r; \
|
||||
+ __asm__ ("fmadd %[r], %[a], %[c], %[b]\n" \
|
||||
+ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
|
||||
+ __r;})
|
||||
+#define FNMSUB(a_, c_, b_) \
|
||||
+ ({ double __r; \
|
||||
+ __asm__ ("fnmsub %[r], %[a], %[c], %[b]\n" \
|
||||
+ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
|
||||
+ __r;})
|
||||
+
|
||||
+ r = FNMSUB (g, h, half);
|
||||
+ g = FMADD (g, r, g);
|
||||
+ h = FMADD (h, r, h);
|
||||
+
|
||||
+ r = FNMSUB (g, h, half);
|
||||
+ g = FMADD (g, r, g);
|
||||
+ h = FMADD (h, r, h);
|
||||
+
|
||||
+ r = FNMSUB (g, h, half);
|
||||
+ g = FMADD (g, r, g);
|
||||
+ h = FMADD (h, r, h);
|
||||
+
|
||||
+ /* g is now +/- 1ulp, or exactly equal to, the square root of b. */
|
||||
+
|
||||
+ /* Final refinement. */
|
||||
+ d = FNMSUB (g, g, b);
|
||||
+
|
||||
+ fesetenv_register (fe);
|
||||
+ return FMADD (d, h, g);
|
||||
+ }
|
||||
+ }
|
||||
+ else if (b < 0)
|
||||
+ {
|
||||
+ /* For some reason, some PowerPC32 processors don't implement
|
||||
+ FE_INVALID_SQRT. */
|
||||
+#ifdef FE_INVALID_SQRT
|
||||
+ feraiseexcept (FE_INVALID_SQRT);
|
||||
+
|
||||
+ fenv_union_t u = { .fenv = fegetenv_register () };
|
||||
+ if ((u.l[1] & FE_INVALID) == 0)
|
||||
+#endif
|
||||
+ feraiseexcept (FE_INVALID);
|
||||
+ b = a_nan.value;
|
||||
+ }
|
||||
+ return f_wash (b);
|
||||
+}
|
||||
Index: libc/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ libc/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c
|
||||
@@ -0,0 +1,101 @@
|
||||
+/* Single-precision floating point square root.
|
||||
+ Copyright (C) 2010 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 <math.h>
|
||||
+#include <math_private.h>
|
||||
+#include <fenv_libc.h>
|
||||
+#include <inttypes.h>
|
||||
+
|
||||
+#include <sysdep.h>
|
||||
+#include <ldsodefs.h>
|
||||
+
|
||||
+static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
|
||||
+static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
|
||||
+static const float threehalf = 1.5;
|
||||
+
|
||||
+/* The method is based on the descriptions in:
|
||||
+
|
||||
+ _The Handbook of Floating-Pointer Arithmetic_ by Muller et al., chapter 5;
|
||||
+ _IA-64 and Elementary Functions: Speed and Precision_ by Markstein, chapter 9
|
||||
+
|
||||
+ We find the reciprocal square root and use that to compute the actual
|
||||
+ square root. */
|
||||
+
|
||||
+#ifdef __STDC__
|
||||
+float
|
||||
+__ieee754_sqrtf (float b)
|
||||
+#else
|
||||
+float
|
||||
+__ieee754_sqrtf (b)
|
||||
+ float b;
|
||||
+#endif
|
||||
+{
|
||||
+ if (__builtin_expect (b > 0, 1))
|
||||
+ {
|
||||
+#define FMSUB(a_, c_, b_) \
|
||||
+ ({ double __r; \
|
||||
+ __asm__ ("fmsub %[r], %[a], %[c], %[b]\n" \
|
||||
+ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
|
||||
+ __r;})
|
||||
+#define FNMSUB(a_, c_, b_) \
|
||||
+ ({ double __r; \
|
||||
+ __asm__ ("fnmsub %[r], %[a], %[c], %[b]\n" \
|
||||
+ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
|
||||
+ __r;})
|
||||
+
|
||||
+ if (__builtin_expect (b != a_inf.value, 1))
|
||||
+ {
|
||||
+ double y, x;
|
||||
+ fenv_t fe;
|
||||
+
|
||||
+ fe = fegetenv_register ();
|
||||
+
|
||||
+ relax_fenv_state ();
|
||||
+
|
||||
+ /* Compute y = 1.5 * b - b. Uses fewer constants than y = 0.5 * b. */
|
||||
+ y = FMSUB (threehalf, b, b);
|
||||
+
|
||||
+ /* Initial estimate. */
|
||||
+ __asm__ ("frsqrte %[x], %[b]\n" : [x] "=f" (x) : [b] "f" (b));
|
||||
+
|
||||
+ /* Iterate. x_{n+1} = x_n * (1.5 - y * (x_n * x_n)). */
|
||||
+ x = x * FNMSUB (y, x * x, threehalf);
|
||||
+ x = x * FNMSUB (y, x * x, threehalf);
|
||||
+ x = x * FNMSUB (y, x * x, threehalf);
|
||||
+
|
||||
+ /* All done. */
|
||||
+ fesetenv_register (fe);
|
||||
+ return x * b;
|
||||
+ }
|
||||
+ }
|
||||
+ else if (b < 0)
|
||||
+ {
|
||||
+ /* For some reason, some PowerPC32 processors don't implement
|
||||
+ FE_INVALID_SQRT. */
|
||||
+#ifdef FE_INVALID_SQRT
|
||||
+ feraiseexcept (FE_INVALID_SQRT);
|
||||
+
|
||||
+ fenv_union_t u = { .fenv = fegetenv_register () };
|
||||
+ if ((u.l[1] & FE_INVALID) == 0)
|
||||
+#endif
|
||||
+ feraiseexcept (FE_INVALID);
|
||||
+ b = a_nan.value;
|
||||
+ }
|
||||
+ return f_washf (b);
|
||||
+}
|
||||
Index: libc/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ libc/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c
|
||||
@@ -0,0 +1,134 @@
|
||||
+/* Double-precision floating point square root.
|
||||
+ Copyright (C) 2010 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 <math.h>
|
||||
+#include <math_private.h>
|
||||
+#include <fenv_libc.h>
|
||||
+#include <inttypes.h>
|
||||
+
|
||||
+#include <sysdep.h>
|
||||
+#include <ldsodefs.h>
|
||||
+
|
||||
+static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
|
||||
+static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
|
||||
+static const float two108 = 3.245185536584267269e+32;
|
||||
+static const float twom54 = 5.551115123125782702e-17;
|
||||
+static const float half = 0.5;
|
||||
+
|
||||
+/* The method is based on the descriptions in:
|
||||
+
|
||||
+ _The Handbook of Floating-Pointer Arithmetic_ by Muller et al., chapter 5;
|
||||
+ _IA-64 and Elementary Functions: Speed and Precision_ by Markstein, chapter 9
|
||||
+
|
||||
+ We find the actual square root and half of its reciprocal
|
||||
+ simultaneously. */
|
||||
+
|
||||
+#ifdef __STDC__
|
||||
+double
|
||||
+__ieee754_sqrt (double b)
|
||||
+#else
|
||||
+double
|
||||
+__ieee754_sqrt (b)
|
||||
+ double b;
|
||||
+#endif
|
||||
+{
|
||||
+ if (__builtin_expect (b > 0, 1))
|
||||
+ {
|
||||
+ double y, g, h, d, r;
|
||||
+ ieee_double_shape_type u;
|
||||
+
|
||||
+ if (__builtin_expect (b != a_inf.value, 1))
|
||||
+ {
|
||||
+ fenv_t fe;
|
||||
+
|
||||
+ fe = fegetenv_register ();
|
||||
+
|
||||
+ u.value = b;
|
||||
+
|
||||
+ relax_fenv_state ();
|
||||
+
|
||||
+ __asm__ ("frsqrte %[estimate], %[x]\n"
|
||||
+ : [estimate] "=f" (y) : [x] "f" (b));
|
||||
+
|
||||
+ /* Following Muller et al, page 168, equation 5.20.
|
||||
+
|
||||
+ h goes to 1/(2*sqrt(b))
|
||||
+ g goes to sqrt(b).
|
||||
+
|
||||
+ We need three iterations to get within 1ulp. */
|
||||
+
|
||||
+ /* Indicate that these can be performed prior to the branch. GCC
|
||||
+ insists on sinking them below the branch, however; it seems like
|
||||
+ they'd be better before the branch so that we can cover any latency
|
||||
+ from storing the argument and loading its high word. Oh well. */
|
||||
+
|
||||
+ g = b * y;
|
||||
+ h = 0.5 * y;
|
||||
+
|
||||
+ /* Handle small numbers by scaling. */
|
||||
+ if (__builtin_expect ((u.parts.msw & 0x7ff00000) <= 0x02000000, 0))
|
||||
+ return __ieee754_sqrt (b * two108) * twom54;
|
||||
+
|
||||
+#define FMADD(a_, c_, b_) \
|
||||
+ ({ double __r; \
|
||||
+ __asm__ ("fmadd %[r], %[a], %[c], %[b]\n" \
|
||||
+ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
|
||||
+ __r;})
|
||||
+#define FNMSUB(a_, c_, b_) \
|
||||
+ ({ double __r; \
|
||||
+ __asm__ ("fnmsub %[r], %[a], %[c], %[b]\n" \
|
||||
+ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
|
||||
+ __r;})
|
||||
+
|
||||
+ r = FNMSUB (g, h, half);
|
||||
+ g = FMADD (g, r, g);
|
||||
+ h = FMADD (h, r, h);
|
||||
+
|
||||
+ r = FNMSUB (g, h, half);
|
||||
+ g = FMADD (g, r, g);
|
||||
+ h = FMADD (h, r, h);
|
||||
+
|
||||
+ r = FNMSUB (g, h, half);
|
||||
+ g = FMADD (g, r, g);
|
||||
+ h = FMADD (h, r, h);
|
||||
+
|
||||
+ /* g is now +/- 1ulp, or exactly equal to, the square root of b. */
|
||||
+
|
||||
+ /* Final refinement. */
|
||||
+ d = FNMSUB (g, g, b);
|
||||
+
|
||||
+ fesetenv_register (fe);
|
||||
+ return FMADD (d, h, g);
|
||||
+ }
|
||||
+ }
|
||||
+ else if (b < 0)
|
||||
+ {
|
||||
+ /* For some reason, some PowerPC32 processors don't implement
|
||||
+ FE_INVALID_SQRT. */
|
||||
+#ifdef FE_INVALID_SQRT
|
||||
+ feraiseexcept (FE_INVALID_SQRT);
|
||||
+
|
||||
+ fenv_union_t u = { .fenv = fegetenv_register () };
|
||||
+ if ((u.l[1] & FE_INVALID) == 0)
|
||||
+#endif
|
||||
+ feraiseexcept (FE_INVALID);
|
||||
+ b = a_nan.value;
|
||||
+ }
|
||||
+ return f_wash (b);
|
||||
+}
|
||||
Index: libc/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ libc/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c
|
||||
@@ -0,0 +1,101 @@
|
||||
+/* Single-precision floating point square root.
|
||||
+ Copyright (C) 2010 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 <math.h>
|
||||
+#include <math_private.h>
|
||||
+#include <fenv_libc.h>
|
||||
+#include <inttypes.h>
|
||||
+
|
||||
+#include <sysdep.h>
|
||||
+#include <ldsodefs.h>
|
||||
+
|
||||
+static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
|
||||
+static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
|
||||
+static const float threehalf = 1.5;
|
||||
+
|
||||
+/* The method is based on the descriptions in:
|
||||
+
|
||||
+ _The Handbook of Floating-Pointer Arithmetic_ by Muller et al., chapter 5;
|
||||
+ _IA-64 and Elementary Functions: Speed and Precision_ by Markstein, chapter 9
|
||||
+
|
||||
+ We find the reciprocal square root and use that to compute the actual
|
||||
+ square root. */
|
||||
+
|
||||
+#ifdef __STDC__
|
||||
+float
|
||||
+__ieee754_sqrtf (float b)
|
||||
+#else
|
||||
+float
|
||||
+__ieee754_sqrtf (b)
|
||||
+ float b;
|
||||
+#endif
|
||||
+{
|
||||
+ if (__builtin_expect (b > 0, 1))
|
||||
+ {
|
||||
+#define FMSUB(a_, c_, b_) \
|
||||
+ ({ double __r; \
|
||||
+ __asm__ ("fmsub %[r], %[a], %[c], %[b]\n" \
|
||||
+ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
|
||||
+ __r;})
|
||||
+#define FNMSUB(a_, c_, b_) \
|
||||
+ ({ double __r; \
|
||||
+ __asm__ ("fnmsub %[r], %[a], %[c], %[b]\n" \
|
||||
+ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
|
||||
+ __r;})
|
||||
+
|
||||
+ if (__builtin_expect (b != a_inf.value, 1))
|
||||
+ {
|
||||
+ double y, x;
|
||||
+ fenv_t fe;
|
||||
+
|
||||
+ fe = fegetenv_register ();
|
||||
+
|
||||
+ relax_fenv_state ();
|
||||
+
|
||||
+ /* Compute y = 1.5 * b - b. Uses fewer constants than y = 0.5 * b. */
|
||||
+ y = FMSUB (threehalf, b, b);
|
||||
+
|
||||
+ /* Initial estimate. */
|
||||
+ __asm__ ("frsqrte %[x], %[b]\n" : [x] "=f" (x) : [b] "f" (b));
|
||||
+
|
||||
+ /* Iterate. x_{n+1} = x_n * (1.5 - y * (x_n * x_n)). */
|
||||
+ x = x * FNMSUB (y, x * x, threehalf);
|
||||
+ x = x * FNMSUB (y, x * x, threehalf);
|
||||
+ x = x * FNMSUB (y, x * x, threehalf);
|
||||
+
|
||||
+ /* All done. */
|
||||
+ fesetenv_register (fe);
|
||||
+ return x * b;
|
||||
+ }
|
||||
+ }
|
||||
+ else if (b < 0)
|
||||
+ {
|
||||
+ /* For some reason, some PowerPC32 processors don't implement
|
||||
+ FE_INVALID_SQRT. */
|
||||
+#ifdef FE_INVALID_SQRT
|
||||
+ feraiseexcept (FE_INVALID_SQRT);
|
||||
+
|
||||
+ fenv_union_t u = { .fenv = fegetenv_register () };
|
||||
+ if ((u.l[1] & FE_INVALID) == 0)
|
||||
+#endif
|
||||
+ feraiseexcept (FE_INVALID);
|
||||
+ b = a_nan.value;
|
||||
+ }
|
||||
+ return f_washf (b);
|
||||
+}
|
||||
Index: libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/603e/fpu/Implies
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/603e/fpu/Implies
|
||||
@@ -0,0 +1 @@
|
||||
+powerpc/powerpc32/603e/fpu
|
||||
Index: libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/7400/fpu/Implies
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/7400/fpu/Implies
|
||||
@@ -0,0 +1 @@
|
||||
+powerpc/powerpc32/603e/fpu
|
||||
Index: libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500mc/fpu/Implies
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500mc/fpu/Implies
|
||||
@@ -0,0 +1 @@
|
||||
+powerpc/powerpc32/603e/fpu
|
||||
Index: libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/e5500/fpu/Implies
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/e5500/fpu/Implies
|
||||
@@ -0,0 +1 @@
|
||||
+powerpc/powerpc64/e5500/fpu
|
||||
Index: libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/e5500/fpu/Implies
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/e5500/fpu/Implies
|
||||
@@ -0,0 +1 @@
|
||||
+powerpc/powerpc32/603e/fpu
|
||||
@@ -1,112 +0,0 @@
|
||||
on ppc fixes the errors like below
|
||||
| ./.libs/libpulsecore-1.1.so: undefined reference to `__sqrt_finite'
|
||||
| collect2: ld returned 1 exit status
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
ChangeLog
|
||||
|
||||
2012-01-06 Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
* sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c: Add __*_finite alias.
|
||||
Remove cruft.
|
||||
* sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c: Ditto.
|
||||
* sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c: Ditto.
|
||||
* sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c: Ditto.
|
||||
|
||||
Index: libc/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c
|
||||
===================================================================
|
||||
--- libc.orig/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c 2012-01-06 18:07:42.296909187 -0800
|
||||
+++ libc/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c 2012-01-06 18:09:22.572914856 -0800
|
||||
@@ -39,14 +39,8 @@
|
||||
We find the actual square root and half of its reciprocal
|
||||
simultaneously. */
|
||||
|
||||
-#ifdef __STDC__
|
||||
double
|
||||
__ieee754_sqrt (double b)
|
||||
-#else
|
||||
-double
|
||||
-__ieee754_sqrt (b)
|
||||
- double b;
|
||||
-#endif
|
||||
{
|
||||
if (__builtin_expect (b > 0, 1))
|
||||
{
|
||||
@@ -132,3 +126,4 @@
|
||||
}
|
||||
return f_wash (b);
|
||||
}
|
||||
+strong_alias (__ieee754_sqrt, __sqrt_finite)
|
||||
Index: libc/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c
|
||||
===================================================================
|
||||
--- libc.orig/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c 2012-01-06 18:10:37.068917644 -0800
|
||||
+++ libc/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c 2012-01-06 18:11:33.408920635 -0800
|
||||
@@ -37,14 +37,8 @@
|
||||
We find the reciprocal square root and use that to compute the actual
|
||||
square root. */
|
||||
|
||||
-#ifdef __STDC__
|
||||
float
|
||||
__ieee754_sqrtf (float b)
|
||||
-#else
|
||||
-float
|
||||
-__ieee754_sqrtf (b)
|
||||
- float b;
|
||||
-#endif
|
||||
{
|
||||
if (__builtin_expect (b > 0, 1))
|
||||
{
|
||||
@@ -99,3 +93,4 @@
|
||||
}
|
||||
return f_washf (b);
|
||||
}
|
||||
+strong_alias (__ieee754_sqrtf, __sqrtf_finite)
|
||||
Index: libc/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c
|
||||
===================================================================
|
||||
--- libc.orig/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c 2012-01-06 18:11:51.460925644 -0800
|
||||
+++ libc/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c 2012-01-06 18:12:39.344924405 -0800
|
||||
@@ -39,14 +39,8 @@
|
||||
We find the actual square root and half of its reciprocal
|
||||
simultaneously. */
|
||||
|
||||
-#ifdef __STDC__
|
||||
double
|
||||
__ieee754_sqrt (double b)
|
||||
-#else
|
||||
-double
|
||||
-__ieee754_sqrt (b)
|
||||
- double b;
|
||||
-#endif
|
||||
{
|
||||
if (__builtin_expect (b > 0, 1))
|
||||
{
|
||||
@@ -132,3 +126,4 @@
|
||||
}
|
||||
return f_wash (b);
|
||||
}
|
||||
+strong_alias (__ieee754_sqrt, __sqrt_finite)
|
||||
Index: libc/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c
|
||||
===================================================================
|
||||
--- libc.orig/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c 2012-01-06 18:13:00.892924586 -0800
|
||||
+++ libc/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c 2012-01-06 18:15:27.992931106 -0800
|
||||
@@ -37,14 +37,8 @@
|
||||
We find the reciprocal square root and use that to compute the actual
|
||||
square root. */
|
||||
|
||||
-#ifdef __STDC__
|
||||
float
|
||||
__ieee754_sqrtf (float b)
|
||||
-#else
|
||||
-float
|
||||
-__ieee754_sqrtf (b)
|
||||
- float b;
|
||||
-#endif
|
||||
{
|
||||
if (__builtin_expect (b > 0, 1))
|
||||
{
|
||||
@@ -99,3 +93,4 @@
|
||||
}
|
||||
return f_washf (b);
|
||||
}
|
||||
+strong_alias (__ieee754_sqrtf, __sqrtf_finite)
|
||||
@@ -1,81 +0,0 @@
|
||||
Upstream-Status: Inappropriate [SDK specific]
|
||||
|
||||
This patch puts the dynamic loader path in the binaries, SYSTEM_DIRS strings
|
||||
and lengths as well as ld.so.cache path in the dynamic loader to specific
|
||||
sections in memory. The sections that contain paths have been allocated a 4096
|
||||
byte section, which is the maximum path length in linux. This will allow the
|
||||
relocating script to parse the ELF binary, detect the section and easily replace
|
||||
the strings in a certain path.
|
||||
|
||||
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
|
||||
|
||||
Index: libc/elf/interp.c
|
||||
===================================================================
|
||||
--- libc.orig/elf/interp.c
|
||||
+++ libc/elf/interp.c
|
||||
@@ -17,5 +17,5 @@
|
||||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||
02111-1307 USA. */
|
||||
|
||||
-const char __invoke_dynamic_linker__[] __attribute__ ((section (".interp")))
|
||||
+const char __invoke_dynamic_linker__[4096] __attribute__ ((section (".interp")))
|
||||
= RUNTIME_LINKER;
|
||||
Index: libc/elf/dl-load.c
|
||||
===================================================================
|
||||
--- libc.orig/elf/dl-load.c
|
||||
+++ libc/elf/dl-load.c
|
||||
@@ -145,8 +145,8 @@ static size_t max_capstrlen attribute_re
|
||||
/* Get the generated information about the trusted directories. */
|
||||
#include "trusted-dirs.h"
|
||||
|
||||
-static const char system_dirs[] = SYSTEM_DIRS;
|
||||
-static const size_t system_dirs_len[] =
|
||||
+static const char system_dirs[4096] __attribute__ ((section (".sysdirs"))) = SYSTEM_DIRS;
|
||||
+volatile static const size_t system_dirs_len[] __attribute__ ((section (".sysdirslen"))) =
|
||||
{
|
||||
SYSTEM_DIRS_LEN
|
||||
};
|
||||
Index: libc/elf/dl-cache.c
|
||||
===================================================================
|
||||
--- libc.orig/elf/dl-cache.c
|
||||
+++ libc/elf/dl-cache.c
|
||||
@@ -134,6 +134,10 @@ do \
|
||||
while (0)
|
||||
|
||||
|
||||
+const char LD_SO_CACHE[4096] __attribute__ ((section (".ldsocache"))) =
|
||||
+ SYSCONFDIR "/ld.so.cache";
|
||||
+
|
||||
+
|
||||
int
|
||||
internal_function
|
||||
_dl_cache_libcmp (const char *p1, const char *p2)
|
||||
Index: libc/elf/ldconfig.c
|
||||
===================================================================
|
||||
--- libc.orig/elf/ldconfig.c
|
||||
+++ libc/elf/ldconfig.c
|
||||
@@ -167,6 +167,9 @@ static struct argp argp =
|
||||
options, parse_opt, NULL, doc, NULL, more_help, NULL
|
||||
};
|
||||
|
||||
+
|
||||
+extern const char LD_SO_CACHE[4096] __attribute__ ((section (".ldsocache")));
|
||||
+
|
||||
/* Check if string corresponds to an important hardware capability or
|
||||
a platform. */
|
||||
static int
|
||||
Index: libc/sysdeps/generic/dl-cache.h
|
||||
===================================================================
|
||||
--- libc.orig/sysdeps/generic/dl-cache.h
|
||||
+++ libc/sysdeps/generic/dl-cache.h
|
||||
@@ -28,10 +28,6 @@
|
||||
((flags) == 1 || (flags) == _DL_CACHE_DEFAULT_ID)
|
||||
#endif
|
||||
|
||||
-#ifndef LD_SO_CACHE
|
||||
-# define LD_SO_CACHE SYSCONFDIR "/ld.so.cache"
|
||||
-#endif
|
||||
-
|
||||
#ifndef add_system_dir
|
||||
# define add_system_dir(dir) add_dir (dir)
|
||||
#endif
|
||||
@@ -1,35 +0,0 @@
|
||||
Test for -fstack-protector is compile only test. One might have the option but
|
||||
might have build the compiler with --disable-ssp which means ssp should not be
|
||||
enabled. Therefore we change the test to a link time test. It will fail if
|
||||
libssp is not available.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
Index: libc/configure
|
||||
===================================================================
|
||||
--- libc.orig/configure
|
||||
+++ libc/configure
|
||||
@@ -6937,7 +6937,7 @@ if test "${libc_cv_ssp+set}" = set; then
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -Werror -fstack-protector
|
||||
- -o /dev/null -c -x c /dev/null 1>&5'
|
||||
+ -o /dev/null -x c /dev/null 1>&5'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
Index: libc/configure.in
|
||||
===================================================================
|
||||
--- libc.orig/configure.in
|
||||
+++ libc/configure.in
|
||||
@@ -1787,7 +1787,7 @@ AC_SUBST(fno_unit_at_a_time)
|
||||
|
||||
AC_CACHE_CHECK(for -fstack-protector, libc_cv_ssp, [dnl
|
||||
if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -Werror -fstack-protector
|
||||
- -o /dev/null -c -x c /dev/null 1>&AS_MESSAGE_LOG_FD])
|
||||
+ -o /dev/null -x c /dev/null 1>&AS_MESSAGE_LOG_FD])
|
||||
then
|
||||
libc_cv_ssp=yes
|
||||
else
|
||||
@@ -1,21 +0,0 @@
|
||||
|
||||
localstatedir is set to be the /var directory, so use
|
||||
it for the base of the vardbdir so it's properly relocatable.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Saul Wold <sgw@linux.intel.com>
|
||||
|
||||
Index: libc/Makeconfig
|
||||
===================================================================
|
||||
--- libc.orig/Makeconfig
|
||||
+++ libc/Makeconfig
|
||||
@@ -293,7 +293,7 @@ inst_sysconfdir = $(install_root)$(sysco
|
||||
|
||||
# Directory for the database files and Makefile for nss_db.
|
||||
ifndef vardbdir
|
||||
-vardbdir = /var/db
|
||||
+vardbdir = $(localstatedir)/db
|
||||
endif
|
||||
inst_vardbdir = $(install_root)$(vardbdir)
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
build system of glibc currently adds the cxx headers path by detecting
|
||||
it using provided CXX and expects that they are installed w.r.t to standard
|
||||
installation location but in OE we install and use cxx headers from target
|
||||
sysroot therefore that code needs to be adapted for OE
|
||||
|
||||
Upstream-Status: Inappropriate [OE-specific]
|
||||
|
||||
-Khem
|
||||
|
||||
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -1094,11 +1094,10 @@ if test -n "$sysheaders"; then
|
||||
-isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
|
||||
if test -n "$CXX"; then
|
||||
CXX_SYSINCLUDES=
|
||||
- cxxversion=`$CXX -dumpversion 2>&AS_MESSAGE_LOG_FD` &&
|
||||
cxxmachine=`$CXX -dumpmachine 2>&AS_MESSAGE_LOG_FD` &&
|
||||
for d in include "$cxxmachine/include"; do
|
||||
- i=../../../../$d/c++/$cxxversion
|
||||
- cxxheaders=`$CXX -print-file-name="$i"` &&
|
||||
+ i="$prefix/$d/c++"
|
||||
+ cxxheaders=`$CXX -print-sysroot`"$i" &&
|
||||
test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" &&
|
||||
CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \
|
||||
-isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward"
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -5618,11 +5618,10 @@ if test -n "$sysheaders"; then
|
||||
-isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
|
||||
if test -n "$CXX"; then
|
||||
CXX_SYSINCLUDES=
|
||||
- cxxversion=`$CXX -dumpversion 2>&5` &&
|
||||
cxxmachine=`$CXX -dumpmachine 2>&5` &&
|
||||
for d in include "$cxxmachine/include"; do
|
||||
- i=../../../../$d/c++/$cxxversion
|
||||
- cxxheaders=`$CXX -print-file-name="$i"` &&
|
||||
+ i="$prefix/$d/c++"
|
||||
+ cxxheaders=`$CXX -print-sysroot`"$i" &&
|
||||
test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" &&
|
||||
CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \
|
||||
-isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward"
|
||||
@@ -1,36 +0,0 @@
|
||||
Without this patch it fails to inline that function
|
||||
since we do not have __SSE_MATH__ in OE build.
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
Upstream-Status: Inappropriate [OE-specific]
|
||||
|
||||
--- a/sysdeps/x86_64/fpu/bits/fenv.h
|
||||
+++ b/sysdeps/x86_64/fpu/bits/fenv.h
|
||||
@@ -112,16 +112,24 @@ __NTH (feraiseexcept (int __excepts))
|
||||
{
|
||||
/* One example of a invalid operation is 0.0 / 0.0. */
|
||||
float __f = 0.0;
|
||||
-
|
||||
+# if defined __SSE_MATH__ || __WORDSIZE == 64
|
||||
__asm__ __volatile__ ("divss %0, %0 " : : "x" (__f));
|
||||
+# else
|
||||
+ __asm__ __volatile__ ("fdiv %%st, %%st(0); fwait"
|
||||
+ : "=t" (__f) : "0" (__f));
|
||||
+# endif
|
||||
(void) &__f;
|
||||
}
|
||||
if ((FE_DIVBYZERO & __excepts) != 0)
|
||||
{
|
||||
float __f = 1.0;
|
||||
float __g = 0.0;
|
||||
-
|
||||
+# if defined __SSE_MATH__ || __WORDSIZE == 64
|
||||
__asm__ __volatile__ ("divss %1, %0" : : "x" (__f), "x" (__g));
|
||||
+# else
|
||||
+ __asm__ __volatile__ ("fdivp %%st(1), %%st; fwait"
|
||||
+ : "=t" (__f) : "0" (__f), "u" (__g) : "st(1)");
|
||||
+# endif
|
||||
(void) &__f;
|
||||
}
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
require eglibc_${PV}.bb
|
||||
require eglibc-initial.inc
|
||||
|
||||
do_configure_prepend () {
|
||||
unset CFLAGS
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
require eglibc-locale.inc
|
||||
@@ -1,239 +0,0 @@
|
||||
require eglibc.inc
|
||||
|
||||
SRCREV = "19294"
|
||||
|
||||
DEPENDS += "gperf-native"
|
||||
PR = "r13"
|
||||
PR_append = "+svnr${SRCPV}"
|
||||
|
||||
EGLIBC_BRANCH="eglibc-2_15"
|
||||
SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=http \
|
||||
file://eglibc-svn-arm-lowlevellock-include-tls.patch \
|
||||
file://IO-acquire-lock-fix.patch \
|
||||
file://mips-rld-map-check.patch \
|
||||
file://stack-protector-test.patch \
|
||||
file://etc/ld.so.conf \
|
||||
file://generate-supported.mk \
|
||||
file://ppc-sqrt.patch \
|
||||
file://multilib_readlib.patch \
|
||||
file://eglibc-rpc-export-again.patch \
|
||||
file://glibc-2.14-libdl-crash.patch \
|
||||
file://use-sysroot-cxx-headers.patch \
|
||||
file://x86_fenv.patch \
|
||||
file://ppc-sqrt_finite.patch \
|
||||
file://GLRO_dl_debug_mask.patch \
|
||||
file://initgroups_keys.patch \
|
||||
file://use-localstatedir-for-vardbdir.patch \
|
||||
file://eglibc_fix_findidx_parameters.patch \
|
||||
file://add_HAVE_ARM_PCS_VFP.patch \
|
||||
file://ldso_arm_hf_support.patch \
|
||||
"
|
||||
LIC_FILES_CHKSUM = "file://LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9 \
|
||||
file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
|
||||
file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
|
||||
file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff "
|
||||
|
||||
SRC_URI_append_virtclass-nativesdk = " file://ld-search-order.patch \
|
||||
file://relocatable_sdk.patch \
|
||||
"
|
||||
S = "${WORKDIR}/${EGLIBC_BRANCH}/libc"
|
||||
B = "${WORKDIR}/build-${TARGET_SYS}"
|
||||
|
||||
PACKAGES_DYNAMIC = "libc6*"
|
||||
RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
|
||||
PROVIDES_${PN}-dbg = "glibc-dbg"
|
||||
|
||||
# the -isystem in bitbake.conf screws up glibc do_stage
|
||||
BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
|
||||
TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
|
||||
|
||||
GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN es_CR.ISO-8859-1"
|
||||
|
||||
FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc-${PV}', '${FILE_DIRNAME}/eglibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
|
||||
|
||||
#
|
||||
# For now, we will skip building of a gcc package if it is a uclibc one
|
||||
# and our build is not a uclibc one, and we skip a glibc one if our build
|
||||
# is a uclibc build.
|
||||
#
|
||||
# See the note in gcc/gcc_3.4.0.oe
|
||||
#
|
||||
|
||||
python __anonymous () {
|
||||
import re
|
||||
uc_os = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None)
|
||||
if uc_os:
|
||||
raise bb.parse.SkipPackage("incompatible with target %s" %
|
||||
d.getVar('TARGET_OS', True))
|
||||
}
|
||||
|
||||
export libc_cv_slibdir = "${base_libdir}"
|
||||
|
||||
EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
|
||||
--without-cvs --disable-profile --disable-debug --without-gd \
|
||||
--enable-clocale=gnu \
|
||||
--enable-add-ons \
|
||||
--with-headers=${STAGING_INCDIR} \
|
||||
--without-selinux \
|
||||
${GLIBC_EXTRA_OECONF}"
|
||||
|
||||
EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}"
|
||||
|
||||
do_unpack_append() {
|
||||
bb.build.exec_func('do_move_ports', d)
|
||||
}
|
||||
|
||||
do_move_ports() {
|
||||
if test -d ${WORKDIR}/${EGLIBC_BRANCH}/ports ; then
|
||||
rm -rf ${S}/ports
|
||||
mv ${WORKDIR}/${EGLIBC_BRANCH}/ports ${S}/
|
||||
fi
|
||||
}
|
||||
|
||||
do_patch_append() {
|
||||
bb.build.exec_func('do_fix_ia_headers', d)
|
||||
bb.build.exec_func('do_fix_readlib_c', d)
|
||||
}
|
||||
|
||||
# for mips eglibc now builds syscall tables for all abi's
|
||||
# so we make sure that we choose right march option which is
|
||||
# compatible with o32,n32 and n64 abi's
|
||||
# e.g. -march=mips32 is not compatible with n32 and n64 therefore
|
||||
# we filter it out in such case -march=from-abi which will be
|
||||
# mips1 when using o32 and mips3 when using n32/n64
|
||||
|
||||
TUNE_CCARGS_mips := "${@oe_filter_out('-march=mips32', '${TUNE_CCARGS}', d)}"
|
||||
TUNE_CCARGS_mipsel := "${@oe_filter_out('-march=mips32', '${TUNE_CCARGS}', d)}"
|
||||
|
||||
# We need to ensure that all of the i386 and x86_64 headers are identical
|
||||
# to support the multilib case. We do this by copying headers from x86_64
|
||||
# to i386 directories. Normally when hand building eglibc or a combined
|
||||
# system you would build 32-bit, and then overwrite any files with the x86_64
|
||||
# versions.
|
||||
#
|
||||
# Each time eglibc is updated, this will need to be re-evaluated. In order
|
||||
# to do this, disable this function. Build eglibc for a 32-bit and a 64-bit
|
||||
# IA32 target. Compare the contents of the include files -- comments specific
|
||||
# to the x86_64 version compared to the 32-bit one.
|
||||
#
|
||||
# For eglibc 2.13, each conflict noted below:
|
||||
# bits/a.out.h - Add support for __WORDSIZE = 64
|
||||
# bits/byteswap.h - Copyright date mismatch, add support for __WORDSIZE = 64
|
||||
# bits/endian.h - Comment mismatch
|
||||
# bits/environment.h - add support for __WORDSIZE = 64
|
||||
# bits/fcntl.h - Comment/Copyright date mismatch, add support for __WORDSIZE = 64
|
||||
# bits/fenv.h - Copyright date mismatch, add support for __WORDSIZE = 64
|
||||
# bits/huge_vall.h - Comment/Copyright date mismatch, remove support for older gcc
|
||||
# bits/link.h - Function name difference, add x86_64 definitions
|
||||
# bits/mathdef.h - Copyright date mismatch, add support for __WORDSIZE = 64
|
||||
# bits/mathinline.h - Copyright date mismatch, contributed by mismatch, remove support for older gcc/assembly optimization, add support for __WORDSIZE = 64
|
||||
# bits/mman.h - Header/Copyright date mismatch, add MAP_32BIT definition
|
||||
# bits/msq.h - Copyright date mismatch, add __WORDSIZE = 32 definitions
|
||||
# bits/pthread_type.h -- Contributed by added, add support for __WORDSIZE = 64
|
||||
# bits/select.h - Copyright date mismatch, add support for __WORDSIZE = 64
|
||||
# bits/semaphore.h - Copyright date mismatch, add support for __WORDSIZE = 64
|
||||
# bits/sem.h - Copyright date mismatch
|
||||
# bits/setjmp.h - Copyrgiht date mismatch, add support for __WORDSIZE = 64
|
||||
# bits/shm.h - Copyright date mismatch, add support for __WORDSIZE = 32
|
||||
# bits/sigcontext.h - Copyright date mismatch, license wording mismatch, add support for __WORDSIZE = 32
|
||||
# bits/stat.h - Copyright date mismatch, add support for __WORDSIZE = 32 and __WORDSIZE = 64
|
||||
# bits/string.h - Header/Copyright date mismatch, remove assembly optimizations
|
||||
# bits/syscall.h - different order, some different syscalls listed
|
||||
# bits/wchar.h - Change the way the definitions are done
|
||||
# bits/wordsize.h - Different header, remove license notice, add __x86_64__ support
|
||||
# bits/xtitypes.h - Header difference, different typedef format
|
||||
# bits/fpu_control.h - header difference, revised comments, updated assembly macros
|
||||
# sys/debugreg.h - Copyright date mismatch, new definition and added __WORDSIZE=64 support
|
||||
# sys/epoll.h - Copyright date mismatch, slightly different definitions
|
||||
# sys/io.h - Copyright date mismatch, slightly different assembly formats
|
||||
# sys/perm.h - Copyright date mismatch
|
||||
# sys/procfs.h - Copyright date mismatch, support for __WORDSIZE = 32
|
||||
# sys/reg.h - Copyright date mismatch, support for __WORDSIZE = 64
|
||||
# sys/ucontext.h - Copyright date mismatch, support for __WORDSIZE = 64
|
||||
# sys/user.h - Copyright date mismatch, support for __WORDSIZE = 64
|
||||
#
|
||||
# we rm something to return to the default version
|
||||
#
|
||||
do_fix_ia_headers() {
|
||||
cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/a.out.h ${S}/sysdeps/unix/sysv/linux/i386/bits/a.out.h
|
||||
cp ${S}/sysdeps/x86_64/bits/byteswap.h ${S}/sysdeps/i386/bits/byteswap.h
|
||||
cp ${S}/sysdeps/x86_64/bits/endian.h ${S}/sysdeps/i386/bits/endian.h
|
||||
cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/environments.h ${S}/sysdeps/unix/sysv/linux/i386/bits/environments.h
|
||||
cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h ${S}/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
|
||||
cp ${S}/sysdeps/x86_64/fpu/bits/fenv.h ${S}/sysdeps/i386/fpu/bits/fenv.h
|
||||
rm -f ${S}/sysdeps/i386/bits/huge_vall.h
|
||||
cp ${S}/sysdeps/x86_64/bits/link.h ${S}/sysdeps/i386/bits/link.h
|
||||
cp ${S}/sysdeps/x86_64/bits/mathdef.h ${S}/sysdeps/i386/bits/mathdef.h
|
||||
cp ${S}/sysdeps/x86_64/fpu/bits/mathinline.h ${S}/sysdeps/i386/fpu/bits/mathinline.h
|
||||
cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/mman.h ${S}/sysdeps/unix/sysv/linux/i386/bits/mman.h
|
||||
cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/msq.h ${S}/sysdeps/unix/sysv/linux/i386/bits/msq.h
|
||||
cp ${S}/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h ${S}/nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h
|
||||
cp ${S}/sysdeps/x86_64/bits/select.h ${S}/sysdeps/i386/bits/select.h
|
||||
cp ${S}/nptl/sysdeps/unix/sysv/linux/x86_64/bits/semaphore.h ${S}/nptl/sysdeps/unix/sysv/linux/i386/bits/semaphore.h
|
||||
rm -f ${S}/sysdeps/unix/sysv/linux/x86_64/bits/sem.h
|
||||
cp ${S}/sysdeps/x86_64/bits/setjmp.h ${S}/sysdeps/i386/bits/setjmp.h
|
||||
cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/shm.h ${S}/sysdeps/unix/sysv/linux/i386/bits/shm.h
|
||||
cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/sigcontext.h ${S}/sysdeps/unix/sysv/linux/i386/bits/sigcontext.h
|
||||
cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/stat.h ${S}/sysdeps/unix/sysv/linux/i386/bits/stat.h
|
||||
rm -f ${S}/sysdeps/i386/i486/bits/string.h ; cp ${S}/sysdeps/x86_64/bits/string.h ${S}/sysdeps/i386/bits/string.h
|
||||
# Skip syscall.h, see do_install
|
||||
rm -f ${S}/sysdeps/unix/sysv/linux/i386/bits/wchar.h
|
||||
cp ${S}/sysdeps/x86_64/bits/wordsize.h ${S}/sysdeps/i386/bits/wordsize.h
|
||||
cp ${S}/sysdeps/x86_64/bits/xtitypes.h ${S}/sysdeps/i386/bits/xtitypes.h
|
||||
# i386 version is correct, x86_64 is incorrect for fpu_control.h
|
||||
cp ${S}/sysdeps/i386/fpu_control.h ${S}/sysdeps/x86_64/fpu_control.h
|
||||
cp ${S}/sysdeps/unix/sysv/linux/x86_64/sys/debugreg.h ${S}/sysdeps/unix/sysv/linux/i386/sys/debugreg.h
|
||||
cp ${S}/sysdeps/unix/sysv/linux/x86_64/sys/epoll.h ${S}/sysdeps/unix/sysv/linux/i386/sys/epoll.h
|
||||
cp ${S}/sysdeps/unix/sysv/linux/x86_64/sys/io.h ${S}/sysdeps/unix/sysv/linux/i386/sys/io.h
|
||||
cp ${S}/sysdeps/unix/sysv/linux/x86_64/sys/perm.h ${S}/sysdeps/unix/sysv/linux/i386/sys/perm.h
|
||||
cp ${S}/sysdeps/unix/sysv/linux/x86_64/sys/procfs.h ${S}/sysdeps/unix/sysv/linux/i386/sys/procfs.h
|
||||
cp ${S}/sysdeps/unix/sysv/linux/x86_64/sys/reg.h ${S}/sysdeps/unix/sysv/linux/i386/sys/reg.h
|
||||
cp ${S}/sysdeps/unix/sysv/linux/x86_64/sys/ucontext.h ${S}/sysdeps/unix/sysv/linux/i386/sys/ucontext.h
|
||||
cp ${S}/sysdeps/unix/sysv/linux/x86_64/sys/user.h ${S}/sysdeps/unix/sysv/linux/i386/sys/user.h
|
||||
}
|
||||
|
||||
do_fix_readlib_c () {
|
||||
sed -i -e 's#OECORE_KNOWN_INTERPRETER_NAMES#${EGLIBC_KNOWN_INTERPRETER_NAMES}#' ${S}/elf/readlib.c
|
||||
}
|
||||
|
||||
do_configure () {
|
||||
# override this function to avoid the autoconf/automake/aclocal/autoheader
|
||||
# calls for now
|
||||
# don't pass CPPFLAGS into configure, since it upsets the kernel-headers
|
||||
# version check and doesn't really help with anything
|
||||
if [ -z "`which rpcgen`" ]; then
|
||||
echo "rpcgen not found. Install glibc-devel."
|
||||
exit 1
|
||||
fi
|
||||
(cd ${S} && gnu-configize) || die "failure in running gnu-configize"
|
||||
find ${S} -name "configure" | xargs touch
|
||||
CPPFLAGS="" oe_runconf
|
||||
}
|
||||
|
||||
rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \
|
||||
yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \
|
||||
rusers.x spray.x nfs_prot.x rquota.x key_prot.x"
|
||||
|
||||
do_compile () {
|
||||
# -Wl,-rpath-link <staging>/lib in LDFLAGS can cause breakage if another glibc is in staging
|
||||
unset LDFLAGS
|
||||
base_do_compile
|
||||
(
|
||||
cd ${S}/sunrpc/rpcsvc
|
||||
for r in ${rpcsvc}; do
|
||||
h=`echo $r|sed -e's,\.x$,.h,'`
|
||||
rpcgen -h $r -o $h || bbwarn "unable to generate header for $r"
|
||||
done
|
||||
)
|
||||
echo "Adjust ldd script"
|
||||
if [ -n "${RTLDLIST}" ]
|
||||
then
|
||||
sed -i ${B}/elf/ldd -e 's#^\(RTLDLIST=\)"\(.*\)"$#\1\2#'
|
||||
sed -i ${B}/elf/ldd -e 's#^\(RTLDLIST=\)\(.*\)$#\1"${RTLDLIST} \2"#'
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
require eglibc-package.inc
|
||||
|
||||
BBCLASSEXTEND = "nativesdk"
|
||||
Reference in New Issue
Block a user