From patchwork Wed Mar 9 12:28:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 12775021 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 43012C433FE for ; Wed, 9 Mar 2022 12:30:56 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.287794.488013 (Exim 4.92) (envelope-from ) id 1nRvSl-0003jv-TT; Wed, 09 Mar 2022 12:30:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 287794.488013; Wed, 09 Mar 2022 12:30:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nRvSl-0003jh-P9; Wed, 09 Mar 2022 12:30:43 +0000 Received: by outflank-mailman (input) for mailman id 287794; Wed, 09 Mar 2022 12:30:41 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nRvSj-00039g-Jb for xen-devel@lists.xenproject.org; Wed, 09 Mar 2022 12:30:41 +0000 Received: from esa3.hc3370-68.iphmx.com (esa3.hc3370-68.iphmx.com [216.71.145.155]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id b9c62885-9fa4-11ec-8eba-a37418f5ba1a; Wed, 09 Mar 2022 13:30:39 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b9c62885-9fa4-11ec-8eba-a37418f5ba1a DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1646829039; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=9n5J/SLlazG5OkZb6XiFpdMz0tZKAWZaKoaZX6MjJqU=; b=GUMTuAtdaO4rGxTGrN55r/Pav/tELktoEnL00v5VEZDdD0zsu6ZDhD2I iQhKZX6tuG6AH5m2koz8fWJ660Ut0HsvWygc8c0b1hqNMR91N7J29vo5w N7sXpDjazdDLG4H9yP6gIUh03zAS56fOs37M7ZEc8yTdLLZlIMNxh6Znl 8=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=pass (signature verified) header.i=@citrix.onmicrosoft.com X-SBRS: 5.1 X-MesageID: 65807411 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:cX6ByqufSQXZVZWYaU8iuyRAmufnVNdeMUV32f8akzHdYApBsoF/q tZmKWuFMq6NNjbweowgaNm+90wBu57WmtQwHgo4pC9jEn8Q+JbJXdiXEBz9bniYRiHhoOOLz Cm8hv3odp1coqr0/0/1WlTZhSAgk/nOHNIQMcacUsxLbVYMpBwJ1FQyw4bVvqYy2YLjW1jV6 IuoyyHiEATNNwBcYzp8B52r8HuDjNyq0N/PlgVjDRzjlAa2e0g9VPrzF4noR5fLatA88tqBb /TC1NmEElbxpH/BPD8HfoHTKSXmSpaKVeSHZ+E/t6KK2nCurQRquko32WZ1he66RFxlkvgoo Oihu6BcRi94J43emOkcdCBGAiJVZfFe877sPFKw5Jn7I03uKxMAwt1rBUAye4YZ5vx2ESdF8 vlwxDIlN07ZwbjsmfTiF7cq1p9LwMrDZevzvll6yj7UF7A+SI3rSKTW/95Imjw3g6iiGN6AO ppBNmY2NXwsZTVxJggLGZgBmtv0qV3wLhFCkVeTtbsetj27IAtZj+G2bYu9lsaxbcdfk1ucp 2nG13/kGRxcP9uaoRK79Xariv7KjDnMcosYH72l9dZnmFSWgGcUDXU+V1ShqP29oke7UsBYL Qof/S9Ghbc23FymSJ/6RRLQiGWfohcWVt5UEus7wAKA0KzZ50CeHGdsZi5MbpkqudE7QRQu1 0SVhJX5CDp3qrqXRHmBsLCOoluaMyUPMXULYyNCSAIf+sTiu6k6lBeJRdFmeIa3k9n0FDfY0 z2M6i8kiN0uYdUjjvvhuwqd2nT1+8aPHlVdChjrsnyNvxpZdo6oZquR90nYxq4cNI2YZUSrs y1R8ySB19wmAZaInS2LZewCGrC1+vqIWAHhbU5T84oJrGr0pSP6FWxEyHQnfRoybJ5YEdP8S BKL4WtsCIlv0GxGhEOdS6a4EIwUwKfpDrwJvdiEP4MVMvCdmOJqlRyChHJ8PUiwyCDAcollY P93lPpA615AV8yLKxLsG48gPUcDnHxW+I8qbcmTI+6b+bSffmWJbrwOLUGDaOs0hIvd/lmLr IgDbZvWl0kBOAEbXsUx2dRDRbztBSJnba0aVuQNLrLTSuaYMDpJ5wDtLUMJJNU+wvU9ehbg9 XChQE5IoGcTdlWcQThmnktLMeu1Nb4m9CpTFXV1YT6AhihyCa7yvfx3X8ZmItEaGBlLkKcco w8tIJ7bXJyii13vplwgUHUKhNc7JUrx2l7WYXbNjfpWV8cIejElM+TMJ2PH3CIPEjC2pY05p bih3RncWp0NW0JpC8O+VR5l5wrZUaQ18A6qY3b1Hw== IronPort-HdrOrdr: A9a23:xK2uj6thJSs9yEz4KkeBwTH57skClIMji2hC6mlwRA09TyXGra +TdaUguSMc1gx9ZJhBo7G90KnpewK5yXcT2/hsAV7CZniahILMFu9fBOTZslvd8kHFh4xgPO JbAtND4b7LfClHZKTBkXCF+r8bqbHtmsDY5ts2jU0dNz2CA5sQkTuRYTzrdXGeKjM2YKbQQ/ Gnl7V6TnebCDwqR/X+IkNAc/nIptXNmp6jSRkaByQ/4A3LqT+z8rb1HzWRwx9bClp0sP0f2F mAtza8yrSosvm9xBOZ/2jP765OkN+k7tdYHsSDhuUcNz2poAe1Y4ZKXaGEoVkO0aqSwWdvtO OJjwYrPsx15X+UVmapoSH10w2l6zoq42+K8y7uvVLT5ejCAB4qActIgoxUNjHD7VA7gd162K VXm0qEqpt+F3r77WvAzumNcysvulu/oHIkn+JWpWdYS5EiZLhYqpFa1F9JEa0HADnx5OkcYa VT5fnnlbdrmG6hHjDkVjEF+q3uYp1zJGbKfqE6gL3a79AM90oJjXfxx6Qk7wM9HdwGOtx5Dt //Q9dVfYF1P78rhJ1GdZU8qLOMexTwqDL3QRSvyAfcZeg600ykke+D3Fxy3pDvRKA1 X-IronPort-AV: E=Sophos;i="5.90,167,1643691600"; d="scan'208";a="65807411" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YAGMM5H9N2vt2BURr1GKfuyHuNEVnI76fRYF23v8whSwtazgy9ZjgDgxqZ/hKllupgHdwBdmvYVSbL4J42UqEqv3MtB5lhO2QxyEJpmN/0OVkLBOVetHjfb21UEYrd1spcBUtGvXjvc31oJJBkYUZJ8poJ0292Z38V4AEKzP6oKxg2wak/gotHttIJouzTHm4eW4zmUEKHSQLynznCRFOo4dlGlwgTDKwq32HuQtUxyMpDTXViORswFidiNvRDCX6MILybhwCr/8Am0A7gU510HqsnL8Gix8fVw2upSpJtQ7cUAhqFRzzbwcZpt2FB/Oj/L/o+Z69wYyX3zvDNlXWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jfLEQnh7siEH8oE4+sQ6IzMnA97R6ZK1oefy+4uZXVI=; b=EdRkYGHBU1JIOBcgotvFDUVRvn+MBy/9Mtg6SajhV1OYg2K0rL50qNYfRcPn/V00u5aHvyVdGOxmBt5tGtl070a55ysxJMl3/0vc+vtWnQ5YRzGl5PA6jKpNbvX9pXm71I0jX9xWnYQ25jasljCJNJOlcGLrYx/0NB/2DTFURuG63GIe3f/H+phiHgNzst+S1lcrN/W6v/z2ohfYxbcYFyeuCN03DQ6ygxV5Jm39gHVu3V4m1gIrCgMuoxhRyK89Vx4TI+ibJ3spbjposiApCBf3FH22wPmGdnfSL2RchN0Qo4dgYrBRqMTU4CCwa7QV19qf60Knivx6wBYe11m0iQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.onmicrosoft.com; s=selector2-citrix-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jfLEQnh7siEH8oE4+sQ6IzMnA97R6ZK1oefy+4uZXVI=; b=HVT362XLc3xn2RNNHoYaLKrJcOy1Eapht6iMPQUDpqYZK6k8iDMHP2abN6GJEU8Oz3a7ac1QQ/Jv+wPyBKtcw09L+2F2NCH4X9pUEAi9g8MdDYwmdpmvfanVbD4eRMRO3/A/3HiwXeu+4di6tDkC5cwGUPrkNcPXfprLGyThNls= From: Roger Pau Monne To: CC: Roger Pau Monne , Stefano Stabellini , Julien Grall , Bertrand Marquis , Volodymyr Babchuk , Jan Beulich , Andrew Cooper , Wei Liu , Julien Grall Subject: [PATCH v4 1/2] xen/build: put image header into a separate section Date: Wed, 9 Mar 2022 13:28:45 +0100 Message-ID: <20220309122846.89696-2-roger.pau@citrix.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220309122846.89696-1-roger.pau@citrix.com> References: <20220309122846.89696-1-roger.pau@citrix.com> X-ClientProxiedBy: LO4P123CA0029.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:151::16) To DS7PR03MB5608.namprd03.prod.outlook.com (2603:10b6:5:2c9::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 92357126-b1c5-49fc-377e-08da01c897b1 X-MS-TrafficTypeDiagnostic: BYAPR03MB4359:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DJI9bbypEy1YzBYVl9NYq5Bt17/7veoSOzg/+J70XYVRXgRGnMa2DCxwbY86y/Qu0lMZM/IzJj8s04d0nPhBSR5v3yjzJ3eQLbRYofdILOFFg7pYYiLDTgOyJUJp22d0VPygYsi8x/scCBNnVStIROzz+dEh2cfFDumd69pwLTI5Wbsmm6ccKyS451zPAQfMx4JO+qmKtZDmOt5OGmunf/43Eq2TX9aXh7RqR93YtAeJGG3HIutpEeY7DvTrEGRWMremr+ac1Ui44BAtx/PzU32McqgV5awx4Sjwyec/3Bm8TYWCiFqlvtJY/wUSdXgRSnsV+jQecayrlPh1l8czEF6PHSwQtAx64GQx0mNHuVnHEPN/YNqNnknaOD51bv+mT2Tc9KNxnOgC2U/tHajHcP4J0iHFQWkKv5D4XkYFPYjjoPCLurDeXZfjH5hBD3+H7QjMzvfVb5sovDKDOrniML5Sf3GKVuk4dLWpwmZL+imOaL5GwQUqPm+S7ynpoqdpDFVolBPTo6WUyyfNj92N50T9uVgYxZyB8+A8LCopVWmMdQUaQjz3hE0+DGLjyThDSV3c1Kk/u2Ddp4C/yWxttjGFNcNhABncwHYjQ6+Ksoogi/Qr0ryEL9SRvhgitvAZILr0ml6sx0p3ff3coy2kFw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS7PR03MB5608.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(26005)(66556008)(4326008)(66946007)(1076003)(8676002)(6666004)(86362001)(83380400001)(2906002)(38100700002)(66476007)(82960400001)(5660300002)(8936002)(6486002)(6916009)(6506007)(36756003)(54906003)(508600001)(2616005)(316002)(6512007)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?XGuCq2QYJ62u/XJy0rEm+XH+R0P9?= =?utf-8?q?bbUNSWwFR8oxVlcBdPjQ6G8e+rIOTBslEpiCqIQ2tPnI9zixsDu3Z/3mucQKyK+EE?= =?utf-8?q?uHuKBfNnWMkGr+W+tuepUueJLFfhQeX8Z2hIqu7dYG10Q1cv1RZap8nFDHtPGPZMp?= =?utf-8?q?ATt5ppTCX+mIUbqFZVi3scEvbatxHf9L26kTRsWycCJCI/svLKzTMKP2oLs/GADnq?= =?utf-8?q?xJjskoST25Z3IwGchsY/mtQDF5QPGAIlQIuvV4Y5ooBQgJKP98UcwvMTk6k4ue0nS?= =?utf-8?q?76psZcEyc4LbnuoC96oP0BPCWRdECh4ol4ICBkqHHf2YQrx7g7JhfApvteYq2Bvnf?= =?utf-8?q?gB8XQFIWlbLurO+rxXXWLoNKN31hd/q6GGL2gHiGc2xy2oZVHpW7YbO+7jjGs1MpP?= =?utf-8?q?j7ygaFS25Sp4nwfhVGlr2tpy0nqAZAi4L5MLuByXnYf4W5wqkj4cOlYL7zIRW3TSG?= =?utf-8?q?x0sTrFD65pp94EevHtTUXcXkhnT//OHkBYpZXJ8WSfoaQHJsE4ZDF3wqi1Ny9dz+o?= =?utf-8?q?JkXXl0NoU065MFduztsJUTXQXXOEp4hVZW7hzyWRQa2+GO0f9XJ21OwHX6dE3l2vn?= =?utf-8?q?Yw2Sm3s+exSjdsyRKGOJT64Tmw+QMbK4GB8oZT6+ovbMNEPRnevf9dGb5Tp/GSriO?= =?utf-8?q?oyF+wgfSEiM+XyCd6FmWVyd0WLIY2rONvbqdpn1wgTOYuiBdgo0SRUOsOLf0wk6Tz?= =?utf-8?q?Qudowwo4JJep6LILK7f8RYQ/FAxOEUlV2nuE+31YPPutnCkL/PRzeBz8DAixvqZMp?= =?utf-8?q?St5N8c0iK4pOq7xItT3IJxxWdIwKWg94Ew4z8ItwAWgrceEldT/GOr6pgopFtFUOy?= =?utf-8?q?sFli97OB+mSdC9Ur010QlwtW0y+Lie5gtGROH6c+89DWVxO5ohO7RZab9mf71D6x4?= =?utf-8?q?wUZhO6SfSXEOFzeQc3KjV84pyhL2aPlYRak/1OIjecbmbHKOvQyzahgNZyFfQzcOk?= =?utf-8?q?WOlg5M1Z6zcAbVc52S3o26ZpVLd/de5OdfzzA6f6djc+fyyIYtUzNGlcS93lXvmcW?= =?utf-8?q?YNX1+QXrnk5QRi76TKZE4wrgOoCPVcB8+gaxOUY24p2V/WZXnoXCCFjjyEZLbQDNV?= =?utf-8?q?vJpF8UJE97Gq17dcR78eM7aJ5Oyre6tK2CX9ReH0LzOfVhjs75z8If1kCUIMtgqRe?= =?utf-8?q?AfFMXtgtB526jLsEGUWOBsFmVA4WEpzOHhFcE3ul7dSxBQZGDcF4EUBbcdRrkxf3z?= =?utf-8?q?VNClt6jxTnLZi1CWR6fZzCi8pHzP2szLCcOa3AeSjO/K/+9x5dZf9rSt6w59+ywCy?= =?utf-8?q?9aQv7AzMHtIoDfkgXRK496F1Wl2E6Sj7xeXQwAeK2Qk0gZBJd3221dInmWSSHezZT?= =?utf-8?q?lQ5wrrRPOVXrX3xtydKGjR0mrZTOifdcMGk9CF2Lffk7KUqheKstzytUza0tLVuEu?= =?utf-8?q?uN4fBOD3nd69jbJ/Db7gdvIFYazucD/le11hkSz6fqLS8Zp97/TA7JEyNj7NyeWIJ?= =?utf-8?q?+Hjhja9QyFR7fp1wCyyFzCVEIkIjzPjt8sY9fTZGZ0QVXaZNZ4qEEPmgZxcslHIAW?= =?utf-8?q?AEQcaVr3Bxg/THkDE58nnNnr3XX97TTnAkmv2RlHOVyUAXm7VK/DAF4=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 92357126-b1c5-49fc-377e-08da01c897b1 X-MS-Exchange-CrossTenant-AuthSource: DS7PR03MB5608.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2022 12:30:27.7982 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: lrnMYLF+lruE/J5u7p+kRph3ujArnCghrlRc0vXw1U1nqPtScn7M7TRVFRQHZFIsq53PmRKhPUApBz6/vjBHug== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR03MB4359 X-OriginatorOrg: citrix.com So it can be explicitly placed ahead of the rest of the .text content in the linker script (and thus the resulting image). This is a prerequisite for further work that will add a catch-all to the text section (.text.*). Note that placement of the sections inside of .text is also slightly adjusted to be more similar to the position found in the default GNU ld linker script. The special handling of the object file containing the header data as the first object file passed to the linker command line can also be removed. While there also remove the special handling of efi/ on x86. There's no need for the resulting object file to be passed in any special order to the linker. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Acked-by: Julien Grall # xen/arm --- Changes since v3: - Drop .text.cold.* handling. Changes since v2: - New in this version (split from patch 2). --- xen/arch/arm/arch.mk | 2 -- xen/arch/arm/arm32/Makefile | 3 +-- xen/arch/arm/arm32/head.S | 1 + xen/arch/arm/arm64/Makefile | 3 +-- xen/arch/arm/arm64/head.S | 1 + xen/arch/arm/xen.lds.S | 8 ++++++-- xen/arch/x86/Makefile | 5 ++--- xen/arch/x86/arch.mk | 2 -- xen/arch/x86/boot/head.S | 2 +- xen/arch/x86/xen.lds.S | 11 +++++++---- 10 files changed, 20 insertions(+), 18 deletions(-) diff --git a/xen/arch/arm/arch.mk b/xen/arch/arm/arch.mk index 094b670723..58db76c4e1 100644 --- a/xen/arch/arm/arch.mk +++ b/xen/arch/arm/arch.mk @@ -23,5 +23,3 @@ ifeq ($(CONFIG_ARM64_ERRATUM_843419),y) LDFLAGS += --fix-cortex-a53-843419 endif endif - -ALL_OBJS-y := arch/arm/$(TARGET_SUBARCH)/head.o $(ALL_OBJS-y) diff --git a/xen/arch/arm/arm32/Makefile b/xen/arch/arm/arm32/Makefile index 3040eabce3..520fb42054 100644 --- a/xen/arch/arm/arm32/Makefile +++ b/xen/arch/arm/arm32/Makefile @@ -4,11 +4,10 @@ obj-$(CONFIG_EARLY_PRINTK) += debug.o obj-y += domctl.o obj-y += domain.o obj-y += entry.o +obj-y += head.o obj-y += insn.o obj-$(CONFIG_LIVEPATCH) += livepatch.o obj-y += proc-v7.o proc-caxx.o obj-y += smpboot.o obj-y += traps.o obj-y += vfp.o - -extra-y += head.o diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 7a906167ef..c837d3054c 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -120,6 +120,7 @@ #endif /* !CONFIG_EARLY_PRINTK */ + .section .text.header, "ax", %progbits .arm /* diff --git a/xen/arch/arm/arm64/Makefile b/xen/arch/arm/arm64/Makefile index baa87655fa..6d507da0d4 100644 --- a/xen/arch/arm/arm64/Makefile +++ b/xen/arch/arm/arm64/Makefile @@ -7,6 +7,7 @@ obj-$(CONFIG_EARLY_PRINTK) += debug.o obj-y += domctl.o obj-y += domain.o obj-y += entry.o +obj-y += head.o obj-y += insn.o obj-$(CONFIG_LIVEPATCH) += livepatch.o obj-y += smc.o @@ -14,5 +15,3 @@ obj-y += smpboot.o obj-y += traps.o obj-y += vfp.o obj-y += vsysreg.o - -extra-y += head.o diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 66d862fc81..e62c48ec1c 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -133,6 +133,7 @@ add \xb, \xb, x20 .endm + .section .text.header, "ax", %progbits /*.aarch64*/ /* diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S index 08016948ab..743455a5f9 100644 --- a/xen/arch/arm/xen.lds.S +++ b/xen/arch/arm/xen.lds.S @@ -30,9 +30,13 @@ SECTIONS _start = .; .text : { _stext = .; /* Text section */ - *(.text) + *(.text.header) + *(.text.cold) - *(.text.unlikely) + *(.text.unlikely .text.*_unlikely .text.unlikely.*) + + *(.text) + *(.fixup) *(.gnu.warning) _etext = .; /* End of text section */ diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 9c40e0b4d7..04065a7310 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -1,5 +1,7 @@ obj-y += acpi/ +obj-y += boot/ obj-y += cpu/ +obj-y += efi/ obj-y += genapic/ obj-$(CONFIG_GUEST) += guest/ obj-$(CONFIG_HVM) += hvm/ @@ -77,9 +79,6 @@ obj-$(CONFIG_COMPAT) += x86_64/platform_hypercall.o obj-y += sysctl.o endif -# Allows "clean" to descend into boot/ -subdir- += boot - extra-y += asm-macros.i extra-y += xen.lds diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index 8e57476d65..c90e56aeab 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -117,5 +117,3 @@ endif # Set up the assembler include path properly for older toolchains. CFLAGS += -Wa,-I$(srctree)/include - -ALL_OBJS-y := arch/x86/boot/built_in.o arch/x86/efi/built_in.o $(ALL_OBJS-y) diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index dd1bea0d10..92d73345f0 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -9,7 +9,7 @@ #include #include - .text + .section .text.header, "ax", @progbits .code32 #define sym_offs(sym) ((sym) - __XEN_VIRT_START) diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 506bc8e404..960c51eb4c 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -73,9 +73,7 @@ SECTIONS _start = .; DECL_SECTION(.text) { _stext = .; /* Text and read-only data */ - *(.text) - *(.text.__x86_indirect_thunk_*) - *(.text.page_aligned) + *(.text.header) . = ALIGN(PAGE_SIZE); _stextentry = .; @@ -87,7 +85,12 @@ SECTIONS kexec_reloc_end = .; *(.text.cold) - *(.text.unlikely) + *(.text.unlikely .text.*_unlikely .text.unlikely.*) + + *(.text) + *(.text.__x86_indirect_thunk_*) + *(.text.page_aligned) + *(.fixup) *(.gnu.warning) _etext = .; /* End of text section */