From owner-svn-src-head@FreeBSD.ORG  Sun Oct 27 23:48:59 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 9AAFDBBA;
 Sun, 27 Oct 2013 23:48:59 +0000 (UTC)
 (envelope-from cognet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8862E2508;
 Sun, 27 Oct 2013 23:48:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9RNmxbT086869;
 Sun, 27 Oct 2013 23:48:59 GMT (envelope-from cognet@svn.freebsd.org)
Received: (from cognet@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9RNmxU5086868;
 Sun, 27 Oct 2013 23:48:59 GMT (envelope-from cognet@svn.freebsd.org)
Message-Id: <201310272348.r9RNmxU5086868@svn.freebsd.org>
From: Olivier Houchard <cognet@FreeBSD.org>
Date: Sun, 27 Oct 2013 23:48:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r257233 - head/lib/csu/arm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Oct 2013 23:48:59 -0000

Author: cognet
Date: Sun Oct 27 23:48:59 2013
New Revision: 257233
URL: http://svnweb.freebsd.org/changeset/base/257233

Log:
  Use the size of the MACHINE_ARCH string instead of sizeof(uint32_t). It can
  happen sizeof(MACHINE_ARCH) is more than 4 bytes, and bad things would
  happen. This should make the ctors being called again on armeb.

Modified:
  head/lib/csu/arm/crt1.c

Modified: head/lib/csu/arm/crt1.c
==============================================================================
--- head/lib/csu/arm/crt1.c	Sun Oct 27 22:18:27 2013	(r257232)
+++ head/lib/csu/arm/crt1.c	Sun Oct 27 23:48:59 2013	(r257233)
@@ -123,7 +123,7 @@ static const struct {
 	char	desc[sizeof(MACHINE_ARCH)];
 } archtag __attribute__ ((section (NOTE_SECTION), aligned(4))) __used = {
 	.namesz = sizeof(NOTE_FREEBSD_VENDOR),
-	.descsz = sizeof(int32_t),
+	.descsz = sizeof(MACHINE_ARCH),
 	.type = ARCH_NOTETYPE,
 	.name = NOTE_FREEBSD_VENDOR,
 	.desc = MACHINE_ARCH