mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 08:21:14 +00:00
b933f9cf0c
Removes the standalone implementation of stack smashing protection in gcc's libssp in favour of the native implementation available in glibc and uclibc. Musl libc already uses its native ssp, so this patch does not affect musl-based toolchains. Stack smashing protection configuration options are now uniform across all supported libc variants. This also makes kernel-level stack smashing protection available for x86_64 and i386 builds using non-musl libc. Signed-off-by: Ian Cooper <iancooper@hotmail.com>
101 lines
3.0 KiB
Makefile
101 lines
3.0 KiB
Makefile
#
|
|
# Copyright (C) 2006-2016 OpenWrt.org
|
|
#
|
|
# This is free software, licensed under the GNU General Public License v2.
|
|
# See /LICENSE for more information.
|
|
#
|
|
include $(TOPDIR)/rules.mk
|
|
|
|
PKG_NAME:=glibc
|
|
PKG_VERSION:=2.31
|
|
|
|
PKG_SOURCE_PROTO:=git
|
|
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
|
PKG_SOURCE_VERSION:=3a44844c97a8ca1d0798c45b5252e6a49f9cf8e1
|
|
PKG_MIRROR_HASH:=d7206510e494b3c723173d8ec0dd2e41314da59075871c5642324688001b3f6e
|
|
PKG_SOURCE_URL:=https://sourceware.org/git/glibc.git
|
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
|
|
|
|
HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_SOURCE_SUBDIR)
|
|
CUR_BUILD_DIR:=$(HOST_BUILD_DIR)-$(VARIANT)
|
|
PATCH_DIR:=$(PATH_PREFIX)/patches
|
|
|
|
include $(INCLUDE_DIR)/toolchain-build.mk
|
|
|
|
HOST_STAMP_PREPARED:=$(HOST_BUILD_DIR)/.prepared
|
|
HOST_STAMP_CONFIGURED:=$(CUR_BUILD_DIR)/.configured
|
|
HOST_STAMP_BUILT:=$(CUR_BUILD_DIR)/.built
|
|
HOST_STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.glibc_$(VARIANT)_installed
|
|
|
|
ifeq ($(ARCH),mips64)
|
|
ifdef CONFIG_MIPS64_ABI_N64
|
|
TARGET_CFLAGS += -mabi=64
|
|
endif
|
|
ifdef CONFIG_MIPS64_ABI_N32
|
|
TARGET_CFLAGS += -mabi=n32
|
|
endif
|
|
ifdef CONFIG_MIPS64_ABI_O32
|
|
TARGET_CFLAGS += -mabi=32
|
|
endif
|
|
endif
|
|
|
|
# -Os miscompiles w. 2.24 gcc5/gcc6
|
|
# only -O2 tested by upstream changeset
|
|
# "Optimize i386 syscall inlining for GCC 5"
|
|
GLIBC_CONFIGURE:= \
|
|
unset LD_LIBRARY_PATH; \
|
|
BUILD_CC="$(HOSTCC)" \
|
|
$(TARGET_CONFIGURE_OPTS) \
|
|
CFLAGS="-O2 $(filter-out -Os,$(call qstrip,$(TARGET_CFLAGS)))" \
|
|
libc_cv_slibdir="/lib" \
|
|
use_ldconfig=no \
|
|
$(HOST_BUILD_DIR)/$(GLIBC_PATH)configure \
|
|
--prefix= \
|
|
--build=$(GNU_HOST_NAME) \
|
|
--host=$(REAL_GNU_TARGET_NAME) \
|
|
--with-headers=$(TOOLCHAIN_DIR)/include \
|
|
--disable-profile \
|
|
--disable-werror \
|
|
--without-gd \
|
|
--without-cvs \
|
|
--enable-add-ons \
|
|
--$(if $(CONFIG_SOFT_FLOAT),without,with)-fp \
|
|
$(if $(CONFIG_PKG_CC_STACKPROTECTOR_REGULAR),--enable-stack-protector=yes) \
|
|
$(if $(CONFIG_PKG_CC_STACKPROTECTOR_STRONG),--enable-stack-protector=strong) \
|
|
--enable-kernel=4.14.0
|
|
|
|
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
|
|
|
|
define Host/SetToolchainInfo
|
|
$(SED) 's,^\(LIBC_TYPE\)=.*,\1=$(PKG_NAME),' $(TOOLCHAIN_DIR)/info.mk
|
|
$(SED) 's,^\(LIBC_URL\)=.*,\1=http://www.gnu.org/software/libc/,' $(TOOLCHAIN_DIR)/info.mk
|
|
$(SED) 's,^\(LIBC_VERSION\)=.*,\1=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk
|
|
$(SED) 's,^\(LIBC_SO_VERSION\)=.*,\1=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk
|
|
endef
|
|
|
|
define Host/Configure
|
|
[ -f $(HOST_BUILD_DIR)/.autoconf ] || { \
|
|
cd $(HOST_BUILD_DIR)/; \
|
|
autoconf --force && \
|
|
touch $(HOST_BUILD_DIR)/.autoconf; \
|
|
}
|
|
mkdir -p $(CUR_BUILD_DIR)
|
|
( cd $(CUR_BUILD_DIR); rm -f config.cache; \
|
|
$(GLIBC_CONFIGURE) \
|
|
);
|
|
endef
|
|
|
|
define Host/Prepare
|
|
$(call Host/Prepare/Default)
|
|
ln -snf $(PKG_SOURCE_SUBDIR) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
|
|
endef
|
|
|
|
define Host/Clean
|
|
rm -rf $(CUR_BUILD_DIR)* \
|
|
$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev \
|
|
$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
|
|
endef
|