Message ID | 1433423732-30306-1-git-send-email-colin.king@canonical.com |
---|---|
State | Accepted |
Headers | show |
On 2015年06月04日 21:15, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > A 32 bit version of the table printing is not being linked > into the iasl fwts shared library and we are picking up the > wrong one from the acpica execution engine lib instead. This > is causing a segfault when printing a table header on disassembly > because of a pointer size mismatch. > > This was causing the make check tests to fail on the disassembly > test. > > The fix is to build in the appropriate 32 bit table code into > the iasl fwts shared library so we don't have any incompatible > acpica iasl and acpica exec code mixing at link time. > > Tested on: x86_64, i686, armhf, arm64; passes all "make check" tests. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > src/acpica/source/compiler/Makefile.am | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/src/acpica/source/compiler/Makefile.am b/src/acpica/source/compiler/Makefile.am > index 0812652..398d2a4 100644 > --- a/src/acpica/source/compiler/Makefile.am > +++ b/src/acpica/source/compiler/Makefile.am > @@ -227,6 +227,9 @@ libfwtsiasl_la_SOURCES = \ > ../components/tables/tbinstal.c \ > ../components/tables/tbutils.c \ > ../components/tables/tbxface.c \ > + ../components/tables/tbxfroot.c \ > + ../components/tables/tbxfload.c \ > + ../components/tables/tbprint.c \ > ../tools/acpiexec/aeinitfile.c \ > ../os_specific/service_layers/osunixxf.c > Acked-by: Ivan Hu<ivan.hu@canonical.com>
On 06/04/2015 09:15 PM, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > A 32 bit version of the table printing is not being linked > into the iasl fwts shared library and we are picking up the > wrong one from the acpica execution engine lib instead. This > is causing a segfault when printing a table header on disassembly > because of a pointer size mismatch. > > This was causing the make check tests to fail on the disassembly > test. > > The fix is to build in the appropriate 32 bit table code into > the iasl fwts shared library so we don't have any incompatible > acpica iasl and acpica exec code mixing at link time. > > Tested on: x86_64, i686, armhf, arm64; passes all "make check" tests. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > src/acpica/source/compiler/Makefile.am | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/src/acpica/source/compiler/Makefile.am b/src/acpica/source/compiler/Makefile.am > index 0812652..398d2a4 100644 > --- a/src/acpica/source/compiler/Makefile.am > +++ b/src/acpica/source/compiler/Makefile.am > @@ -227,6 +227,9 @@ libfwtsiasl_la_SOURCES = \ > ../components/tables/tbinstal.c \ > ../components/tables/tbutils.c \ > ../components/tables/tbxface.c \ > + ../components/tables/tbxfroot.c \ > + ../components/tables/tbxfload.c \ > + ../components/tables/tbprint.c \ > ../tools/acpiexec/aeinitfile.c \ > ../os_specific/service_layers/osunixxf.c > > Acked-by: Alex Hung <alex.hung@canonical.com>
diff --git a/src/acpica/source/compiler/Makefile.am b/src/acpica/source/compiler/Makefile.am index 0812652..398d2a4 100644 --- a/src/acpica/source/compiler/Makefile.am +++ b/src/acpica/source/compiler/Makefile.am @@ -227,6 +227,9 @@ libfwtsiasl_la_SOURCES = \ ../components/tables/tbinstal.c \ ../components/tables/tbutils.c \ ../components/tables/tbxface.c \ + ../components/tables/tbxfroot.c \ + ../components/tables/tbxfload.c \ + ../components/tables/tbprint.c \ ../tools/acpiexec/aeinitfile.c \ ../os_specific/service_layers/osunixxf.c