crosstool-ng: patches/glibc/2.5/120-fix-pr631.patch@27fec561af53

Merge the uClinux/noMMU stuff back to /trunk:
- merge Linux and uClinux back to a single kernel
- add ARCH_USE_MMU and acquainted config options that
architectures can auto-select
- make binutils and elf2flt two "Binary utilities" that
go in a single common sub-{menu,directory} structure

-------- diffstat follows --------
/trunk/scripts/build/kernel/uclinux.sh | 2 0 2 0 -
/trunk/scripts/build/kernel/linux.sh | 206 204 2 0 +++++++++++++++++++++++++++++
/trunk/scripts/build/kernel/linux-common.sh | 198 0 198 0 ----------------------------
/trunk/scripts/build/binutils.sh | 232 0 232 0 --------------------------------
/trunk/scripts/build/elf2flt.sh | 150 0 150 0 ---------------------
/trunk/scripts/crosstool-NG.sh.in | 6 4 2 0 +
/trunk/config/kernel/linux.in | 249 249 0 0 +++++++++++++++++++++++++++++++++++
/trunk/config/kernel/linux.in-common | 252 0 252 0 -----------------------------------
/trunk/config/kernel/uclinux.in | 21 0 21 0 ---
/trunk/config/target.in | 23 22 1 0 +++
/trunk/config/elf2flt.in | 49 0 49 0 -------
/trunk/config/libc/glibc.in | 2 1 1 0
/trunk/config/libc/eglibc.in | 2 1 1 0
/trunk/config/config.in | 1 0 1 0 -
/trunk/config/arch/sh.in | 1 1 0 0 +
/trunk/config/arch/arm.in | 2 1 1 0
/trunk/config/arch/powerpc.in | 1 1 0 0 +
/trunk/config/arch/ia64.in | 1 1 0 0 +
/trunk/config/arch/alpha.in | 1 1 0 0 +
/trunk/config/arch/x86.in | 1 1 0 0 +
/trunk/config/arch/mips.in | 1 1 0 0 +
/trunk/config/arch/powerpc64.in | 1 1 0 0 +
22 files changed, 489 insertions(+), 913 deletions(-)

     1 From dank@kegel.com

     2 Wed Jun 15 09:12:43 PDT 2005

     4 Fixes

     6 build-glibc/libc.a(nsswitch.o)(.data+0x64): undefined reference to `_nss_files_getaliasent_r'

     7 build-glibc/libc.a(nsswitch.o)(.data+0x6c): undefined reference to `_nss_files_endaliasent'

     8 ... 53 lines deleted ...

     9 build-glibc/libc.a(nsswitch.o)(.data+0x21c): undefined reference to `_nss_files_getspnam_r'

    10 collect2: ld returned 1 exit status

    11 make[2]: *** [/build/gcc-3.4.3-glibc-2.3.5-hdrs-2.6.11.2/i686-unknown-linux-gnu/build-glibc/elf/ldconfig] Error 1

    13 when building glibc with --enable-static-nss.

    15 See http://sources.redhat.com/bugzilla/show_bug.cgi?id=631

    17 --- glibc-2.3.5/Makeconfig.old	Wed Jun 15 08:13:12 2005

    18 +++ glibc-2.3.5/Makeconfig	Wed Jun 15 08:13:14 2005

    19 @@ -510,7 +510,7 @@

    21  # The static libraries.

    22  ifeq (yes,$(build-static))

    23 -link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(common-objpfx)libc.a

    24 +link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(otherlibs) $(common-objpfx)libc.a

    25  else

    26  ifeq (yes,$(build-shared))

    27  # We can try to link the programs with lib*_pic.a...

    28 --- glibc-2.3.5/elf/Makefile.old	Wed Jun 15 07:46:49 2005

    29 +++ glibc-2.3.5/elf/Makefile	Wed Jun 15 08:14:00 2005

    30 @@ -120,6 +120,13 @@

    31  install-bin-script = ldd

    32  endif

    34 +ifeq (yes,$(build-static-nss))

    35 +nssobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)nss)

    36 +resolvobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)resolv)

    37 +otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \

    38 +	     $(resolvobjdir)/libresolv.a

    39 +endif

    40 +

    41  others		= sprof sln

    42  install-bin	= sprof

    43  others-static   = sln

    45 Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>

author	"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
	Wed May 20 20:13:13 2009 +0000 (2009-05-20)
changeset 1345	27fec561af53
parent 744	4bf8448536d5
permissions	-rw-r--r--