From patchwork Wed Apr 18 07:34:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 133599 Delivered-To: patch@linaro.org Received: by 10.46.84.18 with SMTP id i18csp5585826ljb; Wed, 18 Apr 2018 00:34:37 -0700 (PDT) X-Google-Smtp-Source: AIpwx489aH9VyA8tvYk5ABDI/KnDenCXTXcJnY8GtKdc1O7NpqViSPblo4z96hmKEG6gdw0s9T5x X-Received: by 10.99.2.199 with SMTP id 190mr897176pgc.11.1524036877190; Wed, 18 Apr 2018 00:34:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524036877; cv=none; d=google.com; s=arc-20160816; b=z+F2zesxSldi0sPqIhdUR3vAuoRifT6Q3Jt6mtx1Ckq+FM479p9RV9MJeCvdHsmTs0 aZ4XzGRsn6/oJlTe75IeYzW6eIvyB/b7O1wYgF6PtPvw8AOXsXtQD0ixL/lfJOibUnMo zJ0CtlLvzj9vcDfPUEcFAGCyN7TL7UItkT+XcExu9lcdmvg0qWUMlNEOJY4QFDSigG9s g5dfSXgSv4wlmB60hjHtBEwISl0rlWELw+OMu9LvNZL+YbSu9AkQeFKRArPgyGhLM2sO panR+5Jz+T9RDDmNalUvQTkcOlNviWg4Yz6DgMzjW+5UELBqg92Ha0mSR0FxfGw8eIsW +Qyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=vJ0GW6t5frLDpdzMHtVAd8S7v13mTrvTNWokZT3RUY4=; b=qW2wne2803+cYVkfkodBdw+av0n52fGU6kFzxR5RqYpFrVp6joqLTgPDg2z/WTIVA6 uTaFa6Z9gdWAp4i2vAb1+BrtLCzNpVexEe82NUNycUdupa6yASY7ry8g6RcMcopNoXEP f7pGOjecZkpBRIj+ixCSAjDOgpOE8GwfdmqE+Ka4t5ds77laujgnnv1zCUo7SV6hKWpg d3Dv51y47DV/hYPrCLLWaf0rE6dybjEYmpV7mFCFSThfxlA5B2xHVJ0y7EfKsF94QnX6 9qSNE6VQ7RcbgXFnIWm98UTWGYY51XttQL8Zs/gG6jVD703UKy1psWoG3gDlSm3hqL87 Na3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=sXAdfm8n; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id r17si635250pge.5.2018.04.18.00.34.36; Wed, 18 Apr 2018 00:34:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=sXAdfm8n; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 0BB14744B7; Wed, 18 Apr 2018 07:34:32 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg0-f47.google.com (mail-pg0-f47.google.com [74.125.83.47]) by mail.openembedded.org (Postfix) with ESMTP id E3F6B6FFA1 for ; Wed, 18 Apr 2018 07:34:30 +0000 (UTC) Received: by mail-pg0-f47.google.com with SMTP id z21so445034pgv.12 for ; Wed, 18 Apr 2018 00:34:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=6YpfYKJ5m6M2YCZoCSAyJxhvbef0rGobCTHb/DMS/FE=; b=sXAdfm8n9EWZ5lr2FdFB8CTSrpwJKyN7cK5x4DvB5SxZSRXz+7p/Q1WPT7gLtwvOZE FdBT0NHf0+MZhk3GVqmdVHtVeFtZI69fllufli6SLj8N4HCe8yfEErxh88cY2tu8ko2+ +7Is9TbxL7PPs7s/M1c4X92UVnT18iO8PBRnHaMgaVXtSZDuPo0JLyESI85mno4JQ/dq KeRWyeGDBw46M+RuYSlIhUL+uWImbxaV6FllEHsvyhjSBMNZNySfk1Whtne4271fgtOe RrJI6xoJqmMUEiAT4sSOkzQ5Yfn7mr9xjLFNiVYC+HMOxrR3l2hg7AqzES/3OV1hAeR4 FEjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=6YpfYKJ5m6M2YCZoCSAyJxhvbef0rGobCTHb/DMS/FE=; b=IxR3FURVH9v+Oe9O6B223p2LLy3qDQknGAQseho+fal4fmQPP/o24m8Ep3R4bHZto7 mvtC1xtguHzqc8twRmys3/IhwMAFh6it9yeMu9PkRSXXznUEMw4+QZkPqBywnjIeLHhy wzQnZU61AT2y1Le8ohPJ5w3/yCUC3MDSWfbTEC0Vqin2DdH91N2dDt4qi3W2JOkS8GTJ VfqVKFqc4ho2hturXeMlo07yzGeymgLjFSrQto126aFLWCu2/4ybmp8I8RA29O/ElbCN IgcN+KaDp3VZqMWZZsAv7ZnJ4OaJzjBjjF0jLmxMYarCmpLw1ebal1tAZQ4HPjkBsu8O H6UA== X-Gm-Message-State: ALQs6tCzE9pkce4n468vrlIVCKwDE3MP28AWcKdJjpdHe51v+FrzMd95 tYk5JDY/pYF1Nrf2v0732wS7vg== X-Received: by 10.99.55.1 with SMTP id e1mr862293pga.237.1524036871324; Wed, 18 Apr 2018 00:34:31 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8880:466c::487b]) by smtp.gmail.com with ESMTPSA id e190sm1307605pfe.171.2018.04.18.00.34.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Apr 2018 00:34:30 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Wed, 18 Apr 2018 00:34:19 -0700 Message-Id: <20180418073419.14011-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.0 Subject: [OE-core] [PATCH V2 3/4] gcc-runtime: Disable gcc version of libssp X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org libssp is implemented fully in glibc as well as in musl so we really do not need the gcc version of this library except may be for mingw, where we keep it enabled anyway gcc in OE is built with the knowledge that C library already provides libssp implementation, we should therefore not need the gcc implementation of same. libssp_nonshared piece is a detail which is needed when gcc is the compiler, in glibc this is part of libc_nonshared.a already and libc_nonshared.a is linked always when linking with -lc becuase libc.so in glibc is actually a linker script GROUP ( /usr/lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /usr/lib/ld-linux-x86-64.so.2 ) ) which automatically links in the needed runtime bits, this however is not the case for musl, where core SSP APIs are implemented in full but compiler specific runtime isn't, for this we add a new package called libssp_nonshared which generate the needed runtime stub and gcc is already carrying patch to link to libssp_nonshared.a on musl This should fix a long standing problem where static PIE executable were not buildable with OE since it was conflicting SSP implementation one from C library and the other one from gcc and we end up with duplicate symbol errors during linking. Backport a patch from trunk which enhances enable|disable-libssp to not only disable building libssp but also not emit the gcc specs to use it for subsequent linking when stack-protector options are used on compiler cmdline Signed-off-by: Khem Raj --- Changes since v1: - Backport a patch to enhance semantics of enable|disable-libssp - Pass SSP option to gcc initial recipes as well meta/recipes-devtools/gcc/gcc-7.3.inc | 7 +- ...cc-override-TARGET_LIBC_PROVIDES_SSP.patch | 204 ++++++++++++++++++ meta/recipes-devtools/gcc/gcc-runtime.inc | 4 +- 3 files changed, 212 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-devtools/gcc/gcc-7.3/0049-gcc-override-TARGET_LIBC_PROVIDES_SSP.patch -- 2.17.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/gcc/gcc-7.3.inc b/meta/recipes-devtools/gcc/gcc-7.3.inc index d968c322d2..98e5383b3c 100644 --- a/meta/recipes-devtools/gcc/gcc-7.3.inc +++ b/meta/recipes-devtools/gcc/gcc-7.3.inc @@ -72,6 +72,7 @@ SRC_URI = "\ file://0045-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch \ file://0047-sync-gcc-stddef.h-with-musl.patch \ file://0048-gcc-Enable-static-PIE.patch \ + file://0049-gcc-override-TARGET_LIBC_PROVIDES_SSP.patch \ file://fix-segmentation-fault-precompiled-hdr.patch \ file://no-sse-fix-test-case-failures.patch \ ${BACKPORTS} \ @@ -93,10 +94,12 @@ FORTRAN = "" JAVA = "" LTO = "--enable-lto" +SSP ?= "--disable-libssp" +SSP_mingw = "--enable-libssp" EXTRA_OECONF_BASE = "\ ${LTO} \ - --enable-libssp \ + ${SSP} \ --enable-libitm \ --disable-bootstrap \ --disable-libmudflap \ @@ -120,7 +123,7 @@ EXTRA_OECONF_INITIAL = "\ --disable-plugin \ --enable-decimal-float=no \ --without-isl \ - gcc_cv_libc_provides_ssp=yes \ + ${SSP} \ " EXTRA_OECONF_PATHS = "\ diff --git a/meta/recipes-devtools/gcc/gcc-7.3/0049-gcc-override-TARGET_LIBC_PROVIDES_SSP.patch b/meta/recipes-devtools/gcc/gcc-7.3/0049-gcc-override-TARGET_LIBC_PROVIDES_SSP.patch new file mode 100644 index 0000000000..7c53c95c3a --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-7.3/0049-gcc-override-TARGET_LIBC_PROVIDES_SSP.patch @@ -0,0 +1,204 @@ +From 9815bd97561c778ee0bc0c17f245e88e66570111 Mon Sep 17 00:00:00 2001 +From: sandra +Date: Wed, 1 Nov 2017 02:14:19 +0000 +Subject: [PATCH] 2017-10-31 Sandra Loosemore + + gcc/ + * configure.ac (--enable-libssp): New. + (gcc_cv_libc_provides_ssp): Check for explicit setting before + trying to determine target-specific default. Adjust indentation. + * configure: Regenerated. + * doc/install.texi (Configuration): Expand --disable-libssp + documentation. + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@254288 138bc75d-0d04-0410-961f-82ee72b054a4 +--- +Signed-off-by: Khem Raj +Upstream-Status: Backport [https://patchwork.ozlabs.org/patch/823049/] + + gcc/ChangeLog | 9 +++++++++ + gcc/configure | 26 +++++++++++++++++++++++--- + gcc/configure.ac | 24 ++++++++++++++++++++---- + gcc/doc/install.texi | 3 ++- + 4 files changed, 54 insertions(+), 8 deletions(-) + +Index: gcc-7.3.0/gcc/configure.ac +=================================================================== +--- gcc-7.3.0.orig/gcc/configure.ac ++++ gcc-7.3.0/gcc/configure.ac +@@ -5719,10 +5719,25 @@ if test x$gcc_cv_solaris_crts = xyes; th + [Define if the system-provided CRTs are present on Solaris.]) + fi + ++AC_ARG_ENABLE(libssp, ++[AS_HELP_STRING([--enable-libssp], [enable linking against libssp])], ++[case "${enableval}" in ++ yes|no) ++ ;; ++ *) ++ AC_MSG_ERROR([unknown libssp setting $enableval]) ++ ;; ++esac], []) ++ + # Test for stack protector support in target C library. + AC_CACHE_CHECK(__stack_chk_fail in target C library, +- gcc_cv_libc_provides_ssp, +- [gcc_cv_libc_provides_ssp=no ++ gcc_cv_libc_provides_ssp, ++ [gcc_cv_libc_provides_ssp=no ++ if test "x$enable_libssp" = "xno"; then ++ gcc_cv_libc_provides_ssp=yes ++ elif test "x$enable_libssp" = "xyes"; then ++ gcc_cv_libc_provides_ssp=no ++ else + case "$target" in + *-*-musl*) + # All versions of musl provide stack protector +@@ -5759,8 +5774,9 @@ AC_CACHE_CHECK(__stack_chk_fail in targe + AC_CHECK_FUNC(__stack_chk_fail,[gcc_cv_libc_provides_ssp=yes], + [echo "no __stack_chk_fail on this target"]) + ;; +- *) gcc_cv_libc_provides_ssp=no ;; +- esac]) ++ *) gcc_cv_libc_provides_ssp=no ;; ++ esac ++ fi]) + + if test x$gcc_cv_libc_provides_ssp = xyes; then + AC_DEFINE(TARGET_LIBC_PROVIDES_SSP, 1, +Index: gcc-7.3.0/gcc/doc/install.texi +=================================================================== +--- gcc-7.3.0.orig/gcc/doc/install.texi ++++ gcc-7.3.0/gcc/doc/install.texi +@@ -1658,7 +1658,8 @@ not be built. + + @item --disable-libssp + Specify that the run-time libraries for stack smashing protection +-should not be built. ++should not be built or linked against. On many targets library support ++is provided by the C library instead. + + @item --disable-libquadmath + Specify that the GCC quad-precision math library should not be built. +Index: gcc-7.3.0/gcc/configure +=================================================================== +--- gcc-7.3.0.orig/gcc/configure ++++ gcc-7.3.0/gcc/configure +@@ -940,6 +940,7 @@ enable_fix_cortex_a53_843419 + with_glibc_version + enable_gnu_unique_object + enable_linker_build_id ++enable_libssp + enable_default_ssp + with_long_double_128 + with_gc +@@ -1679,6 +1680,7 @@ Optional Features: + extension on glibc systems + --enable-linker-build-id + compiler will always pass --build-id to linker ++ --enable-libssp enable linking against libssp + --enable-default-ssp enable Stack Smashing Protection as default + --enable-maintainer-mode + enable make rules and dependencies not useful (and +@@ -18450,7 +18452,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 18436 "configure" ++#line 18455 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -18556,7 +18558,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 18542 "configure" ++#line 18561 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -25234,6 +25236,7 @@ $as_echo "#define HAVE_AS_SPARC5_VIS4 1" + + fi + ++ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler for SPARC6 instructions" >&5 + $as_echo_n "checking assembler for SPARC6 instructions... " >&6; } + if test "${gcc_cv_as_sparc_sparc6+set}" = set; then : +@@ -25270,6 +25273,7 @@ $as_echo "#define HAVE_AS_SPARC6 1" >>co + + fi + ++ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler for LEON instructions" >&5 + $as_echo_n "checking assembler for LEON instructions... " >&6; } + if test "${gcc_cv_as_sparc_leon+set}" = set; then : +@@ -28947,6 +28951,18 @@ $as_echo "#define HAVE_SOLARIS_CRTS 1" > + + fi + ++# Check whether --enable-libssp was given. ++if test "${enable_libssp+set}" = set; then : ++ enableval=$enable_libssp; case "${enableval}" in ++ yes|no) ++ ;; ++ *) ++ as_fn_error "unknown libssp setting $enableval" "$LINENO" 5 ++ ;; ++esac ++fi ++ ++ + # Test for stack protector support in target C library. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking __stack_chk_fail in target C library" >&5 + $as_echo_n "checking __stack_chk_fail in target C library... " >&6; } +@@ -28954,6 +28970,11 @@ if test "${gcc_cv_libc_provides_ssp+set} + $as_echo_n "(cached) " >&6 + else + gcc_cv_libc_provides_ssp=no ++ if test "x$enable_libssp" = "xno"; then ++ gcc_cv_libc_provides_ssp=yes ++ elif test "x$enable_libssp" = "xyes"; then ++ gcc_cv_libc_provides_ssp=no ++ else + case "$target" in + *-*-musl*) + # All versions of musl provide stack protector +@@ -29001,8 +29022,9 @@ else + fi + + ;; +- *) gcc_cv_libc_provides_ssp=no ;; ++ *) gcc_cv_libc_provides_ssp=no ;; + esac ++ fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_libc_provides_ssp" >&5 + $as_echo "$gcc_cv_libc_provides_ssp" >&6; } +@@ -29037,18 +29059,15 @@ fi + + + # Test for on the target. +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5 +-$as_echo_n "checking sys/sdt.h in the target C library... " >&6; } +-have_sys_sdt_h=no ++#GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H]) ++#AC_MSG_CHECKING(sys/sdt.h in the target C library) ++#have_sys_sdt_h=no + #if test -f $target_header_dir/sys/sdt.h; then + # have_sys_sdt_h=yes +-# +-#$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h +-# ++# AC_DEFINE(HAVE_SYS_SDT_H, 1, ++# [Define if your target C library provides sys/sdt.h]) + #fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_sys_sdt_h" >&5 +-$as_echo "$have_sys_sdt_h" >&6; } ++#AC_MSG_RESULT($have_sys_sdt_h) + + # Check if TFmode long double should be used by default or not. + # Some glibc targets used DFmode long double, but with glibc 2.4 diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc index 97365a21dc..b4e5539575 100644 --- a/meta/recipes-devtools/gcc/gcc-runtime.inc +++ b/meta/recipes-devtools/gcc/gcc-runtime.inc @@ -24,8 +24,10 @@ RUNTIMELIBITM_nios2 = "" RUNTIMELIBITM_microblaze = "" RUNTIMELIBITM_riscv32 = "" RUNTIMELIBITM_riscv64 = "" +RUNTIMELIBSSP ?= "" +RUNTIMELIBSSP_mingw ?= "libssp" -RUNTIMETARGET = "libssp libstdc++-v3 libgomp libatomic ${RUNTIMELIBITM} \ +RUNTIMETARGET = "libstdc++-v3 libgomp libatomic ${RUNTIMELIBITM} \ ${@bb.utils.contains_any('FORTRAN', [',fortran',',f77'], 'libquadmath', '', d)} \ " RUNTIMETARGET_append_x86 = " libmpx"