aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain/glibc/common.mk
diff options
context:
space:
mode:
authorDirk Neukirchen <dirkneukirchen@web.de>2016-08-29 14:16:14 +0200
committerFelix Fietkau <nbd@nbd.name>2016-08-30 10:51:21 +0200
commitbf604f35035ae49a3db8a1e1ff67f512a0de86bd (patch)
tree1389c76d2f4f3e8acd5a3e1f3694493cd69128e3 /toolchain/glibc/common.mk
parent98206cb9c62a86f3e72b74a71e9ed836bac1fc71 (diff)
downloadupstream-bf604f35035ae49a3db8a1e1ff67f512a0de86bd.tar.gz
upstream-bf604f35035ae49a3db8a1e1ff67f512a0de86bd.tar.bz2
upstream-bf604f35035ae49a3db8a1e1ff67f512a0de86bd.zip
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 <dirkneukirchen@web.de>
Diffstat (limited to 'toolchain/glibc/common.mk')
-rw-r--r--toolchain/glibc/common.mk10
1 files changed, 9 insertions, 1 deletions
diff --git a/toolchain/glibc/common.mk b/toolchain/glibc/common.mk
index 4de9905f34..11de291ab8 100644
--- a/toolchain/glibc/common.mk
+++ b/toolchain/glibc/common.mk
@@ -16,6 +16,9 @@ REVISION_2.21 = 16d0a0c
MD5SUM_2.22 = b575850e77b37d70f96472285290b391
REVISION_2.22 = b995d95
+MD5SUM_2.24 = 5c5a6f1ac6fce866e37643c41ac116f3
+REVISION_2.24 = 8c716c2
+
PKG_NAME:=glibc
PKG_VERSION:=$(call qstrip,$(CONFIG_GLIBC_VERSION))
@@ -55,10 +58,14 @@ ifeq ($(ARCH),mips64)
endif
endif
+
+# -Os miscompiles w. 2.24 gcc5/gcc6
+# only -O2 tested by upstream changeset
+# "Optimize i386 syscall inlining for GCC 5"
GLIBC_CONFIGURE:= \
BUILD_CC="$(HOSTCC)" \
$(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS)" \
+ CFLAGS="-O2 $(filter-out -Os,$(call qstrip,$(TARGET_CFLAGS)))" \
libc_cv_slibdir="/lib" \
use_ldconfig=no \
$(HOST_BUILD_DIR)/$(GLIBC_PATH)configure \
@@ -74,6 +81,7 @@ GLIBC_CONFIGURE:= \
--$(if $(CONFIG_SOFT_FLOAT),without,with)-fp
export libc_cv_ssp=no
+export libc_cv_ssp_strong=no
export ac_cv_header_cpuid_h=yes
export HOST_CFLAGS := $(HOST_CFLAGS) -idirafter $(CURDIR)/$(PATH_PREFIX)/include