Browse Source

glibc: update to 2.27

Waldemar Brodkorb 6 years ago
parent
commit
50eb73f072
3 changed files with 12 additions and 20 deletions
  1. 4 4
      target/config/Config.in.libc
  2. 2 10
      toolchain/glibc/Makefile
  3. 6 6
      toolchain/glibc/Makefile.inc

+ 4 - 4
target/config/Config.in.libc

@@ -148,9 +148,9 @@ config ADK_TARGET_LIB_UCLIBC_NG_GIT
 	bool "git"
 	depends on ADK_TARGET_LIB_UCLIBC_NG
 
-config ADK_TARGET_LIB_GLIBC_2_26
-	bool "2.26"
-	depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_RISCV32 && !ADK_TARGET_ARCH_RISCV64 && !ADK_TARGET_ARCH_CSKY
+config ADK_TARGET_LIB_GLIBC_2_27
+	bool "2.27"
+	depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_CSKY
 
 config ADK_TARGET_LIB_GLIBC_CSKY
         bool "csky"
@@ -238,7 +238,7 @@ config ADK_LIBC_VERSION
 	string
 	default "1.0.28" if ADK_TARGET_LIB_UCLIBC_NG_1_0_28
 	default "1.1.18" if ADK_TARGET_LIB_MUSL_1_1_18
-	default "2.26" if ADK_TARGET_LIB_GLIBC_2_26
+	default "2.27" if ADK_TARGET_LIB_GLIBC_2_27
 	default "2.4.0" if ADK_TARGET_LIB_NEWLIB_2_4_0
 	default "2.4.0-riscv" if ADK_TARGET_LIB_NEWLIB_RISCV
 	default "git" if ADK_TARGET_LIB_UCLIBC_NG_GIT || \

+ 2 - 10
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 $@

+ 6 - 6
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