From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Vxf3b-0006B8-C1 for mharc-grub-devel@gnu.org; Mon, 30 Dec 2013 10:47:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47315) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vxf3R-0006AC-Q2 for grub-devel@gnu.org; Mon, 30 Dec 2013 10:47:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vxf3G-00072E-0i for grub-devel@gnu.org; Mon, 30 Dec 2013 10:46:57 -0500 Received: from mail-lb0-x233.google.com ([2a00:1450:4010:c04::233]:35405) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vxf3F-00071z-OW for grub-devel@gnu.org; Mon, 30 Dec 2013 10:46:45 -0500 Received: by mail-lb0-f179.google.com with SMTP id w7so5706079lbi.10 for ; Mon, 30 Dec 2013 07:46:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:subject:from:to:date:in-reply-to:references:content-type :mime-version:content-transfer-encoding; bh=VSQEZEPu9lwoRW8tWnA9ZP4NcS+sw9vhXDjnuJr4g9k=; b=OZwsJAKKERe1t486qeXNWTaiJ7wk1fjbvtb64dezTqxjFIP9KHsegepdKwoyXlJhTw VSuNWGPHY/lWhkYWvBjSSNEMmpLTeum5oI5K1s7rhPaaui15TipETfAFXR9yvc0MNpV6 hFV/nv5RdVTCF59MrLvUJG0FYGpwb5Uies4cr7XwsBu7JpUiUKj2l6wCSCY8s3njK5c1 o58l++owZmZAZTibOj0FGQMQp+XGExdkhurYFS+7eklZbIj+CljHrgfXakMPXhOXZual KR0fuKm47MZ4JWN/521W8+j63Na1NrKyrUdzIc5E4bKvdKAELrmWzvJjEOkmu425lYex p77w== X-Received: by 10.152.29.202 with SMTP id m10mr27531798lah.23.1388418404584; Mon, 30 Dec 2013 07:46:44 -0800 (PST) Received: from [192.168.1.44] (ppp91-76-134-134.pppoe.mtu-net.ru. [91.76.134.134]) by mx.google.com with ESMTPSA id di11sm36033759lac.0.2013.12.30.07.46.43 for (version=SSLv3 cipher=RC4-SHA bits=128/128); Mon, 30 Dec 2013 07:46:44 -0800 (PST) Message-ID: <1388418403.918.129.camel@opensuse.site> Subject: Re: [PATCH 6/7] mkimage: support images which require full relocation at mkimage time. From: Andrey Borzenkov To: grub-devel@gnu.org Date: Mon, 30 Dec 2013 19:46:43 +0400 In-Reply-To: <1388342856-18317-6-git-send-email-ijc@hellion.org.uk> References: <1388342839.32105.25.camel@hastur.hellion.org.uk> <1388342856-18317-6-git-send-email-ijc@hellion.org.uk> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.2 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c04::233 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Dec 2013 15:47:06 -0000 В Вс, 29/12/2013 в 18:47 +0000, Ian Campbell пишет: > @@ -1530,9 +1551,9 @@ SUFFIX (load_image) (const char *kernel_path, size_t *exec_size, > for (i = 0; i < num_sections; i++) > section_vaddresses[i] = section_addresses[i] + image_target->vaddr_offset; > > - if (!grub_image_needs_reloc(image_target)) > + if (!grub_image_needs_reloc(image_target) || grub_image_needs_abs_reloc(image_target)) > { grub_image_needs_reloc implies grub_image_need_abs_reloc. Looks like one of hunks should be dropped? > @@ -922,11 +923,16 @@ grub_arm_reloc_jump24 (grub_uint32_t *target, Elf32_Addr sym_addr) > static int grub_image_needs_reloc(const struct grub_install_image_target_desc *target) > { > if (target->id == IMAGE_EFI) > return 1; > - return 0; > + return grub_image_needs_abs_reloc(target); > } >