From owner-svn-src-head@freebsd.org Fri Oct 9 18:39:54 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1EA4B9D1856; Fri, 9 Oct 2015 18:39:54 +0000 (UTC) (envelope-from kan@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DF6D08E3; Fri, 9 Oct 2015 18:39:53 +0000 (UTC) (envelope-from kan@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t99Idqmi061660; Fri, 9 Oct 2015 18:39:52 GMT (envelope-from kan@FreeBSD.org) Received: (from kan@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t99IdqVK061659; Fri, 9 Oct 2015 18:39:52 GMT (envelope-from kan@FreeBSD.org) Message-Id: <201510091839.t99IdqVK061659@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kan set sender to kan@FreeBSD.org using -f From: Alexander Kabaev Date: Fri, 9 Oct 2015 18:39:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r289075 - head/libexec/rtld-elf/powerpc64 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.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Oct 2015 18:39:54 -0000 Author: kan Date: Fri Oct 9 18:39:52 2015 New Revision: 289075 URL: https://svnweb.freebsd.org/changeset/base/289075 Log: Remove some trailing space. Modified: head/libexec/rtld-elf/powerpc64/reloc.c Modified: head/libexec/rtld-elf/powerpc64/reloc.c ============================================================================== --- head/libexec/rtld-elf/powerpc64/reloc.c Fri Oct 9 18:26:24 2015 (r289074) +++ head/libexec/rtld-elf/powerpc64/reloc.c Fri Oct 9 18:39:52 2015 (r289075) @@ -250,11 +250,11 @@ reloc_nonplt_object(Obj_Entry *obj_rtld, } *(Elf_Addr **)where = *where * sizeof(Elf_Addr) - + (Elf_Addr *)(def->st_value + rela->r_addend + + (Elf_Addr *)(def->st_value + rela->r_addend + defobj->tlsoffset - TLS_TP_OFFSET); - + break; - + case R_PPC64_DTPREL64: def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj, flags, cache, lockstate); @@ -262,11 +262,11 @@ reloc_nonplt_object(Obj_Entry *obj_rtld, if (def == NULL) return (-1); - *where += (Elf_Addr)(def->st_value + rela->r_addend + *where += (Elf_Addr)(def->st_value + rela->r_addend - TLS_DTV_OFFSET); break; - + default: _rtld_error("%s: Unsupported relocation type %ld" " in non-PLT relocations\n", obj->path,