From patchwork Mon Jul 31 17:13:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petar Koretic X-Patchwork-Id: 795893 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.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=qaap-io.20150623.gappssmtp.com header.i=@qaap-io.20150623.gappssmtp.com header.b="jo+UmV4j"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xLmVT3xzYz9s4q for ; Tue, 1 Aug 2017 03:22:41 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 60A1486E1C; Mon, 31 Jul 2017 17:22:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9CGzqVl7Byg7; Mon, 31 Jul 2017 17:22:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 3F8FF86BFF; Mon, 31 Jul 2017 17:22:35 +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 78E651CEB08 for ; Mon, 31 Jul 2017 17:22:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 62DFB302D0 for ; Mon, 31 Jul 2017 17:22:30 +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 9RRzpXQ99n8Q for ; Mon, 31 Jul 2017 17:22:29 +0000 (UTC) X-Greylist: delayed 00:08:22 by SQLgrey-1.7.6 Received: from mail-wr0-f177.google.com (mail-wr0-f177.google.com [209.85.128.177]) by silver.osuosl.org (Postfix) with ESMTPS id 660C9302CD for ; Mon, 31 Jul 2017 17:22:29 +0000 (UTC) Received: by mail-wr0-f177.google.com with SMTP id f21so125528106wrf.5 for ; Mon, 31 Jul 2017 10:22:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qaap-io.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=NiZtBbZWKbzGARCh8a7lubdwOS2oIuqsO2/Uqqn09rU=; b=jo+UmV4jzC2BYyF3DH8NMU5RvcrGrYPIv0UQffAM04GeG0jsKEKXGSFVy3KQd5+8VQ idwWpvoGSWAeQNdw9n68oqSopOnrYCOJ2GasG/BuD4xTRwch4aBuNH0ZqYlZRPJXjFgP sA/cUmQn5PoyZwdkpSmhxKrWqxj1Sq7cfU+vHgNbU6uCEG73dkMSL78ggqbesslG0jAY N9afq9zsj5yGbwpUB4rPl2cj2Tla2T8bC8zdHfP4FqergPUpMGbuhloz9fWPn7wf7eb+ fgrz3Ayy1c+brjnkBKRULp8TIju6m7+oUVcN6o31WWYX+nnZRt+tZXtf/7DNN+HGrB8a 0jww== 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=NiZtBbZWKbzGARCh8a7lubdwOS2oIuqsO2/Uqqn09rU=; b=JC62/Lee0aJRvjsJwzHGb5dXwD1ldZsQ0BHKmWoL4jPyZlWzKqfYLgmoVytvWBIH+w fn1HcIf8uRz4z4NXzSn+BiYHHE/+xb+ibikpB+6eCfT5bunvjAUWos8W8tmlWIBHZxOC UJLXZzXxdOYjR0KEShu547ab1zn3XB7Zs5CugTMUho5ajPLP+1PVvkGunzijiXtcQb82 sE5eM6L8jTemupQyXbV7sZqkp1aUv8hK4nwuzt44Ix79lfO2APN81PKWqnJo1kT6TFzE gZC2ag/P5jNffXETp9PJQCXoEPUAd+nLH+dkk/XvQPjY25niYeNdFFW4EyPDfyHDdItm BiiQ== X-Gm-Message-State: AIVw110qLQD/Qx4fl6qqw1veU5e0nGKfNa7BPoKKiUkIGhsLPpLIjvIl kOGlKIDZcK4CAPQoSXrfoprc X-Received: by 10.223.182.168 with SMTP id j40mr15145907wre.122.1501521245531; Mon, 31 Jul 2017 10:14:05 -0700 (PDT) Received: from localhost.localdomain ([94.250.132.220]) by smtp.gmail.com with ESMTPSA id a25sm17622802wrd.43.2017.07.31.10.14.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 31 Jul 2017 10:14:04 -0700 (PDT) From: Petar Koretic To: buildroot@buildroot.org Date: Mon, 31 Jul 2017 19:13:59 +0200 Message-Id: <20170731171359.32471-1-petar.koretic@qaap.io> X-Mailer: git-send-email 2.13.3 Cc: Petar Koretic Subject: [Buildroot] [PATCH 1/1] qt5declarative: backport 'Fix alignment issue on ARMv7' patch to 5.9.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This resolves a QML issues reported in https://bugreports.qt.io/browse/QTBUG-61522 that will be fixed in the 5.9.2. Signed-off-by: Petar Koretic --- .../0003-Fix-alignment-issue-on-ARMv7.patch | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/qt5/qt5declarative/0003-Fix-alignment-issue-on-ARMv7.patch diff --git a/package/qt5/qt5declarative/0003-Fix-alignment-issue-on-ARMv7.patch b/package/qt5/qt5declarative/0003-Fix-alignment-issue-on-ARMv7.patch new file mode 100644 index 0000000000..da68826ccb --- /dev/null +++ b/package/qt5/qt5declarative/0003-Fix-alignment-issue-on-ARMv7.patch @@ -0,0 +1,34 @@ +From 03c2661b1243cc529fc3d8cfa65073f1da420307 Mon Sep 17 00:00:00 2001 +From: Simon Hausmann +Date: Thu, 22 Jun 2017 13:34:09 +0200 +Subject: [PATCH] Fix alignment issue on ARMv7 + +As analyzed in the bug report, it appears that we may get +QV4::CompiledData::Function pointers for writing that are not aligned +for the 64-bit fields at the beginning. + +[ChangeLog][QtQml] Fix crash due to misaligned data structures on ARMv7 + +Task-number: QTBUG-61552 +Change-Id: I6b2c166b725496150c8850475577628ccd811d65 +Reviewed-by: Erik Verbruggen +--- + src/qml/compiler/qv4compiler.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/qml/compiler/qv4compiler.cpp b/src/qml/compiler/qv4compiler.cpp +index e32749bbf..c32e1685a 100644 +--- a/src/qml/compiler/qv4compiler.cpp ++++ b/src/qml/compiler/qv4compiler.cpp +@@ -406,6 +406,8 @@ QV4::CompiledData::Unit QV4::Compiler::JSUnitGenerator::generateHeader(QV4::Comp + *jsClassDataOffset = nextOffset; + nextOffset += jsClassData.size(); + ++ nextOffset = (nextOffset + 7) & ~quint32(0x7); ++ + for (int i = 0; i < irModule->functions.size(); ++i) { + QV4::IR::Function *f = irModule->functions.at(i); + functionOffsets[i] = nextOffset; +-- +2.13.3 +