From bf604f35035ae49a3db8a1e1ff67f512a0de86bd Mon Sep 17 00:00:00 2001 From: Dirk Neukirchen Date: Mon, 29 Aug 2016 14:16:14 +0200 Subject: glibc: add 2.24 since eglibc is deprecated just use glibc as name - fix build errors w. stack-protector (observed for x86_64): libresolv_pic.a(gethnamaddr.os): In function `addrsort': gethnamaddr.c:(.text+0x425): undefined reference to `__stack_chk_guard' by additionally setting libc_cv_ssp_strong=no like previously libc_cv_ssp=no was set - fix compile errors on 2.24 x86 introduced by upstream changesets "Optimize i386 syscall inlining" errors are like: - https://sourceware.org/ml/libc-alpha/2015-10/msg00745.html and trying to fix with the whats suggested at: https://patchwork.openembedded.org/patch/118909/ leads to other error: gcc6: elf/librtld.os: In function `__mmap': (.text+0x131a9): undefined reference to `__libc_do_syscall' or: gcc5: elf/dl-load.os {standard input}: Assembler messages: {standard input}:5129: Error: symbol `__x86.get_pc_thunk.cx' is already defined instead of testing other flags/effects (-fno-omit-frame-pointer) just use -O2 (like buildroot does) instead of -Os boot+pings tested on: qemu malta (le+be) (gcc5+bin2.25.1) qemu aarch64 (gcc5+bin2.25.1) qemu x86_64 (gcc6+bin2.26) qemu x86 generic (gcc6+bin2.26) Signed-off-by: Dirk Neukirchen --- .../glibc/patches/2.24/100-fix_cross_rpcgen.patch | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 toolchain/glibc/patches/2.24/100-fix_cross_rpcgen.patch (limited to 'toolchain/glibc/patches/2.24/100-fix_cross_rpcgen.patch') diff --git a/toolchain/glibc/patches/2.24/100-fix_cross_rpcgen.patch b/toolchain/glibc/patches/2.24/100-fix_cross_rpcgen.patch new file mode 100644 index 0000000000..6a5e537b77 --- /dev/null +++ b/toolchain/glibc/patches/2.24/100-fix_cross_rpcgen.patch @@ -0,0 +1,52 @@ +--- a/sunrpc/rpc/types.h ++++ b/sunrpc/rpc/types.h +@@ -75,18 +75,23 @@ typedef unsigned long rpcport_t; + #endif + + #ifndef __u_char_defined +-typedef __u_char u_char; +-typedef __u_short u_short; +-typedef __u_int u_int; +-typedef __u_long u_long; +-typedef __quad_t quad_t; +-typedef __u_quad_t u_quad_t; +-typedef __fsid_t fsid_t; ++typedef unsigned char u_char; ++typedef unsigned short u_short; ++typedef unsigned int u_int; ++typedef unsigned long u_long; ++#if __WORDSIZE == 64 ++typedef long int quad_t; ++typedef unsigned long int u_quad_t; ++#elif defined __GLIBC_HAVE_LONG_LONG ++typedef long long int quad_t; ++typedef unsigned long long int u_quad_t; ++#endif ++typedef u_quad_t fsid_t; + # define __u_char_defined + #endif +-#ifndef __daddr_t_defined +-typedef __daddr_t daddr_t; +-typedef __caddr_t caddr_t; ++#if !defined(__daddr_t_defined) && defined(linux) ++typedef long int daddr_t; ++typedef char *caddr_t; + # define __daddr_t_defined + #endif + +--- a/sunrpc/rpc_main.c ++++ b/sunrpc/rpc_main.c +@@ -958,9 +958,10 @@ mkfile_output (struct commandline *cmd) + abort (); + temp = rindex (cmd->infile, '.'); + cp = stpcpy (mkfilename, "Makefile."); +- if (temp != NULL) +- *((char *) stpncpy (cp, cmd->infile, temp - cmd->infile)) = '\0'; +- else ++ if (temp != NULL) { ++ strncpy(cp, cmd->infile, temp - cmd->infile); ++ cp[temp - cmd->infile - 1] = 0; ++ } else + stpcpy (cp, cmd->infile); + + } -- cgit v1.2.3