From patchwork Mon Dec 11 10:52:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 846897 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="O5YQcAHi"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ywKYL0Kj2z9s7m for ; Mon, 11 Dec 2017 21:52:52 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 9B21E30148; Mon, 11 Dec 2017 10:52:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VABMIzsYbH69; Mon, 11 Dec 2017 10:52:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 6BD9B2FE2A; Mon, 11 Dec 2017 10:52:47 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 62A891BFFA2 for ; Mon, 11 Dec 2017 10:52:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 5C08F2FE2A for ; Mon, 11 Dec 2017 10:52:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BLCq8V2vHw0o for ; Mon, 11 Dec 2017 10:52:45 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by silver.osuosl.org (Postfix) with ESMTPS id 73EF02EB58 for ; Mon, 11 Dec 2017 10:52:45 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id j9so10642847pgc.11 for ; Mon, 11 Dec 2017 02:52:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=mhhvpsGpjVl1yT7g8KlzU3slV+SgBss5KmCHVe5ieDQ=; b=O5YQcAHiFw0q2lGJbZBC9ZaW10mYLp5yX3G4r2vse0HXwKBdoVmY/2ieROTOThe5/C SJkMFvnhDC7htB8gLIw6iQk1wPDMIOk4vsQTdfaRMVSiUHElw+sVBrTBE7te0DZOq+Qi ht1xFFxpNQfE4eBElFroxwsYlrTpQlmE0MZNQdD1EZn6quQ54OAE+QvsUrYCK+9GldBa cbGSSuj/Tgi/Raunqr7vJw4G9kmpeqKoc58J0TZyXqIpot4WZB5gZw7XP644LQoCi0/f FUGu2i/QvRyKUIFIluih/LC7VkRkC6jOJ/CZemWojCW4nD/QbCKVd3XFv8ADi3+xosVH Wx0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=mhhvpsGpjVl1yT7g8KlzU3slV+SgBss5KmCHVe5ieDQ=; b=oM4VNe+yK0c7miQT2VVTClRq6wtUjCt6a607YO7Vkr5AYP2P/OAP3ZSe/k53HaJljm FKGEQm47ABjlWmNBTSA8gkNAP82F1J368zWrJileFpt+D+Ts98aaD4lkht5OdIrT9pqu K+F9mfVyV+O1N15BsoTxLT6Ib8SEH6T7UbQiwVeHS+Ovna4V04ecYMWRwfaFs99X1FbW sYuMTwoLE+8cDViQXIBKt/7G1r/tZWwTgLJBoRpbYdR/kA6s4R9z0eXpbwjiNGqyaq+1 VaRqhjGzGeXen33Vu7Vda/f6K7TD/wgaW+P+y8y3S3AELWN6rFmUf9TVLcFtRjLyeCFA 4VmQ== X-Gm-Message-State: AKGB3mKIEyQqz8ccBmkXE6j67bHqOidmbV32Qd5wK6yVhSy2uYG9OvoR k2Xlflp8dSt0qJaYdTNsKYPtRfhw8j8= X-Google-Smtp-Source: ACJfBoujk3AHwISBTnR8BGxUXpk+mlwuKdnpXciO24j3pZ7yepcwbTThgVfuqN1LLxdrCGjY0KlT1w== X-Received: by 10.159.203.132 with SMTP id ay4mr6119004plb.237.1512989564247; Mon, 11 Dec 2017 02:52:44 -0800 (PST) Received: from aurora.jms.id.au ([45.124.203.15]) by smtp.gmail.com with ESMTPSA id t75sm22914555pgc.12.2017.12.11.02.52.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Dec 2017 02:52:43 -0800 (PST) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Mon, 11 Dec 2017 21:22:36 +1030 From: Joel Stanley To: buildroot@buildroot.org Date: Mon, 11 Dec 2017 21:22:30 +1030 Message-Id: <20171211105230.11117-1-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 Subject: [Buildroot] [PATCH] pdbg: Bump version X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alistair Popple MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Contains the upstreamed build fix for Blackfin and various other bug fixes. Signed-off-by: Joel Stanley --- Thanks again Thomas for your work! I reworked your patch a bit and got it applied upstream. ...fix-to-build-on-architecture-with-non-emp.patch | 63 ---------------------- package/pdbg/pdbg.hash | 2 +- package/pdbg/pdbg.mk | 2 +- 3 files changed, 2 insertions(+), 65 deletions(-) delete mode 100644 package/pdbg/0001-template.S-fix-to-build-on-architecture-with-non-emp.patch diff --git a/package/pdbg/0001-template.S-fix-to-build-on-architecture-with-non-emp.patch b/package/pdbg/0001-template.S-fix-to-build-on-architecture-with-non-emp.patch deleted file mode 100644 index 15c0eef61140..000000000000 --- a/package/pdbg/0001-template.S-fix-to-build-on-architecture-with-non-emp.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 50ae93273376ede704012030009c29bd58d6a569 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 26 Nov 2017 16:22:25 +0100 -Subject: [PATCH] template.S: fix to build on architecture with non-empty - __USER_LABEL_PREFIX__ - -Blackfin has a non-empty __USER_LABEL_PREFIX__, which means that a -symbol called "foo" in C must be named "_foo" in assembler. - -Interestingly, it seems like "$(CC) -xassembler - -c" doesn't pass the -input source file through the C preprocessor, so we do this -explicitly. - -Submitted-upstream: https://github.com/open-power/pdbg/pull/26 -Signed-off-by: Thomas Petazzoni ---- - Makefile.am | 2 +- - template.S | 22 +++++++++++++++------- - 2 files changed, 16 insertions(+), 8 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 9d34bff..82e0856 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -62,4 +62,4 @@ p9z-fsi.dtb.o: p9z-fsi.dts p9-fsi.dtsi - %.dtb.o: %.dts - dtc -i$(dir $@) -I dts $< -O dtb > $@.tmp - symbol_prefix=`echo $@ | tr '.-' '_'` ; \ -- sed "s%SYMBOL_PREFIX%$${symbol_prefix}%g; s%FILENAME%$@.tmp%g" $(top_srcdir)/template.S | $(CC) -xassembler - -c -o $@ -+ sed "s%SYMBOL_PREFIX%$${symbol_prefix}%g; s%FILENAME%$@.tmp%g" $(top_srcdir)/template.S | $(CPP) - | $(CC) -xassembler - -c -o $@ -diff --git a/template.S b/template.S -index 2e6cbdb..1407a7c 100644 ---- a/template.S -+++ b/template.S -@@ -1,10 +1,18 @@ -+#ifdef __USER_LABEL_PREFIX__ -+#define CONCAT1(a, b) CONCAT2(a, b) -+#define CONCAT2(a, b) a ## b -+#define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x) -+#else -+#define SYM(x) x -+#endif -+ - .section .data --_binary_SYMBOL_PREFIX_start: -+SYM(_binary_SYMBOL_PREFIX_start): - .incbin "FILENAME" - .align 4 --_binary_SYMBOL_PREFIX_end: --_binary_SYMBOL_PREFIX_size: -- .long _binary_SYMBOL_PREFIX_end - _binary_SYMBOL_PREFIX_start --.globl _binary_SYMBOL_PREFIX_start --.globl _binary_SYMBOL_PREFIX_end --.globl _binary_SYMBOL_PREFIX_size -+SYM(_binary_SYMBOL_PREFIX_end): -+SYM(_binary_SYMBOL_PREFIX_size): -+ .long SYM(_binary_SYMBOL_PREFIX_end) - SYM(_binary_SYMBOL_PREFIX_start) -+.globl SYM(_binary_SYMBOL_PREFIX_start) -+.globl SYM(_binary_SYMBOL_PREFIX_end) -+.globl SYM(_binary_SYMBOL_PREFIX_size) --- -2.13.6 - diff --git a/package/pdbg/pdbg.hash b/package/pdbg/pdbg.hash index 6fef1280847a..39aa33e12ce8 100644 --- a/package/pdbg/pdbg.hash +++ b/package/pdbg/pdbg.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 e9143607b0d15693ace9f50b27f931020127a9d605c45f8609f1fe8608be7949 pdbg-527fe54e1c95e031efd3db008c3f4e096cb3ea58.tar.gz +sha256 2d6174d30b12cb46d24c260ecc0714a757c2cb899be3f5106c148d4c359bd319 pdbg-139ba071c222a5b0c20075f7c2265029ddd59449.tar.gz diff --git a/package/pdbg/pdbg.mk b/package/pdbg/pdbg.mk index f16a392aa6b1..ba9aa15d026e 100644 --- a/package/pdbg/pdbg.mk +++ b/package/pdbg/pdbg.mk @@ -4,7 +4,7 @@ # ################################################################################ -PDBG_VERSION = 527fe54e1c95e031efd3db008c3f4e096cb3ea58 +PDBG_VERSION = 139ba071c222a5b0c20075f7c2265029ddd59449 PDBG_SITE = $(call github,open-power,pdbg,$(PDBG_VERSION)) PDBG_LICENSE = Apache-2.0 PDBG_LICENSE_FILES = COPYING