Message ID | 20160317011635.GE5173@localhost.localdomain (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Hi Konrad, On 17/03/16 01:16, Konrad Rzeszutek Wilk wrote: > And here is the patch. The change for uintXX_t type worked out - same > size and offset as on 64-bit. Thought I am tempted to add some > more BUILD_BUG checks. > > From 7007f1a3fa3a77a725f529420c7aea0e8ebdc9fa Mon Sep 17 00:00:00 2001 > From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > Date: Wed, 16 Mar 2016 16:08:25 -0400 > Subject: [PATCH v4 01/35] arm/config: Declare ELFSIZE_[32|64] > > The commit bcfaea685d38c08e5eb90797512ab80f0bc69d0c > "arm/config: Declare ELFSIZE_64" was not correct. > > For 32-bit ARM, ELFCLASS32 (i.e. 32-bit data types) will always > be used so we need to set ELFSIZE to 32. > > Reported-by: Julien Grall <julien.grall@arm.com> > Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Acked-by: Julien Grall <julien.grall@arm.com> Regards, > > --- > Cc: Stefano Stabellini <stefano.stabellini@citrix.com> > Cc: Julien Grall <julien.grall@arm.com> > -- > --- > xen/include/asm-arm/config.h | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h > index 7ceb5c5..2d11b62 100644 > --- a/xen/include/asm-arm/config.h > +++ b/xen/include/asm-arm/config.h > @@ -9,8 +9,10 @@ > > #if defined(CONFIG_ARM_64) > # define LONG_BYTEORDER 3 > +# define ELFSIZE 64 > #else > # define LONG_BYTEORDER 2 > +# define ELFSIZE 32 > #endif > > #define BYTES_PER_LONG (1 << LONG_BYTEORDER) > @@ -20,9 +22,6 @@ > /* xen_ulong_t is always 64 bits */ > #define BITS_PER_XEN_ULONG 64 > > -/* And ELF files are also 64-bit. */ > -#define ELFSIZE 64 > - > #define CONFIG_PAGING_ASSISTANCE 1 > > #define CONFIG_PAGING_LEVELS 3 >
On Thu, Mar 17, 2016 at 11:04:29AM +0000, Julien Grall wrote: > Hi Konrad, > > On 17/03/16 01:16, Konrad Rzeszutek Wilk wrote: > >And here is the patch. The change for uintXX_t type worked out - same > >size and offset as on 64-bit. Thought I am tempted to add some > >more BUILD_BUG checks. > > > > From 7007f1a3fa3a77a725f529420c7aea0e8ebdc9fa Mon Sep 17 00:00:00 2001 > >From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > >Date: Wed, 16 Mar 2016 16:08:25 -0400 > >Subject: [PATCH v4 01/35] arm/config: Declare ELFSIZE_[32|64] > > > >The commit bcfaea685d38c08e5eb90797512ab80f0bc69d0c > >"arm/config: Declare ELFSIZE_64" was not correct. > > > >For 32-bit ARM, ELFCLASS32 (i.e. 32-bit data types) will always > >be used so we need to set ELFSIZE to 32. > > > >Reported-by: Julien Grall <julien.grall@arm.com> > >Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > > Acked-by: Julien Grall <julien.grall@arm.com> Thank you. Patch applied.
diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 7ceb5c5..2d11b62 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -9,8 +9,10 @@ #if defined(CONFIG_ARM_64) # define LONG_BYTEORDER 3 +# define ELFSIZE 64 #else # define LONG_BYTEORDER 2 +# define ELFSIZE 32 #endif #define BYTES_PER_LONG (1 << LONG_BYTEORDER) @@ -20,9 +22,6 @@ /* xen_ulong_t is always 64 bits */ #define BITS_PER_XEN_ULONG 64 -/* And ELF files are also 64-bit. */ -#define ELFSIZE 64 - #define CONFIG_PAGING_ASSISTANCE 1 #define CONFIG_PAGING_LEVELS 3