From patchwork Wed Apr 25 15:45:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 904358 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (helo) smtp.helo=arrakis.dune.hu (client-ip=78.24.191.176; helo=arrakis.dune.hu; envelope-from=openwrt-devel-bounces@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="p8vDVer2"; dkim-atps=neutral Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40WPfn49BYz9ryk for ; Thu, 26 Apr 2018 01:45:34 +1000 (AEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 86FFEB80153; Wed, 25 Apr 2018 17:45:28 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP; Wed, 25 Apr 2018 17:45:28 +0200 (CEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id BAD64B80106 for ; Wed, 25 Apr 2018 17:45:26 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .gmail. - helo: .mail-wr0-f194.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -7 Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Wed, 25 Apr 2018 17:45:24 +0200 (CEST) Received: by mail-wr0-f194.google.com with SMTP id p5-v6so26038604wre.12 for ; Wed, 25 Apr 2018 08:45:24 -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:in-reply-to:references; bh=RY2LHgeE9gPtTteu2QbjFP1eMN1ib1uqUHNVxY0c1Oc=; b=p8vDVer2zCWczGIiwP5yTQlhggm4snjC7XjaQWN/ljHV7/fEynUIgnJWCBW8itm2bm UBQXmD7J06ZHXsl547RUN8Jun5/vXf6cQSuPa05ldi2IjZTVU6peTGZtjOW7loMVWu8k ZzPJyZJeC5Z9rs+nQZz81DZ4Q9blQvt01CkYWb/Hzy982RJm/EjLXUR7iSzqgsgUUwAy XFQUMJBMcBrL20rqqXbfzL/Moa3IWmSDu4aGdim8L3m5265vK61JUD+8g1XyaL0UzuSE bLIN6fc+aNzejIl4EttxVTQuw0Prt1cl/lzrVdDdBz1BKzg8gRJ+MOHhuQhsvIMEqwR/ MuOA== 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:in-reply-to :references; bh=RY2LHgeE9gPtTteu2QbjFP1eMN1ib1uqUHNVxY0c1Oc=; b=XeJLfu1gJaSjKxZo1VJVSnYgeORRhZ69qbgVPtoaujC8aIY/vsjd1+Arx+WK91QdxT P1FEGy+3eOw3GLRcVOMwA9wwI5gHWqnP8XQmngtveKcGGXgphPKXNVo9e3qAWOIMvk6R McHnGBoJ0gdwqAYjb9//MChVrZ27LOrF6LLFmJp+4Ou3tpbQP0ZgfP5y4JnCc5jZnkN8 UFBvveL7643gzdeCoU8WfbwFBbFD0wctqAcS9ZcMNQaKk4MISYm5CXlgxCKtRiE0cAlR bwgIuDETKwJYRCMEWpPwRxZ+dJv4QT15KCg6NdF4MAhgxkLKalnREmo/nSgjdvIB2ngX HRlw== X-Gm-Message-State: ALQs6tCGf9BO8lo7p+yRGeDAc3AWrU4mH11U/M2rzvyoYmkzgeqLuNsd bMAn1kYPf7NJfwIuMnJenLk= X-Google-Smtp-Source: AIpwx49AJU2hW8afU83A5CMoWngcYvNgHWRaE79kd1PoO92AYhrFkyvXkZNfOarNn1uq/uukWzmkOA== X-Received: by 2002:adf:8143:: with SMTP id 61-v6mr24835923wrm.240.1524671123449; Wed, 25 Apr 2018 08:45:23 -0700 (PDT) Received: from debian64.daheim (p5B0D7EAE.dip0.t-ipconnect.de. [91.13.126.174]) by smtp.gmail.com with ESMTPSA id f10-v6sm16945392wrg.0.2018.04.25.08.45.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Apr 2018 08:45:22 -0700 (PDT) Received: from chuck by debian64.daheim with local (Exim 4.91) (envelope-from ) id 1fBMbh-0004cJ-Qj; Wed, 25 Apr 2018 17:45:21 +0200 From: Christian Lamparter To: LEDE Development List , openwrt-devel@lists.openwrt.org Date: Wed, 25 Apr 2018 17:45:21 +0200 Message-Id: <20180425154521.17705-1-chunkeey@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180418204716.GI3094@brightrain.aerifal.cx> References: <20180418204716.GI3094@brightrain.aerifal.cx> Subject: [OpenWrt-Devel] [RFT] musl: 1.1.20 prelease testing in OpenWrt X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hauke Mehrtens , Rich Felker MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Rich Felker requested field testing of what will become musl 1.1.20: "The biggest areas that need testing are: - stdio locking after commits c21f750727515602a9e84f2a190ee8a0a2aeb2a1 and c1014a812c90bab3c9c989863e4ebb129e987de6. - reclaim_gaps since commit ce7ae11acfd9db8eb92cc6823c132e1825918d92. this could be tested by abusing __malloc_donate as if it were a public api. - malloc interposition -- seeing if replacement allocators actually work. (not so important since it wouldn't be a regression if it's broken, but would be nice to know it works before announcing)" 200-add_libssp_nonshared.patch was removed since Rich reworked the logic in c7bb9c41d2e62b7ad1c7858d4d0f2873642e634b "adjust makefile target-specific CFLAGS rules to be more robust & complete" and a7c53e0c2cd8fc45eac90c0468e44697019ceda6 "fix out-of-tree build of crt files with stack protector enabled" so please test. Signed-off-by: Christian Lamparter --- toolchain/musl/common.mk | 4 +- .../patches/200-add_libssp_nonshared.patch | 50 ------------------- toolchain/musl/patches/300-relative.patch | 2 +- ...ribute-to-some-function-declarations.patch | 8 +-- 4 files changed, 7 insertions(+), 57 deletions(-) delete mode 100644 toolchain/musl/patches/200-add_libssp_nonshared.patch diff --git a/toolchain/musl/common.mk b/toolchain/musl/common.mk index 87424646c3..a8abe8af69 100644 --- a/toolchain/musl/common.mk +++ b/toolchain/musl/common.mk @@ -13,8 +13,8 @@ PKG_RELEASE=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=55df09bfccbfe21fc9dd7d8f94550c0ff25ace04 -PKG_MIRROR_HASH:=eb94e4e7e94221dd8890afd9b29e2562c36cf5585649035349ca1c6c1c354f2b +PKG_SOURCE_VERSION:=b4b1e10364c8737a632be61582e05a8d3acf5690 +PKG_MIRROR_HASH:=1b0530313811897fee5ab22c6d6c7c8cbb6568736dcf09dea6e4d023350c9ecd PKG_SOURCE_URL:=git://git.musl-libc.org/musl PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz diff --git a/toolchain/musl/patches/200-add_libssp_nonshared.patch b/toolchain/musl/patches/200-add_libssp_nonshared.patch deleted file mode 100644 index 7a2909461b..0000000000 --- a/toolchain/musl/patches/200-add_libssp_nonshared.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 7ec87fbbc3cac99b4173d082dd6195f47c9a32e7 Mon Sep 17 00:00:00 2001 -From: Steven Barth -Date: Mon, 22 Jun 2015 11:01:56 +0200 -Subject: [PATCH] Add libssp_nonshared.a so GCC's is not needed - -Signed-off-by: Steven Barth ---- - Makefile | 10 ++++++++-- - libssp_nonshared/__stack_chk_fail_local.c | 2 ++ - 2 files changed, 10 insertions(+), 2 deletions(-) - create mode 100644 libssp_nonshared/__stack_chk_fail_local.c - ---- a/Makefile -+++ b/Makefile -@@ -66,7 +66,7 @@ CRT_LIBS = $(addprefix lib/,$(notdir $(C - STATIC_LIBS = lib/libc.a - SHARED_LIBS = lib/libc.so - TOOL_LIBS = lib/musl-gcc.specs --ALL_LIBS = $(CRT_LIBS) $(STATIC_LIBS) $(SHARED_LIBS) $(EMPTY_LIBS) $(TOOL_LIBS) -+ALL_LIBS = $(CRT_LIBS) $(STATIC_LIBS) $(SHARED_LIBS) $(EMPTY_LIBS) $(TOOL_LIBS) lib/libssp_nonshared.a - ALL_TOOLS = obj/musl-gcc - - WRAPCC_GCC = gcc -@@ -125,7 +125,8 @@ NOSSP_SRCS = $(wildcard crt/*.c) \ - src/thread/__set_thread_area.c src/thread/$(ARCH)/__set_thread_area.c \ - src/string/memset.c src/string/$(ARCH)/memset.c \ - src/string/memcpy.c src/string/$(ARCH)/memcpy.c \ -- ldso/dlstart.c ldso/dynlink.c -+ ldso/dlstart.c ldso/dynlink.c \ -+ src/libssp_nonshared/__stack_chk_fail_local.c - $(NOSSP_SRCS:%.c=obj/%.o) $(NOSSP_SRCS:%.c=obj/%.lo): CFLAGS_ALL += $(CFLAGS_NOSSP) - - $(CRT_OBJS): CFLAGS_ALL += -DCRT -@@ -168,6 +169,11 @@ lib/libc.a: $(AOBJS) - $(AR) rc $@ $(AOBJS) - $(RANLIB) $@ - -+lib/libssp_nonshared.a: obj/src/libssp_nonshared/__stack_chk_fail_local.o -+ rm -f $@ -+ $(AR) rc $@ $< -+ $(RANLIB) $@ -+ - $(EMPTY_LIBS): - rm -f $@ - $(AR) rc $@ ---- /dev/null -+++ b/src/libssp_nonshared/__stack_chk_fail_local.c -@@ -0,0 +1,2 @@ -+#include "atomic.h" -+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { a_crash(); } diff --git a/toolchain/musl/patches/300-relative.patch b/toolchain/musl/patches/300-relative.patch index 7e1eb7d6bc..e76867bb66 100644 --- a/toolchain/musl/patches/300-relative.patch +++ b/toolchain/musl/patches/300-relative.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -217,7 +217,7 @@ $(DESTDIR)$(includedir)/%: $(srcdir)/inc +@@ -208,7 +208,7 @@ $(DESTDIR)$(includedir)/%: $(srcdir)/inc $(INSTALL) -D -m 644 $< $@ $(DESTDIR)$(LDSO_PATHNAME): $(DESTDIR)$(libdir)/libc.so diff --git a/toolchain/musl/patches/400-Add-format-attribute-to-some-function-declarations.patch b/toolchain/musl/patches/400-Add-format-attribute-to-some-function-declarations.patch index 915b0b7b47..f7eff9141f 100644 --- a/toolchain/musl/patches/400-Add-format-attribute-to-some-function-declarations.patch +++ b/toolchain/musl/patches/400-Add-format-attribute-to-some-function-declarations.patch @@ -102,7 +102,7 @@ Signed-off-by: Hauke Mehrtens #ifdef __cplusplus #define NULL 0L #else -@@ -102,19 +110,19 @@ int puts(const char *); +@@ -103,19 +111,19 @@ int puts(const char *); int printf(const char *__restrict, ...); int fprintf(FILE *__restrict, const char *__restrict, ...); int sprintf(char *__restrict, const char *__restrict, ...); @@ -127,7 +127,7 @@ Signed-off-by: Hauke Mehrtens void perror(const char *); -@@ -135,8 +143,8 @@ int pclose(FILE *); +@@ -136,8 +144,8 @@ int pclose(FILE *); int fileno(FILE *); int fseeko(FILE *, off_t, int); off_t ftello(FILE *); @@ -138,7 +138,7 @@ Signed-off-by: Hauke Mehrtens void flockfile(FILE *); int ftrylockfile(FILE *); void funlockfile(FILE *); -@@ -175,8 +183,8 @@ int fileno_unlocked(FILE *); +@@ -176,8 +184,8 @@ int fileno_unlocked(FILE *); int getw(FILE *); int putw(int, FILE *); char *fgetln(FILE *, size_t *); @@ -149,7 +149,7 @@ Signed-off-by: Hauke Mehrtens #endif #ifdef _GNU_SOURCE -@@ -198,6 +206,9 @@ typedef struct _IO_cookie_io_functions_t +@@ -199,6 +207,9 @@ typedef struct _IO_cookie_io_functions_t FILE *fopencookie(void *, const char *, cookie_io_functions_t); #endif