From owner-freebsd-office@FreeBSD.ORG Wed May 16 01:09:59 2012 Return-Path: Delivered-To: freebsd-office@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C3883106566B; Wed, 16 May 2012 01:09:59 +0000 (UTC) (envelope-from maho.nakata@gmail.com) Received: from mail-pb0-f54.google.com (mail-pb0-f54.google.com [209.85.160.54]) by mx1.freebsd.org (Postfix) with ESMTP id 523C78FC12; Wed, 16 May 2012 01:09:59 +0000 (UTC) Received: by pbbro2 with SMTP id ro2so404584pbb.13 for ; Tue, 15 May 2012 18:09:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:message-id:to:cc:subject:from:in-reply-to:references :x-mailer:mime-version:content-type:content-transfer-encoding; bh=+UzHotDQmkow3JGd7lkKnh+Vrwp/S+c1LPr0fI5ov10=; b=PIKV9n+GtV2LqqSMlZavdjJk2oKrMvSi5XUEbtkKhLSoT4JVaLkn2fAT02szk7sslo IyTl5JEhJGuTMRuj4Kk0eebgJKep1gnVZr6cFHqAiiub9YW0WlchsYVIwdUtbrSp6GS/ vzdiCPtFK/fBgXDZfX+pQ9wCf4MJ92E2SFQep1BbezpEYBOHGrKrK8UJBWNMdhrej+jV eRV0uAWOZhL8Z9lf12npJ/P15rZDVoKGOJy/yCNQJCFM54BuQDH0wLTh5grPSaCwtVVV Cv4xD5Y5AsPuaeXyLgvVQDbVbLbOpUZZfyxpKAvzqLUP+KHLvE3lOE9AJP9KIkayNk9e 9P5Q== Received: by 10.68.234.35 with SMTP id ub3mr11111479pbc.8.1337130598750; Tue, 15 May 2012 18:09:58 -0700 (PDT) Received: from localhost (rikad42.riken.jp. [134.160.214.42]) by mx.google.com with ESMTPS id nd6sm3545411pbc.63.2012.05.15.18.09.56 (version=SSLv3 cipher=OTHER); Tue, 15 May 2012 18:09:57 -0700 (PDT) Sender: Maho NAKATA Date: Wed, 16 May 2012 10:09:54 +0900 (JST) Message-Id: <20120516.100954.149607579557777889.chat95@mac.com> To: pfg@FreeBSD.org From: Maho NAKATA In-Reply-To: <4FAD3CD4.50503@FreeBSD.org> References: <4FAD3CD4.50503@FreeBSD.org> X-Mailer: Mew version 6.3 on Emacs 23.4 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: me@janh.de, freebsd-office@freebsd.org Subject: Re: editors/openoffice-3 fails on i386 while it builds on amd64 X-BeenThere: freebsd-office@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Office applications on FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 May 2012 01:09:59 -0000 sorry still tinderbox is not setup. just failed. I'll do it on this Sunday. thanks Nakata Maho From: Pedro Giffuni Subject: Re: editors/openoffice-3 fails on i386 while it builds on amd64 Date: Fri, 11 May 2012 11:22:44 -0500 > Index: bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx > =================================================================== > --- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx (revision 1337224) > +++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx (working copy) > @@ -355,7 +355,7 @@ > int const codeSnippetSize = 16; > > unsigned char * codeSnippet( > - unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset, > + unsigned char * code, sal_PtrDiff writetoexecdiff, sal_Int32 functionIndex, sal_Int32 vtableOffset, > typelib_TypeClass returnTypeClass) > { > if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) { > @@ -401,7 +401,7 @@ > // jmp privateSnippetExecutor: > *p++ = 0xE9; > *reinterpret_cast< sal_Int32 * >(p) > - = ((unsigned char *) exec) - p - sizeof (sal_Int32); > + = ((unsigned char *) exec) - p - sizeof (sal_Int32) - writetoexecdiff; > p += sizeof (sal_Int32); > OSL_ASSERT(p - code <= codeSnippetSize); > return code + codeSnippetSize; > @@ -434,7 +434,7 @@ > } > > unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( > - Slot ** slots, unsigned char * code, > + Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff, > typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset, > sal_Int32 functionCount, sal_Int32 vtableOffset) > { > @@ -447,9 +447,9 @@ > switch (member->eTypeClass) { > case typelib_TypeClass_INTERFACE_ATTRIBUTE: > // Getter: > - (s++)->fn = code; > + (s++)->fn = code + writetoexecdiff; > code = codeSnippet( > - code, functionOffset++, vtableOffset, > + code, writetoexecdiff, functionOffset++, vtableOffset, > reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >( > member)->pAttributeTypeRef->eTypeClass); > // Setter: > @@ -457,17 +457,17 @@ > typelib_InterfaceAttributeTypeDescription * >( > member)->bReadOnly) > { > - (s++)->fn = code; > + (s++)->fn = code + writetoexecdiff; > code = codeSnippet( > - code, functionOffset++, vtableOffset, > + code, writetoexecdiff, functionOffset++, vtableOffset, > typelib_TypeClass_VOID); > } > break; > > case typelib_TypeClass_INTERFACE_METHOD: > - (s++)->fn = code; > + (s++)->fn = code + writetoexecdiff; > code = codeSnippet( > - code, functionOffset++, vtableOffset, > + code, writetoexecdiff, functionOffset++, vtableOffset, > reinterpret_cast< typelib_InterfaceMethodTypeDescription * >( > member)->pReturnTypeRef->eTypeClass); > break;