From patchwork Wed Oct 17 10:55:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Gretton-Dann X-Patchwork-Id: 12295 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 518AA1D5170 for ; Wed, 17 Oct 2012 10:55:47 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id A8341A19426 for ; Wed, 17 Oct 2012 10:55:46 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so11130396iej.11 for ; Wed, 17 Oct 2012 03:55:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:user-agent:mime-version:content-type :content-transfer-encoding:x-gm-message-state; bh=pLQXJDLdsLssSUqS5dD18wlnPLzj6FErC4b6IxRi4jg=; b=F0mJEZEB3pyVGB3WmmGrP1Cdh3zLpEU1PHdDJ+vNcfoO2NWwWa3pLXzTrTUGBKrUyR Qz9jVGKctPrPmXhDngUVZRVI85Ds7R/2hs5kuDXXgagTKo8EtBIL1fQ9RwolJNjPl6ZQ FHMf71R4XAiQi5cHxPHeLFQUHfj6XU/TbhTjYA+LNecQLEnjZ62e3ObJ6NlfAv2Xxwe8 EtJHlMTJ4iQhWSgVWH3hetR2RnDdVZpkCYEeUbwL9AL/IVf5cHGy2CE0kQZ7qqfhOJCu fsIOLfDtk3RNbEC1kFyZAy+gnD74jKpXe+4AJFsZFuDu5YCTOLpFZP15KM+qZZLlz+9+ T/Eg== Received: by 10.50.152.137 with SMTP id uy9mr1075866igb.62.1350471346094; Wed, 17 Oct 2012 03:55:46 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp875737igt; Wed, 17 Oct 2012 03:55:45 -0700 (PDT) Received: by 10.216.140.131 with SMTP id e3mr10034405wej.134.1350471344734; Wed, 17 Oct 2012 03:55:44 -0700 (PDT) Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by mx.google.com with ESMTPS id v5si24730286wiy.17.2012.10.17.03.55.44 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 17 Oct 2012 03:55:44 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.178 is neither permitted nor denied by best guess record for domain of matthew.gretton-dann@linaro.org) client-ip=209.85.212.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.178 is neither permitted nor denied by best guess record for domain of matthew.gretton-dann@linaro.org) smtp.mail=matthew.gretton-dann@linaro.org Received: by mail-wi0-f178.google.com with SMTP id hr7so392430wib.13 for ; Wed, 17 Oct 2012 03:55:44 -0700 (PDT) Received: by 10.216.210.16 with SMTP id t16mr10808478weo.175.1350471344154; Wed, 17 Oct 2012 03:55:44 -0700 (PDT) Received: from e103209-lin.localnet ([146.90.87.227]) by mx.google.com with ESMTPS id fp6sm3703734wib.0.2012.10.17.03.55.43 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 17 Oct 2012 03:55:43 -0700 (PDT) From: Matthew Gretton-Dann To: gcc-patches@gcc.gnu.org Cc: rearnsha@arm.com, rguenther@suse.de, patches@linaro.org Subject: [RFA ARM/4.7] Backport Split all insns before pool placement Date: Wed, 17 Oct 2012 11:55:36 +0100 Message-ID: <168827293.One0uaPfNY@e103209-lin> User-Agent: KMail/4.8.5 (Linux/3.2.0-31-generic; KDE/4.8.5; x86_64; ; ) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQli6FEx7G5vJorELPrR2l52RDsAir33s9AhnoU+2ijitPVlGT4q23h1Pbc5GqDv7JvHKvc/ All, Ulrich posted the following patch in July: http://gcc.gnu.org/ml/gcc-patches/2012-07/msg01123.html Richard E requested that it be left in testing on trunk for a couple of days before being backported to 4.7. Three months seems to satisfy the 'couple of days' requirement :-). Is this OK to be backported to 4.7? Cross tested arm-none-linux-gnueabi. Thanks, Matt 2012-10-15 Matthew Gretton-Dann Backported from mainline 2012-07-23 Ulrich Weigand * config/arm/arm.c (arm_reorg): Ensure all insns are split. diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index 35b73c5..3796a80 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -13337,6 +13337,13 @@ arm_reorg (void) if (TARGET_THUMB2) thumb2_reorg (); + /* Ensure all insns that must be split have been split at this point. + Otherwise, the pool placement code below may compute incorrect + insn lengths. Note that when optimizing, all insns have already + been split at this point. */ + if (!optimize) + split_all_insns_noflow (); + minipool_fix_head = minipool_fix_tail = NULL; /* The first insn must always be a note, or the code below won't