summaryrefslogtreecommitdiff
path: root/toolchain
diff options
context:
space:
mode:
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/glibc/Makefile12
-rw-r--r--toolchain/glibc/Makefile.inc12
2 files changed, 8 insertions, 16 deletions
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index 3b3220b73..d0ce23117 100644
--- a/toolchain/glibc/Makefile
+++ b/toolchain/glibc/Makefile
@@ -15,6 +15,7 @@ endif
GLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \
--host=$(GNU_TARGET_NAME) \
--with-headers=$(STAGING_TARGET_DIR)/usr/include \
+ --enable-stackguard-randomization \
--disable-sanity-checks \
--disable-nls \
--disable-werror \
@@ -25,20 +26,12 @@ GLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \
--with-__thread \
--with-tls \
--enable-shared \
- --enable-kernel="2.6.32" \
- --enable-add-ons
+ --enable-kernel="2.6.32"
ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y)
GLIBC_CONFOPTS+= --enable-static-nss
endif
-ifeq ($(ADK_TARGET_FLOAT),soft)
-GLIBC_CONFOPTS+= --without-fp
-endif
-ifeq ($(ADK_TARGET_FLOAT),hard)
-GLIBC_CONFOPTS+= --with-fp
-endif
-
GLIBC_ENV:= PATH='${TARGET_PATH}' \
BUILD_CC=${CC_FOR_BUILD} \
CFLAGS="$(TARGET_CFLAGS)" \
@@ -66,7 +59,6 @@ $(WRKBUILD)/.configured:
${GLIBC_ENV} \
$(WRKBUILD)/configure \
--prefix=/usr \
- --enable-stackguard-randomization \
${GLIBC_CONFOPTS} \
);
touch $@
diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc
index 134953c4c..8683b2349 100644
--- a/toolchain/glibc/Makefile.inc
+++ b/toolchain/glibc/Makefile.inc
@@ -3,17 +3,17 @@
PKG_NAME:= glibc
ifeq ($(ADK_LIBC_VERSION),git)
-PKG_VERSION:= 2.26.90
-PKG_GLIBCVER:= 2.26.9000
+PKG_VERSION:= 2.27.90
+PKG_GLIBCVER:= 2.27.9000
PKG_SITES:= git://sourceware.org/git/glibc.git
PKG_RELEASE:= 1
endif
-ifeq ($(ADK_TARGET_LIB_GLIBC_2_26),y)
-PKG_VERSION:= 2.26
-PKG_GLIBCVER:= 2.26
+ifeq ($(ADK_TARGET_LIB_GLIBC_2_27),y)
+PKG_VERSION:= 2.27
+PKG_GLIBCVER:= 2.27
PKG_RELEASE:= 1
PKG_SITES:= ${MASTER_SITE_GNU:=glibc/}
-PKG_HASH:= e54e0a934cd2bc94429be79da5e9385898d2306b9eaf3c92d5a77af96190f6bd
+PKG_HASH:= 5172de54318ec0b7f2735e5a91d908afe1c9ca291fec16b5374d9faadfc1fc72
endif
ifeq ($(ADK_TARGET_LIB_GLIBC_CSKY),y)
PKG_VERSION:= master