rpms/acpica-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Refresh patches for 20150408 version of sources

Browse Source 
Signed-off-by: Al Stone <ahs3@redhat.com>
This commit is contained in:
Al Stone 2015-04-10 15:49:17 -06:00
parent b26c566376
commit 938de560ff
11 changed files with 444 additions and 661 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OPT_LDFLAGS.patch
View File

@ -1,6 +1,7 @@
diff -Naur acpica-unix2-20140926/generate/unix/Makefile.config acpica-unix2-20140926-patch/generate/unix/Makefile.config Index: src/generate/unix/Makefile.config
--- acpica-unix2-20140926/generate/unix/Makefile.config 2014-09-26 12:02:29.000000000 -0600 ===================================================================
+++ acpica-unix2-20140926-patch/generate/unix/Makefile.config 2014-10-01 12:53:53.510530248 -0600 --- src.orig/generate/unix/Makefile.config
+++ src/generate/unix/Makefile.config
@@ -23,6 +23,9 @@ @@ -23,6 +23,9 @@
# OPT_CFLAGS can be overridden on the make command line by # OPT_CFLAGS can be overridden on the make command line by
# adding OPT_CFLAGS="..." to the invocation. # adding OPT_CFLAGS="..." to the invocation.
@ -11,7 +12,7 @@ diff -Naur acpica-unix2-20140926/generate/unix/Makefile.config acpica-unix2-2014
# Notes: # Notes:
# gcc should be version 4 or greater, otherwise some of the options # gcc should be version 4 or greater, otherwise some of the options
# used will not be recognized. # used will not be recognized.
@@ -43,7 +46,7 @@ @@ -43,7 +46,7 @@ CC = gcc
OBJDIR = obj OBJDIR = obj
BINDIR = bin BINDIR = bin
COMPILEOBJ = $(CC) -c $(CFLAGS) $(OPT_CFLAGS) -o $@ $< COMPILEOBJ = $(CC) -c $(CFLAGS) $(OPT_CFLAGS) -o $@ $<
@ -20,7 +21,7 @@ diff -Naur acpica-unix2-20140926/generate/unix/Makefile.config acpica-unix2-2014
PREFIX ?= /usr PREFIX ?= /usr
INSTALLDIR = $(PREFIX)/bin INSTALLDIR = $(PREFIX)/bin
UNAME_S := $(shell uname -s) UNAME_S := $(shell uname -s)
@@ -136,6 +139,11 @@ @@ -140,6 +143,11 @@ ACPICA_HEADERS = \
OPT_CFLAGS ?= $(CWARNINGFLAGS) OPT_CFLAGS ?= $(CWARNINGFLAGS)
# #

114
aapits-linux.patch
View File

@ -1,7 +1,8 @@
diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapits/tests/aapits/atexec.c Index: src/tests/aapits/atexec.c
--- acpica-unix2-20130626/tests/aapits/atexec.c 2013-01-17 12:48:28.000000000 -0700 ===================================================================
+++ acpica-unix2-20130626-aapits/tests/aapits/atexec.c 2013-07-25 13:44:23.023894441 -0600 --- src.orig/tests/aapits/atexec.c
@@ -639,6 +639,7 @@ +++ src/tests/aapits/atexec.c
@@ -639,6 +639,7 @@ AtBuildLocalFADT2 (
} }
@ -9,7 +10,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapi
/******************************************************************************* /*******************************************************************************
* *
* FUNCTION: AtBuildLocalRSDT * FUNCTION: AtBuildLocalRSDT
@@ -757,8 +758,9 @@ @@ -757,6 +758,7 @@ AtBuildLocalRSDT (
LocalRSDT->Header.Checksum = (UINT8)~LocalRSDT->Header.Checksum; LocalRSDT->Header.Checksum = (UINT8)~LocalRSDT->Header.Checksum;
} }
} }
@ -17,9 +18,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapi
/******************************************************************************* /*******************************************************************************
* @@ -1424,7 +1426,7 @@ AeRegionHandler (
* FUNCTION: AtBuildLocalXSDT
@@ -1424,7 +1426,7 @@
ACPI_WARNING ((AE_INFO, ACPI_WARNING ((AE_INFO,
"Request on [%4.4s] is beyond region limit Req-%X+%X, Base=%X, Len-%X\n", "Request on [%4.4s] is beyond region limit Req-%X+%X, Base=%X, Len-%X\n",
(RegionObject->Region.Node)->Name.Ascii, (UINT32) Address, (RegionObject->Region.Node)->Name.Ascii, (UINT32) Address,
@ -28,7 +27,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapi
return (AE_AML_REGION_LIMIT); return (AE_AML_REGION_LIMIT);
} }
@@ -1799,7 +1801,9 @@ @@ -1799,7 +1801,9 @@ AtCheckInteger(
Path, Obj.Integer.Value, Value); Path, Obj.Integer.Value, Value);
#else #else
printf ("API Error: Value of %s is 0x%llx instead of expected 0x%llx\n", printf ("API Error: Value of %s is 0x%llx instead of expected 0x%llx\n",
@ -39,7 +38,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapi
#endif #endif
Status = AE_ERROR; Status = AE_ERROR;
} }
@@ -1878,7 +1878,7 @@ @@ -1878,7 +1882,7 @@ AtCheckString(
{ {
TestErrors++; TestErrors++;
printf ("Test Error: cannot allocate buffer of %d bytes\n", printf ("Test Error: cannot allocate buffer of %d bytes\n",
@ -48,7 +47,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapi
return (AE_NO_MEMORY); return (AE_NO_MEMORY);
} }
Results.Pointer = Object; Results.Pointer = Object;
@@ -1959,7 +1963,8 @@ @@ -1959,7 +1963,8 @@ AtCheckBuffer(
{ {
printf ("AtCheckBuffer: unexpected length %d of Buffer vs" printf ("AtCheckBuffer: unexpected length %d of Buffer vs"
" calculated %d bytes\n", " calculated %d bytes\n",
@ -58,7 +57,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapi
} }
/* Initialize the return buffer structure */ /* Initialize the return buffer structure */
@@ -1968,7 +1973,7 @@ @@ -1968,7 +1973,7 @@ AtCheckBuffer(
{ {
TestErrors++; TestErrors++;
printf ("Test Error: cannot allocate buffer of %d bytes\n", printf ("Test Error: cannot allocate buffer of %d bytes\n",
@ -67,10 +66,11 @@ diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapi
return (AE_NO_MEMORY); return (AE_NO_MEMORY);
} }
Results.Pointer = Object; Results.Pointer = Object;
diff -urN acpica-unix2-20130626/tests/aapits/atinit.c acpica-unix2-20130626-aapits/tests/aapits/atinit.c Index: src/tests/aapits/atinit.c
--- acpica-unix2-20130626/tests/aapits/atinit.c 2013-01-17 12:48:28.000000000 -0700 ===================================================================
+++ acpica-unix2-20130626-aapits/tests/aapits/atinit.c 2013-07-25 13:20:19.706705960 -0600 --- src.orig/tests/aapits/atinit.c
@@ -3024,7 +3024,7 @@ +++ src/tests/aapits/atinit.c
@@ -3024,7 +3024,7 @@ AtInitTest0041(void)
AapiErrors++; AapiErrors++;
printf ("API Error: AcpiGetSystemInfo() returned" printf ("API Error: AcpiGetSystemInfo() returned"
" Length %d, expected %d\n", " Length %d, expected %d\n",
@ -79,7 +79,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atinit.c acpica-unix2-20130626-aapi
return (AE_ERROR); return (AE_ERROR);
} }
@@ -3046,7 +3046,7 @@ @@ -3046,7 +3046,7 @@ AtInitTest0041(void)
AapiErrors++; AapiErrors++;
printf ("API Error: AcpiGetSystemInfo() returned" printf ("API Error: AcpiGetSystemInfo() returned"
" Length %d, expected %d\n", " Length %d, expected %d\n",
@ -88,7 +88,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atinit.c acpica-unix2-20130626-aapi
return (AE_ERROR); return (AE_ERROR);
} }
@@ -3066,7 +3066,7 @@ @@ -3066,7 +3066,7 @@ AtInitTest0041(void)
AapiErrors++; AapiErrors++;
printf ("API Error: AcpiGetSystemInfo() returned" printf ("API Error: AcpiGetSystemInfo() returned"
" Length %d, expected %d\n", " Length %d, expected %d\n",
@ -97,7 +97,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atinit.c acpica-unix2-20130626-aapi
return (AE_ERROR); return (AE_ERROR);
} }
else if (OutBuffer.Pointer != &Info) else if (OutBuffer.Pointer != &Info)
@@ -3149,7 +3149,7 @@ @@ -3149,7 +3149,7 @@ AtInitTest0042(void)
AapiErrors++; AapiErrors++;
printf ("API Error: AcpiGetSystemInfo() returned" printf ("API Error: AcpiGetSystemInfo() returned"
" Length %d, expected %d\n", " Length %d, expected %d\n",
@ -106,7 +106,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atinit.c acpica-unix2-20130626-aapi
return (AE_ERROR); return (AE_ERROR);
} }
else if (OutBuffer.Pointer != &Info) else if (OutBuffer.Pointer != &Info)
@@ -3214,7 +3214,7 @@ @@ -3214,7 +3214,7 @@ AtInitTest0043(void)
AapiErrors++; AapiErrors++;
printf ("API Error: AcpiGetSystemInfo() returned" printf ("API Error: AcpiGetSystemInfo() returned"
" Length %d, expected %d\n", " Length %d, expected %d\n",
@ -115,10 +115,11 @@ diff -urN acpica-unix2-20130626/tests/aapits/atinit.c acpica-unix2-20130626-aapi
return (AE_ERROR); return (AE_ERROR);
} }
else else
diff -urN acpica-unix2-20130626/tests/aapits/atmain.c acpica-unix2-20130626-aapits/tests/aapits/atmain.c Index: src/tests/aapits/atmain.c
--- acpica-unix2-20130626/tests/aapits/atmain.c 2013-01-17 12:48:28.000000000 -0700 ===================================================================
+++ acpica-unix2-20130626-aapits/tests/aapits/atmain.c 2013-07-25 13:18:22.083323948 -0600 --- src.orig/tests/aapits/atmain.c
@@ -346,7 +336,7 @@ +++ src/tests/aapits/atmain.c
@@ -345,7 +345,7 @@ ExecuteTest (
{ {
printf ("ACPICA API TS err: test num %ld of test case %ld" printf ("ACPICA API TS err: test num %ld of test case %ld"
" is not implemented\n", " is not implemented\n",
@ -127,7 +128,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atmain.c acpica-unix2-20130626-aapi
return (AtRetNotImpl); return (AtRetNotImpl);
} }
@@ -461,7 +451,7 @@ @@ -460,7 +460,7 @@ main(
if (test_case < 1 || test_case > AT_TEST_CASE_NUM) if (test_case < 1 || test_case > AT_TEST_CASE_NUM)
{ {
printf ("ACPICA API TS err: test case %ld is out of range 1 - %d\n", printf ("ACPICA API TS err: test case %ld is out of range 1 - %d\n",
@ -136,7 +137,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atmain.c acpica-unix2-20130626-aapi
return (AtRetBadParam); return (AtRetBadParam);
} }
@@ -469,7 +459,7 @@ @@ -468,7 +468,7 @@ main(
if (test_num < 0 || test_num > AtTestCase[test_case].TestsNum) if (test_num < 0 || test_num > AtTestCase[test_case].TestsNum)
{ {
printf ("ACPICA API TS err: test num %ld is out of range 0 - %d\n", printf ("ACPICA API TS err: test num %ld is out of range 0 - %d\n",
@ -144,11 +145,12 @@ diff -urN acpica-unix2-20130626/tests/aapits/atmain.c acpica-unix2-20130626-aapi
+ (long int) test_num, AtTestCase[test_case].TestsNum); + (long int) test_num, AtTestCase[test_case].TestsNum);
return (AtRetBadParam); return (AtRetBadParam);
} }
diff -urN acpica-unix2-20130626/tests/aapits/atnamespace.c acpica-unix2-20130626-aapits/tests/aapits/atnamespace.c Index: src/tests/aapits/atnamespace.c
--- acpica-unix2-20130626/tests/aapits/atnamespace.c 2013-01-17 12:48:28.000000000 -0700 ===================================================================
+++ acpica-unix2-20130626-aapits/tests/aapits/atnamespace.c 2013-07-25 13:24:15.366466707 -0600 --- src.orig/tests/aapits/atnamespace.c
@@ -2535,7 +2535,8 @@ +++ src/tests/aapits/atnamespace.c
@@ -2535,7 +2535,8 @@ AtGetObjectInfoTypeCommon(
#else #else
printf ("API Error: Address of %s (0x%llX) != (0x%llX)\n", printf ("API Error: Address of %s (0x%llX) != (0x%llX)\n",
PathNames[2 * i + 1], PathNames[2 * i + 1],
@ -158,7 +160,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atnamespace.c acpica-unix2-20130626
#endif #endif
#else #else
printf ("API Error: Address of %s (0x%X) != (0x%X)\n", printf ("API Error: Address of %s (0x%X) != (0x%X)\n",
@@ -2908,7 +2909,8 @@ @@ -2908,7 +2909,8 @@ AtGetNextObjectTypeCommon(
TestErrors++; TestErrors++;
printf ("AtGetNextObjectTypeCommon: different numbers of entities" printf ("AtGetNextObjectTypeCommon: different numbers of entities"
"in TypesNames (%d) and LevelTypes0000 (%d)\n", "in TypesNames (%d) and LevelTypes0000 (%d)\n",
@ -168,7 +170,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atnamespace.c acpica-unix2-20130626
return (AE_ERROR); return (AE_ERROR);
} }
@@ -4192,7 +4194,9 @@ @@ -4192,7 +4194,9 @@ AtCheckHandlePathMapping(
Pathname, Obj.Integer.Value, Value); Pathname, Obj.Integer.Value, Value);
#else #else
printf ("API Error: Value of %s is 0x%llx instead of expected 0x%llx\n", printf ("API Error: Value of %s is 0x%llx instead of expected 0x%llx\n",
@ -179,7 +181,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atnamespace.c acpica-unix2-20130626
#endif #endif
Status = AE_ERROR; Status = AE_ERROR;
} }
@@ -5199,7 +5203,7 @@ @@ -5199,7 +5203,7 @@ AtGetNameExceptionTest(
{ {
AapiErrors++; AapiErrors++;
printf ("API Error: AcpiOsAllocate(%d) returned NULL\n", printf ("API Error: AcpiOsAllocate(%d) returned NULL\n",
@ -188,10 +190,11 @@ diff -urN acpica-unix2-20130626/tests/aapits/atnamespace.c acpica-unix2-20130626
return (AE_ERROR); return (AE_ERROR);
} }
} }
diff -urN acpica-unix2-20130626/tests/aapits/atosxfctrl.c acpica-unix2-20130626-aapits/tests/aapits/atosxfctrl.c Index: src/tests/aapits/atosxfctrl.c
--- acpica-unix2-20130626/tests/aapits/atosxfctrl.c 2013-01-17 12:48:28.000000000 -0700 ===================================================================
+++ acpica-unix2-20130626-aapits/tests/aapits/atosxfctrl.c 2013-07-25 13:30:00.375492751 -0600 --- src.orig/tests/aapits/atosxfctrl.c
@@ -737,13 +737,15 @@ +++ src/tests/aapits/atosxfctrl.c
@@ -737,13 +737,15 @@ ACPI_OSXF_EMUL_REG
#if ACPI_MACHINE_WIDTH == 64 #if ACPI_MACHINE_WIDTH == 64
#ifdef _MSC_VER #ifdef _MSC_VER
printf("OsxfCtrlFingReg: unexpected Width %d of Reg 0x%I64x\n", printf("OsxfCtrlFingReg: unexpected Width %d of Reg 0x%I64x\n",
@ -208,7 +211,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atosxfctrl.c acpica-unix2-20130626-
return (NULL); return (NULL);
} }
@@ -764,15 +766,19 @@ @@ -764,15 +766,19 @@ ACPI_OSXF_EMUL_REG
#ifdef _MSC_VER #ifdef _MSC_VER
printf("OsxfCtrlFingReg: intersection Regs (0x%I64x: 0x%x)" printf("OsxfCtrlFingReg: intersection Regs (0x%I64x: 0x%x)"
" and (0x%I64x: 0x%x)\n", " and (0x%I64x: 0x%x)\n",
@ -229,7 +232,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atosxfctrl.c acpica-unix2-20130626-
return (NULL); return (NULL);
} }
} }
@@ -786,13 +792,15 @@ @@ -786,13 +792,15 @@ ACPI_OSXF_EMUL_REG
#if ACPI_MACHINE_WIDTH == 64 #if ACPI_MACHINE_WIDTH == 64
#ifdef _MSC_VER #ifdef _MSC_VER
printf("OsxfCtrlFingReg: no memory for Reg (0x%I64x: 0x%x)\n", printf("OsxfCtrlFingReg: no memory for Reg (0x%I64x: 0x%x)\n",
@ -246,7 +249,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atosxfctrl.c acpica-unix2-20130626-
return (NULL); return (NULL);
} }
Reg->Type = Type; Reg->Type = Type;
@@ -932,14 +940,19 @@ @@ -932,14 +940,19 @@ OsxfCtrlRegService(UINT32 ServiceFlag)
#if ACPI_MACHINE_WIDTH == 64 #if ACPI_MACHINE_WIDTH == 64
#ifdef _MSC_VER #ifdef _MSC_VER
printf("%.2u (%s Address 0x%I64x: Width %.2u) r/w counts: %u/%u\n", printf("%.2u (%s Address 0x%I64x: Width %.2u) r/w counts: %u/%u\n",
@ -267,10 +270,11 @@ diff -urN acpica-unix2-20130626/tests/aapits/atosxfctrl.c acpica-unix2-20130626-
Reg = Reg->Next; Reg = Reg->Next;
i++; i++;
} }
diff -urN acpica-unix2-20130626/tests/aapits/atresource.c acpica-unix2-20130626-aapits/tests/aapits/atresource.c Index: src/tests/aapits/atresource.c
--- acpica-unix2-20130626/tests/aapits/atresource.c 2013-01-17 12:48:29.000000000 -0700 ===================================================================
+++ acpica-unix2-20130626-aapits/tests/aapits/atresource.c 2013-07-25 13:25:49.423565947 -0600 --- src.orig/tests/aapits/atresource.c
@@ -174,7 +174,7 @@ +++ src/tests/aapits/atresource.c
@@ -174,7 +174,7 @@ AtRsrcTest0000(void)
AapiErrors++; AapiErrors++;
printf ("API Error: AcpiGetCurrentResources(%s) returned Length %d," printf ("API Error: AcpiGetCurrentResources(%s) returned Length %d,"
" expected %d\n", " expected %d\n",
@ -279,7 +283,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atresource.c acpica-unix2-20130626-
return (AE_ERROR); return (AE_ERROR);
} }
@@ -490,7 +490,7 @@ @@ -490,7 +490,7 @@ AtRsrcTest0005(void)
AapiErrors++; AapiErrors++;
printf ("API Error: AcpiGetCurrentResources(%s) returned Length %d," printf ("API Error: AcpiGetCurrentResources(%s) returned Length %d,"
" expected %d\n", " expected %d\n",
@ -288,7 +292,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atresource.c acpica-unix2-20130626-
return (AE_ERROR); return (AE_ERROR);
} }
@@ -689,7 +689,7 @@ @@ -689,7 +689,7 @@ AtRsrcTest0007(void)
AapiErrors++; AapiErrors++;
printf ("Api Error: Resource->Length (%d) != %d\n", printf ("Api Error: Resource->Length (%d) != %d\n",
CurrentResource->Length, CurrentResource->Length,
@ -297,7 +301,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atresource.c acpica-unix2-20130626-
} }
if (CurrentResource->Data.Irq.Triggering != 0) /* Level-Triggered */ if (CurrentResource->Data.Irq.Triggering != 0) /* Level-Triggered */
@@ -981,7 +981,7 @@ @@ -981,7 +981,7 @@ AtRsrcTest0012(void)
AapiErrors++; AapiErrors++;
printf ("API Error: AcpiGetPossibleResources(%s) returned Length %d," printf ("API Error: AcpiGetPossibleResources(%s) returned Length %d,"
" expected %d\n", " expected %d\n",
@ -306,7 +310,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atresource.c acpica-unix2-20130626-
return (AE_ERROR); return (AE_ERROR);
} }
@@ -1923,7 +1923,7 @@ @@ -1923,7 +1923,7 @@ AtRsrcTest0026(void)
AapiErrors++; AapiErrors++;
printf ("API Error: AcpiGetIrqRoutingTable(%s) returned Length %d," printf ("API Error: AcpiGetIrqRoutingTable(%s) returned Length %d,"
" expected %d\n", " expected %d\n",
@ -314,16 +318,4 @@ diff -urN acpica-unix2-20130626/tests/aapits/atresource.c acpica-unix2-20130626-
+ Pathname, (int) OutBuffer.Length, 0xA48); + Pathname, (int) OutBuffer.Length, 0xA48);
return (AE_ERROR); return (AE_ERROR);
} }
diff -urN acpica-unix2-20130626/tests/aapits/Makefile acpica-unix2-20130626-aapits/tests/aapits/Makefile
--- acpica-unix2-20130626/tests/aapits/Makefile 2013-01-17 12:48:29.000000000 -0700
+++ acpica-unix2-20130626-aapits/tests/aapits/Makefile 2013-07-25 15:17:09.309236422 -0600
@@ -199,7 +199,7 @@
CFLAGS+= -Wall -g -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_APITS -DACPI_EXEC_APP -D_MULTI_THREADED -Wstrict-prototypes -I../../source/include
-acpiexec : $(patsubst %.c,%.o, $(SRCS))
+$(PROG) : $(patsubst %.c,%.o, $(SRCS))
$(CC) $(LDFLAGS) $(patsubst %.c,%.o, $(SRCS)) -o $(PROG)
CLEANFILES= $(PROG)

35
aapits-makefile.patch
View File

@ -1,35 +0,0 @@
diff -Naur acpica/tests/aapits/Makefile acpica-patch/tests/aapits/Makefile
--- acpica/tests/aapits/Makefile 2014-11-07 10:48:14.000000000 -0700
+++ acpica-patch/tests/aapits/Makefile 2014-11-17 18:32:45.816167012 -0700
@@ -16,6 +16,7 @@
atosxfwrap.c \
osunixxf.c \
../../source/common/ahids.c \
+ ../../source/common/ahuuids.c \
../../source/common/cmfsize.c \
../../source/common/getopt.c \
../../source/components/hardware/hwtimer.c \
@@ -45,6 +46,7 @@
../../source/components/disassembler/dmresrcs.c \
../../source/components/disassembler/dmutils.c \
../../source/components/disassembler/dmwalk.c \
+ ../../source/components/disassembler/dmcstyle.c \
../../source/components/events/evevent.c \
../../source/components/events/evgpe.c \
../../source/components/events/evgpeblk.c \
@@ -174,6 +176,7 @@
../../source/components/utilities/utexcep.c \
../../source/components/utilities/utfileio.c \
../../source/components/utilities/utglobal.c \
+ ../../source/components/utilities/uthex.c \
../../source/components/utilities/utids.c \
../../source/components/utilities/utinit.c \
../../source/components/utilities/utlock.c \
@@ -189,6 +192,7 @@
../../source/components/utilities/utstate.c \
../../source/components/utilities/utstring.c \
../../source/components/utilities/uttrack.c \
+ ../../source/components/utilities/utuuid.c \
../../source/components/utilities/utxface.c \
../../source/components/utilities/utxferror.c \
../../source/components/utilities/utxfinit.c \

24
acpica-tools.spec
View File

@ -1,5 +1,5 @@
Name: acpica-tools Name: acpica-tools
Version: 20150204 Version: 20150408
Release: 1%{?dist} Release: 1%{?dist}
Summary: ACPICA tools for the development and debug of ACPI tables Summary: ACPICA tools for the development and debug of ACPI tables
@ -28,11 +28,10 @@ Patch1: debian-unaligned.patch
Patch2: name-miscompare.patch Patch2: name-miscompare.patch
Patch3: aapits-linux.patch Patch3: aapits-linux.patch
Patch4: asllookup-miscompare.patch Patch4: asllookup-miscompare.patch
Patch5: aapits-makefile.patch Patch5: re-enable-big-endian.patch
Patch6: re-enable-big-endian.patch Patch6: OPT_LDFLAGS.patch
Patch7: OPT_LDFLAGS.patch Patch7: int-format.patch
Patch8: int-format.patch Patch8: f23-harden.patch
Patch9: f23-harden.patch
BuildRequires: bison patchutils flex BuildRequires: bison patchutils flex
@ -88,11 +87,10 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
%patch2 -p1 -b .name-miscompare %patch2 -p1 -b .name-miscompare
%patch3 -p1 -b .aapits-linux %patch3 -p1 -b .aapits-linux
%patch4 -p1 -b .asllookup-miscompare %patch4 -p1 -b .asllookup-miscompare
%patch5 -p1 -b .aapits-makefile %patch5 -p1 -b .re-enable-big-endian
%patch6 -p1 -b .re-enable-big-endian %patch6 -p1 -b .OPT_LDFLAGS
%patch7 -p1 -b .OPT_LDFLAGS %patch7 -p1 -b .int-format
%patch8 -p1 -b .int-format %patch8 -p1 -b .f23-harden
%patch9 -p1 -b .f23-harden
cp -p %{SOURCE2} README.Fedora cp -p %{SOURCE2} README.Fedora
cp -p %{SOURCE3} iasl.1 cp -p %{SOURCE3} iasl.1
@ -197,6 +195,10 @@ fi
%changelog %changelog
* Fri Apr 10 2015 Al Stone <ahs3@redhat.com> - 20150408-1
- Update to latest upstream. Closes BZ#1190383
- Refresh patches
* Mon Mar 2 2015 Al Stone <ahs3@redhat.com> - 20150204-1 * Mon Mar 2 2015 Al Stone <ahs3@redhat.com> - 20150204-1
- Update to latest upstream. Closes BZ#1190383 - Update to latest upstream. Closes BZ#1190383
- Refresh patches - Refresh patches

11
asllookup-miscompare.patch
View File

@ -1,7 +1,8 @@
diff -urN acpica-unix2-20140214/source/compiler/asllookup.c acpica-unix2-20140214-patch/source/compiler/asllookup.c Index: src/source/compiler/asllookup.c
--- acpica-unix2-20140214/source/compiler/asllookup.c 2014-02-14 16:23:33.000000000 -0700 ===================================================================
+++ acpica-unix2-20140214-patch/source/compiler/asllookup.c 2014-02-27 11:50:52.168659866 -0700 --- src.orig/source/compiler/asllookup.c
@@ -119,6 +119,7 @@ +++ src/source/compiler/asllookup.c
@@ -119,6 +119,7 @@ LkIsObjectUsed (
{ {
ACPI_NAMESPACE_NODE *Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle); ACPI_NAMESPACE_NODE *Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle);
ACPI_NAMESPACE_NODE *Next; ACPI_NAMESPACE_NODE *Next;
@ -9,7 +10,7 @@ diff -urN acpica-unix2-20140214/source/compiler/asllookup.c acpica-unix2-2014021
/* Referenced flag is set during the namespace xref */ /* Referenced flag is set during the namespace xref */
@@ -162,8 +163,9 @@ @@ -162,8 +163,9 @@ LkIsObjectUsed (
* Issue a remark even if it is a reserved name (starts * Issue a remark even if it is a reserved name (starts
* with an underscore). * with an underscore).
*/ */

621
debian-big_endian.patch
View File

File diff suppressed because it is too large Load Diff

58
debian-unaligned.patch
View File

@ -15,11 +15,11 @@ Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
source/include/actypes.h | 26 +++++++++++++------------- source/include/actypes.h | 26 +++++++++++++-------------
3 file modificati, 32 inserzioni(+), 21 rimozioni(-) 3 file modificati, 32 inserzioni(+), 21 rimozioni(-)
diff --git a/source/compiler/asltree.c b/source/compiler/asltree.c Index: src/source/compiler/asltree.c
index ebf87f3..fd859d7 100644 ===================================================================
--- a/source/compiler/asltree.c --- src.orig/source/compiler/asltree.c
+++ b/source/compiler/asltree.c +++ src/source/compiler/asltree.c
@@ -782,28 +592,31 @@ TrCreateValuedLeafNode ( @@ -862,28 +862,31 @@ TrCreateValuedLeafNode (
"\nCreateValuedLeafNode Ln/Col %u/%u NewNode %p Op %s Value %8.8X%8.8X ", "\nCreateValuedLeafNode Ln/Col %u/%u NewNode %p Op %s Value %8.8X%8.8X ",
Op->Asl.LineNumber, Op->Asl.Column, Op, UtGetOpName(ParseOpcode), Op->Asl.LineNumber, Op->Asl.Column, Op, UtGetOpName(ParseOpcode),
ACPI_FORMAT_UINT64 (Value)); ACPI_FORMAT_UINT64 (Value));
@ -28,53 +28,54 @@ index ebf87f3..fd859d7 100644
switch (ParseOpcode) switch (ParseOpcode)
{ {
case PARSEOP_STRING_LITERAL: case PARSEOP_STRING_LITERAL:
- DbgPrint (ASL_PARSE_OUTPUT, "STRING->%s", Value); - DbgPrint (ASL_PARSE_OUTPUT, "STRING->%s", Value);
+ Op->Asl.Value.String = (ACPI_STRING) (ACPI_SIZE) Value; + Op->Asl.Value.String = (ACPI_STRING) (ACPI_SIZE) Value;
+ DbgPrint (ASL_PARSE_OUTPUT, "STRING->%s", Op->Asl.Value.String); + DbgPrint (ASL_PARSE_OUTPUT, "STRING->%s", Op->Asl.Value.String);
break; break;
case PARSEOP_NAMESEG: case PARSEOP_NAMESEG:
- DbgPrint (ASL_PARSE_OUTPUT, "NAMESEG->%s", Value); - DbgPrint (ASL_PARSE_OUTPUT, "NAMESEG->%s", Value);
+ Op->Asl.Value.String = (ACPI_STRING) (ACPI_SIZE) Value; + Op->Asl.Value.String = (ACPI_STRING) (ACPI_SIZE) Value;
+ DbgPrint (ASL_PARSE_OUTPUT, "NAMESEG->%s", Op->Asl.Value.String); + DbgPrint (ASL_PARSE_OUTPUT, "NAMESEG->%s", Op->Asl.Value.String);
break; break;
case PARSEOP_NAMESTRING: case PARSEOP_NAMESTRING:
- DbgPrint (ASL_PARSE_OUTPUT, "NAMESTRING->%s", Value); - DbgPrint (ASL_PARSE_OUTPUT, "NAMESTRING->%s", Value);
+ Op->Asl.Value.String = (ACPI_STRING) (ACPI_SIZE) Value; + Op->Asl.Value.String = (ACPI_STRING) (ACPI_SIZE) Value;
+ DbgPrint (ASL_PARSE_OUTPUT, "NAMESTRING->%s", Op->Asl.Value.String); + DbgPrint (ASL_PARSE_OUTPUT, "NAMESTRING->%s", Op->Asl.Value.String);
break; break;
case PARSEOP_EISAID: case PARSEOP_EISAID:
- DbgPrint (ASL_PARSE_OUTPUT, "EISAID->%s", Value); - DbgPrint (ASL_PARSE_OUTPUT, "EISAID->%s", Value);
+ Op->Asl.Value.String = (ACPI_STRING) (ACPI_SIZE) Value; + Op->Asl.Value.String = (ACPI_STRING) (ACPI_SIZE) Value;
+ DbgPrint (ASL_PARSE_OUTPUT, "EISAID->%s", Op->Asl.Value.String); + DbgPrint (ASL_PARSE_OUTPUT, "EISAID->%s", Op->Asl.Value.String);
break; break;
case PARSEOP_METHOD: case PARSEOP_METHOD:
@@ -813,11 +622,13 @@ TrCreateValuedLeafNode ( @@ -893,12 +896,14 @@ TrCreateValuedLeafNode (
case PARSEOP_INTEGER: case PARSEOP_INTEGER:
+ Op->Asl.Value.Integer = Value; + Op->Asl.Value.Integer = Value;
DbgPrint (ASL_PARSE_OUTPUT, "INTEGER"); DbgPrint (ASL_PARSE_OUTPUT, "INTEGER->%8.8X%8.8X",
ACPI_FORMAT_UINT64 (Value));
break; break;
default: default:
+ Op->Asl.Value.Integer = Value; + Op->Asl.Value.Integer = Value;
break; break;
} }
diff --git a/source/components/executer/exoparg2.c b/source/components/executer/exoparg2.c Index: src/source/components/executer/exoparg2.c
index e55f40c..ed5b1fd 100644 ===================================================================
--- a/source/components/executer/exoparg2.c --- src.orig/source/components/executer/exoparg2.c
+++ b/source/components/executer/exoparg2.c +++ src/source/components/executer/exoparg2.c
@@ -172,6 +176,8 @@ AcpiExOpcode_2A_2T_1R ( @@ -172,6 +172,8 @@ AcpiExOpcode_2A_2T_1R (
ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0]; ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0];
ACPI_OPERAND_OBJECT *ReturnDesc1 = NULL; ACPI_OPERAND_OBJECT *ReturnDesc1 = NULL;
ACPI_OPERAND_OBJECT *ReturnDesc2 = NULL; ACPI_OPERAND_OBJECT *ReturnDesc2 = NULL;
@ -83,7 +84,7 @@ index e55f40c..ed5b1fd 100644
ACPI_STATUS Status; ACPI_STATUS Status;
@@ -205,8 +211,10 @@ AcpiExOpcode_2A_2T_1R ( @@ -205,8 +207,10 @@ AcpiExOpcode_2A_2T_1R (
Status = AcpiUtDivide (Operand[0]->Integer.Value, Status = AcpiUtDivide (Operand[0]->Integer.Value,
Operand[1]->Integer.Value, Operand[1]->Integer.Value,
@ -96,7 +97,7 @@ index e55f40c..ed5b1fd 100644
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
goto Cleanup; goto Cleanup;
@@ -280,6 +285,7 @@ AcpiExOpcode_2A_1T_1R ( @@ -280,6 +284,7 @@ AcpiExOpcode_2A_1T_1R (
ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0]; ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0];
ACPI_OPERAND_OBJECT *ReturnDesc = NULL; ACPI_OPERAND_OBJECT *ReturnDesc = NULL;
UINT64 Index; UINT64 Index;
@ -104,7 +105,7 @@ index e55f40c..ed5b1fd 100644
ACPI_STATUS Status = AE_OK; ACPI_STATUS Status = AE_OK;
ACPI_SIZE Length = 0; ACPI_SIZE Length = 0;
@@ -323,7 +333,8 @@ AcpiExOpcode_2A_1T_1R ( @@ -323,7 +328,8 @@ AcpiExOpcode_2A_1T_1R (
Status = AcpiUtDivide (Operand[0]->Integer.Value, Status = AcpiUtDivide (Operand[0]->Integer.Value,
Operand[1]->Integer.Value, Operand[1]->Integer.Value,
NULL, NULL,
@ -114,11 +115,11 @@ index e55f40c..ed5b1fd 100644
break; break;
case AML_CONCAT_OP: /* Concatenate (Data1, Data2, Result) */ case AML_CONCAT_OP: /* Concatenate (Data1, Data2, Result) */
diff --git a/source/include/actypes.h b/source/include/actypes.h Index: src/source/include/actypes.h
index 07fb7d5..08bdf2f 100644 ===================================================================
--- a/source/include/actypes.h --- src.orig/source/include/actypes.h
+++ b/source/include/actypes.h +++ src/source/include/actypes.h
@@ -143,6 +156,19 @@ typedef COMPILER_DEPENDENT_INT64 INT64; @@ -143,6 +143,19 @@ typedef COMPILER_DEPENDENT_INT64
*/ */
#define ACPI_THREAD_ID UINT64 #define ACPI_THREAD_ID UINT64
@ -138,7 +139,7 @@ index 07fb7d5..08bdf2f 100644
/******************************************************************************* /*******************************************************************************
* *
@@ -169,19 +182,6 @@ typedef UINT64 ACPI_PHYSICAL_ADDRESS; @@ -169,19 +182,6 @@ typedef UINT64
#define ACPI_SIZE_MAX ACPI_UINT64_MAX #define ACPI_SIZE_MAX ACPI_UINT64_MAX
#define ACPI_USE_NATIVE_DIVIDE /* Has native 64-bit integer support */ #define ACPI_USE_NATIVE_DIVIDE /* Has native 64-bit integer support */
@ -158,6 +159,3 @@ index 07fb7d5..08bdf2f 100644
/******************************************************************************* /*******************************************************************************
* *
--
1.7.12.1

18
f23-harden.patch
View File

@ -1,7 +1,8 @@
diff -Naur acpica-unix2-20150204/generate/unix/Makefile.config acpica-unix2-20150204-new/generate/unix/Makefile.config Index: src/generate/unix/Makefile.config
--- acpica-unix2-20150204/generate/unix/Makefile.config 2015-04-06 17:12:41.069521987 -0600 ===================================================================
+++ acpica-unix2-20150204-new/generate/unix/Makefile.config 2015-04-06 17:14:43.218806842 -0600 --- src.orig/generate/unix/Makefile.config
@@ -159,6 +159,8 @@ +++ src/generate/unix/Makefile.config
@@ -163,6 +163,8 @@ ifneq ($(NOFORTIFY),TRUE)
OPT_CFLAGS += -D_FORTIFY_SOURCE=2 OPT_CFLAGS += -D_FORTIFY_SOURCE=2
endif endif
@ -10,10 +11,11 @@ diff -Naur acpica-unix2-20150204/generate/unix/Makefile.config acpica-unix2-2015
CFLAGS += \ CFLAGS += \
-D$(HOST)\ -D$(HOST)\
-D_GNU_SOURCE\ -D_GNU_SOURCE\
diff -Naur acpica-unix2-20150204/generate/unix/iasl/Makefile acpica-unix2-20150204-new/generate/unix/iasl/Makefile Index: src/generate/unix/iasl/Makefile
--- acpica-unix2-20150204/generate/unix/iasl/Makefile 2015-02-04 14:12:17.000000000 -0700 ===================================================================
+++ acpica-unix2-20150204-new/generate/unix/iasl/Makefile 2015-04-06 17:34:07.199134458 -0600 --- src.orig/generate/unix/iasl/Makefile
@@ -301,20 +301,21 @@ +++ src/generate/unix/iasl/Makefile
@@ -301,20 +301,21 @@ $(OBJDIR)/prparserparse.c : $(ASL_COM
# Cannot use the common compile warning flags since the C files are created # Cannot use the common compile warning flags since the C files are created
# by the utilities above and they are not necessarily ANSI C, etc. # by the utilities above and they are not necessarily ANSI C, etc.
# #

193
int-format.patch
View File

@ -1,7 +1,8 @@
diff -Naur acpica-unix2-20150204.orig/source/compiler/aslcompile.c acpica-unix2-20150204/source/compiler/aslcompile.c Index: src/source/compiler/aslcompile.c
--- acpica-unix2-20150204.orig/source/compiler/aslcompile.c 2015-03-02 17:11:22.300989116 -0700 ===================================================================
+++ acpica-unix2-20150204/source/compiler/aslcompile.c 2015-03-02 17:11:36.883174716 -0700 --- src.orig/source/compiler/aslcompile.c
@@ -680,7 +680,7 @@ +++ src/source/compiler/aslcompile.c
@@ -688,7 +688,7 @@ CmCleanupAndExit (
if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT) if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
{ {
@ -10,10 +11,11 @@ diff -Naur acpica-unix2-20150204.orig/source/compiler/aslcompile.c acpica-unix2-
ASL_MAX_ERROR_COUNT); ASL_MAX_ERROR_COUNT);
} }
diff -Naur acpica-unix2-20150204.orig/source/tools/acpiexec/aemain.c acpica-unix2-20150204/source/tools/acpiexec/aemain.c Index: src/source/tools/acpiexec/aemain.c
--- acpica-unix2-20150204.orig/source/tools/acpiexec/aemain.c 2015-03-02 17:11:22.313989281 -0700 ===================================================================
+++ acpica-unix2-20150204/source/tools/acpiexec/aemain.c 2015-03-02 17:12:42.467009457 -0700 --- src.orig/source/tools/acpiexec/aemain.c
@@ -197,7 +197,7 @@ +++ src/source/tools/acpiexec/aemain.c
@@ -197,7 +197,7 @@ AeDoOptions (
if (strlen (AcpiGbl_Optarg) > (AE_BUFFER_SIZE -1)) if (strlen (AcpiGbl_Optarg) > (AE_BUFFER_SIZE -1))
{ {
@ -22,10 +24,11 @@ diff -Naur acpica-unix2-20150204.orig/source/tools/acpiexec/aemain.c acpica-unix
(UINT32) strlen (AcpiGbl_Optarg), (AE_BUFFER_SIZE -1)); (UINT32) strlen (AcpiGbl_Optarg), (AE_BUFFER_SIZE -1));
return (-1); return (-1);
} }
diff -Naur acpica-unix2-20150204.orig/source/compiler/aslerror.c acpica-unix2-20150204/source/compiler/aslerror.c Index: src/source/compiler/aslerror.c
--- acpica-unix2-20150204.orig/source/compiler/aslerror.c 2015-02-04 14:12:18.000000000 -0700 ===================================================================
+++ acpica-unix2-20150204/source/compiler/aslerror.c 2015-03-02 19:01:35.880311085 -0700 --- src.orig/source/compiler/aslerror.c
@@ -685,7 +685,7 @@ +++ src/source/compiler/aslerror.c
@@ -685,7 +685,7 @@ AslCommonError (
Gbl_ExceptionCount[Level]++; Gbl_ExceptionCount[Level]++;
if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT) if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
{ {
@ -34,7 +37,7 @@ diff -Naur acpica-unix2-20150204.orig/source/compiler/aslerror.c acpica-unix2-20
Gbl_SourceLine = 0; Gbl_SourceLine = 0;
Gbl_NextError = Gbl_ErrorLog; Gbl_NextError = Gbl_ErrorLog;
@@ -731,7 +731,7 @@ @@ -731,7 +731,7 @@ AslDisableException (
if (Gbl_DisabledMessagesIndex >= ASL_MAX_DISABLED_MESSAGES) if (Gbl_DisabledMessagesIndex >= ASL_MAX_DISABLED_MESSAGES)
{ {
@ -43,10 +46,11 @@ diff -Naur acpica-unix2-20150204.orig/source/compiler/aslerror.c acpica-unix2-20
ASL_MAX_DISABLED_MESSAGES); ASL_MAX_DISABLED_MESSAGES);
return (AE_LIMIT); return (AE_LIMIT);
} }
diff -Naur acpica-unix2-20150204.orig/source/components/debugger/dbexec.c acpica-unix2-20150204/source/components/debugger/dbexec.c Index: src/source/components/debugger/dbexec.c
--- acpica-unix2-20150204.orig/source/components/debugger/dbexec.c 2015-02-04 14:12:19.000000000 -0700 ===================================================================
+++ acpica-unix2-20150204/source/components/debugger/dbexec.c 2015-03-02 19:03:54.240975631 -0700 --- src.orig/source/components/debugger/dbexec.c
@@ -214,7 +214,7 @@ +++ src/source/components/debugger/dbexec.c
@@ -214,7 +214,7 @@ AcpiDbExecuteMethod (
{ {
ACPI_ERROR ((AE_INFO, ACPI_ERROR ((AE_INFO,
"Possible overflow of internal debugger buffer (size 0x%X needed 0x%X)", "Possible overflow of internal debugger buffer (size 0x%X needed 0x%X)",
@ -55,10 +59,11 @@ diff -Naur acpica-unix2-20150204.orig/source/components/debugger/dbexec.c acpica
} }
} }
diff -Naur acpica-unix2-20150204.orig/source/compiler/aslopt.c acpica-unix2-20150204/source/compiler/aslopt.c Index: src/source/compiler/aslopt.c
--- acpica-unix2-20150204.orig/source/compiler/aslopt.c 2015-02-04 14:12:18.000000000 -0700 ===================================================================
+++ acpica-unix2-20150204/source/compiler/aslopt.c 2015-03-03 17:49:35.616964598 -0700 --- src.orig/source/compiler/aslopt.c
@@ -576,7 +576,7 @@ +++ src/source/compiler/aslopt.c
@@ -576,7 +576,7 @@ OptOptimizeNamePath (
} }
ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OPTIMIZATIONS, ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OPTIMIZATIONS,
@ -67,10 +72,11 @@ diff -Naur acpica-unix2-20150204.orig/source/compiler/aslopt.c acpica-unix2-2015
Op->Asl.LogicalLineNumber, Op->Asl.LogicalLineNumber,
AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode), AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode),
AcpiPsGetOpcodeName (Op->Common.AmlOpcode))); AcpiPsGetOpcodeName (Op->Common.AmlOpcode)));
diff -Naur acpica-unix2-20150204.orig/source/components/dispatcher/dsmthdat.c acpica-unix2-20150204/source/components/dispatcher/dsmthdat.c Index: src/source/components/dispatcher/dsmthdat.c
--- acpica-unix2-20150204.orig/source/components/dispatcher/dsmthdat.c 2015-02-04 14:12:19.000000000 -0700 ===================================================================
+++ acpica-unix2-20150204/source/components/dispatcher/dsmthdat.c 2015-03-03 17:50:38.719711924 -0700 --- src.orig/source/components/dispatcher/dsmthdat.c
@@ -287,7 +287,7 @@ +++ src/source/components/dispatcher/dsmthdat.c
@@ -287,7 +287,7 @@ AcpiDsMethodDataGetNode (
if (Index > ACPI_METHOD_MAX_LOCAL) if (Index > ACPI_METHOD_MAX_LOCAL)
{ {
ACPI_ERROR ((AE_INFO, ACPI_ERROR ((AE_INFO,
@ -79,7 +85,7 @@ diff -Naur acpica-unix2-20150204.orig/source/components/dispatcher/dsmthdat.c ac
Index, ACPI_METHOD_MAX_LOCAL)); Index, ACPI_METHOD_MAX_LOCAL));
return_ACPI_STATUS (AE_AML_INVALID_INDEX); return_ACPI_STATUS (AE_AML_INVALID_INDEX);
} }
@@ -302,7 +302,7 @@ @@ -302,7 +302,7 @@ AcpiDsMethodDataGetNode (
if (Index > ACPI_METHOD_MAX_ARG) if (Index > ACPI_METHOD_MAX_ARG)
{ {
ACPI_ERROR ((AE_INFO, ACPI_ERROR ((AE_INFO,
@ -88,10 +94,11 @@ diff -Naur acpica-unix2-20150204.orig/source/components/dispatcher/dsmthdat.c ac
Index, ACPI_METHOD_MAX_ARG)); Index, ACPI_METHOD_MAX_ARG));
return_ACPI_STATUS (AE_AML_INVALID_INDEX); return_ACPI_STATUS (AE_AML_INVALID_INDEX);
} }
diff -Naur acpica-unix2-20150204.orig/source/compiler/aslpredef.c acpica-unix2-20150204/source/compiler/aslpredef.c Index: src/source/compiler/aslpredef.c
--- acpica-unix2-20150204.orig/source/compiler/aslpredef.c 2015-02-04 14:12:18.000000000 -0700 ===================================================================
+++ acpica-unix2-20150204/source/compiler/aslpredef.c 2015-03-03 18:13:02.317600741 -0700 --- src.orig/source/compiler/aslpredef.c
@@ -114,7 +114,7 @@ +++ src/source/compiler/aslpredef.c
@@ -114,7 +114,7 @@ ApCheckForPredefinedMethod (
if (MethodInfo->NumArguments != 0) if (MethodInfo->NumArguments != 0)
{ {
@ -100,10 +107,11 @@ diff -Naur acpica-unix2-20150204.orig/source/compiler/aslpredef.c acpica-unix2-2
AslError (ASL_WARNING, ASL_MSG_RESERVED_ARG_COUNT_HI, Op, AslError (ASL_WARNING, ASL_MSG_RESERVED_ARG_COUNT_HI, Op,
MsgBuffer); MsgBuffer);
diff -Naur acpica-unix2-20150204.orig/source/compiler/aslprepkg.c acpica-unix2-20150204/source/compiler/aslprepkg.c Index: src/source/compiler/aslprepkg.c
--- acpica-unix2-20150204.orig/source/compiler/aslprepkg.c 2015-02-04 14:12:18.000000000 -0700 ===================================================================
+++ acpica-unix2-20150204/source/compiler/aslprepkg.c 2015-03-03 18:31:00.963530037 -0700 --- src.orig/source/compiler/aslprepkg.c
@@ -297,7 +297,7 @@ +++ src/source/compiler/aslprepkg.c
@@ -297,7 +297,7 @@ ApCheckPackage (
if (Count & 1) if (Count & 1)
{ {
@ -112,10 +120,11 @@ diff -Naur acpica-unix2-20150204.orig/source/compiler/aslprepkg.c acpica-unix2-2
Predefined->Info.Name, Count); Predefined->Info.Name, Count);
AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH, AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH,
diff -Naur acpica-unix2-20150204.orig/source/compiler/aslutils.c acpica-unix2-20150204/source/compiler/aslutils.c Index: src/source/compiler/aslutils.c
--- acpica-unix2-20150204.orig/source/compiler/aslutils.c 2015-02-04 14:12:18.000000000 -0700 ===================================================================
+++ acpica-unix2-20150204/source/compiler/aslutils.c 2015-03-04 12:03:36.567992558 -0700 --- src.orig/source/compiler/aslutils.c
@@ -77,7 +77,7 @@ +++ src/source/compiler/aslutils.c
@@ -77,7 +77,7 @@ UtAttachNameseg (
* *
******************************************************************************/ ******************************************************************************/
@ -124,7 +133,7 @@ diff -Naur acpica-unix2-20150204.orig/source/compiler/aslutils.c acpica-unix2-20
void void
UtDisplaySupportedTables ( UtDisplaySupportedTables (
@@ -89,7 +89,7 @@ @@ -89,7 +89,7 @@ UtDisplaySupportedTables (
printf ("\nACPI tables supported by iASL version %8.8X:\n" printf ("\nACPI tables supported by iASL version %8.8X:\n"
" (Compiler, Disassembler, Template Generator)\n\n", " (Compiler, Disassembler, Template Generator)\n\n",
@ -133,7 +142,7 @@ diff -Naur acpica-unix2-20150204.orig/source/compiler/aslutils.c acpica-unix2-20
/* Special tables */ /* Special tables */
@@ -104,7 +104,7 @@ @@ -104,7 +104,7 @@ UtDisplaySupportedTables (
printf ("\n Standard ACPI data tables:\n"); printf ("\n Standard ACPI data tables:\n");
for (TableData = AcpiDmTableData, i = 5; TableData->Signature; TableData++, i++) for (TableData = AcpiDmTableData, i = 5; TableData->Signature; TableData++, i++)
{ {
@ -142,10 +151,11 @@ diff -Naur acpica-unix2-20150204.orig/source/compiler/aslutils.c acpica-unix2-20
} }
} }
diff -Naur acpica-unix2-20150204.orig/source/components/dispatcher/dsutils.c acpica-unix2-20150204/source/components/dispatcher/dsutils.c Index: src/source/components/dispatcher/dsutils.c
--- acpica-unix2-20150204.orig/source/components/dispatcher/dsutils.c 2015-02-04 14:12:19.000000000 -0700 ===================================================================
+++ acpica-unix2-20150204/source/components/dispatcher/dsutils.c 2015-03-04 12:05:14.938088002 -0700 --- src.orig/source/components/dispatcher/dsutils.c
@@ -778,7 +778,7 @@ +++ src/source/components/dispatcher/dsutils.c
@@ -787,7 +787,7 @@ AcpiDsCreateOperands (
} }
ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
@ -154,10 +164,11 @@ diff -Naur acpica-unix2-20150204.orig/source/components/dispatcher/dsutils.c acp
WalkState->NumOperands, ArgCount, Index)); WalkState->NumOperands, ArgCount, Index));
/* Create the interpreter arguments, in reverse order */ /* Create the interpreter arguments, in reverse order */
diff -Naur acpica-unix2-20150204.orig/source/components/dispatcher/dswscope.c acpica-unix2-20150204/source/components/dispatcher/dswscope.c Index: src/source/components/dispatcher/dswscope.c
--- acpica-unix2-20150204.orig/source/components/dispatcher/dswscope.c 2015-02-04 14:12:19.000000000 -0700 ===================================================================
+++ acpica-unix2-20150204/source/components/dispatcher/dswscope.c 2015-03-04 16:00:57.493157707 -0700 --- src.orig/source/components/dispatcher/dswscope.c
@@ -148,7 +148,7 @@ +++ src/source/components/dispatcher/dswscope.c
@@ -148,7 +148,7 @@ AcpiDsScopeStackPush (
WalkState->ScopeDepth++; WalkState->ScopeDepth++;
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
@ -166,7 +177,7 @@ diff -Naur acpica-unix2-20150204.orig/source/components/dispatcher/dswscope.c ac
OldScopeInfo = WalkState->ScopeInfo; OldScopeInfo = WalkState->ScopeInfo;
if (OldScopeInfo) if (OldScopeInfo)
@@ -211,7 +211,7 @@ @@ -211,7 +211,7 @@ AcpiDsScopeStackPop (
WalkState->ScopeDepth--; WalkState->ScopeDepth--;
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
@ -175,10 +186,11 @@ diff -Naur acpica-unix2-20150204.orig/source/components/dispatcher/dswscope.c ac
(UINT32) WalkState->ScopeDepth, (UINT32) WalkState->ScopeDepth,
AcpiUtGetNodeName (ScopeInfo->Scope.Node), AcpiUtGetNodeName (ScopeInfo->Scope.Node),
AcpiUtGetTypeName (ScopeInfo->Common.Value))); AcpiUtGetTypeName (ScopeInfo->Common.Value)));
diff -Naur acpica-unix2-20150204.orig/source/components/events/evgpe.c acpica-unix2-20150204/source/components/events/evgpe.c Index: src/source/components/events/evgpe.c
--- acpica-unix2-20150204.orig/source/components/events/evgpe.c 2015-03-05 12:47:00.454194174 -0700 ===================================================================
+++ acpica-unix2-20150204/source/components/events/evgpe.c 2015-03-05 12:52:16.254562359 -0700 --- src.orig/source/components/events/evgpe.c
@@ -429,7 +429,7 @@ +++ src/source/components/events/evgpe.c
@@ -429,7 +429,7 @@ AcpiEvGpeDetect (
"Ignore disabled registers for GPE %02X-%02X: " "Ignore disabled registers for GPE %02X-%02X: "
"RunEnable=%02X, WakeEnable=%02X\n", "RunEnable=%02X, WakeEnable=%02X\n",
GpeRegisterInfo->BaseGpeNumber, GpeRegisterInfo->BaseGpeNumber,
@ -187,7 +199,7 @@ diff -Naur acpica-unix2-20150204.orig/source/components/events/evgpe.c acpica-un
GpeRegisterInfo->EnableForRun, GpeRegisterInfo->EnableForRun,
GpeRegisterInfo->EnableForWake)); GpeRegisterInfo->EnableForWake));
continue; continue;
@@ -455,7 +455,7 @@ @@ -455,7 +455,7 @@ AcpiEvGpeDetect (
"Read registers for GPE %02X-%02X: Status=%02X, Enable=%02X, " "Read registers for GPE %02X-%02X: Status=%02X, Enable=%02X, "
"RunEnable=%02X, WakeEnable=%02X\n", "RunEnable=%02X, WakeEnable=%02X\n",
GpeRegisterInfo->BaseGpeNumber, GpeRegisterInfo->BaseGpeNumber,
@ -196,10 +208,11 @@ diff -Naur acpica-unix2-20150204.orig/source/components/events/evgpe.c acpica-un
StatusReg, EnableReg, StatusReg, EnableReg,
GpeRegisterInfo->EnableForRun, GpeRegisterInfo->EnableForRun,
GpeRegisterInfo->EnableForWake)); GpeRegisterInfo->EnableForWake));
diff -Naur acpica-unix2-20150204.orig/source/components/executer/exdump.c acpica-unix2-20150204/source/components/executer/exdump.c Index: src/source/components/executer/exdump.c
--- acpica-unix2-20150204.orig/source/components/executer/exdump.c 2015-02-04 14:12:19.000000000 -0700 ===================================================================
+++ acpica-unix2-20150204/source/components/executer/exdump.c 2015-03-05 12:49:52.556029735 -0700 --- src.orig/source/components/executer/exdump.c
@@ -663,7 +663,7 @@ +++ src/source/components/executer/exdump.c
@@ -663,7 +663,7 @@ AcpiExDumpOperand (
if (Depth > 0) if (Depth > 0)
{ {
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%*s[%u] %p ", ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%*s[%u] %p ",
@ -208,10 +221,11 @@ diff -Naur acpica-unix2-20150204.orig/source/components/executer/exdump.c acpica
} }
else else
{ {
diff -Naur acpica-unix2-20150204.orig/source/components/executer/exnames.c acpica-unix2-20150204/source/components/executer/exnames.c Index: src/source/components/executer/exnames.c
--- acpica-unix2-20150204.orig/source/components/executer/exnames.c 2015-02-04 14:12:19.000000000 -0700 ===================================================================
+++ acpica-unix2-20150204/source/components/executer/exnames.c 2015-03-05 13:17:52.054406156 -0700 --- src.orig/source/components/executer/exnames.c
@@ -239,7 +239,7 @@ +++ src/source/components/executer/exnames.c
@@ -239,7 +239,7 @@ AcpiExNameSegment (
*/ */
ACPI_DEBUG_PRINT ((ACPI_DB_INFO, ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
"Leading character is not alpha: %02Xh (not a name)\n", "Leading character is not alpha: %02Xh (not a name)\n",
@ -220,7 +234,7 @@ diff -Naur acpica-unix2-20150204.orig/source/components/executer/exnames.c acpic
Status = AE_CTRL_PENDING; Status = AE_CTRL_PENDING;
} }
else else
@@ -251,7 +251,7 @@ @@ -251,7 +251,7 @@ AcpiExNameSegment (
Status = AE_AML_BAD_NAME; Status = AE_AML_BAD_NAME;
ACPI_ERROR ((AE_INFO, ACPI_ERROR ((AE_INFO,
"Bad character 0x%02x in name, at %p", "Bad character 0x%02x in name, at %p",
@ -229,10 +243,11 @@ diff -Naur acpica-unix2-20150204.orig/source/components/executer/exnames.c acpic
} }
*InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress); *InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress);
diff -Naur acpica-unix2-20150204.orig/source/components/executer/exfldio.c acpica-unix2-20150204/source/components/executer/exfldio.c Index: src/source/components/executer/exfldio.c
--- acpica-unix2-20150204.orig/source/components/executer/exfldio.c 2015-02-04 14:12:19.000000000 -0700 ===================================================================
+++ acpica-unix2-20150204/source/components/executer/exfldio.c 2015-03-05 16:18:34.233960417 -0700 --- src.orig/source/components/executer/exfldio.c
@@ -679,7 +679,7 @@ +++ src/source/components/executer/exfldio.c
@@ -679,7 +679,7 @@ AcpiExWriteWithUpdateRule (
ACPI_ERROR ((AE_INFO, ACPI_ERROR ((AE_INFO,
"Unknown UpdateRule value: 0x%X", "Unknown UpdateRule value: 0x%X",
@ -241,10 +256,11 @@ diff -Naur acpica-unix2-20150204.orig/source/components/executer/exfldio.c acpic
return_ACPI_STATUS (AE_AML_OPERAND_VALUE); return_ACPI_STATUS (AE_AML_OPERAND_VALUE);
} }
} }
diff -Naur acpica-unix2-20150204.orig/source/components/tables/tbfadt.c acpica-unix2-20150204/source/components/tables/tbfadt.c Index: src/source/components/tables/tbfadt.c
--- acpica-unix2-20150204.orig/source/components/tables/tbfadt.c 2015-02-04 14:12:20.000000000 -0700 ===================================================================
+++ acpica-unix2-20150204/source/components/tables/tbfadt.c 2015-03-05 16:12:17.126680882 -0700 --- src.orig/source/components/tables/tbfadt.c
@@ -233,7 +233,7 @@ +++ src/source/components/tables/tbfadt.c
@@ -233,7 +233,7 @@ AcpiTbInitGenericAddress (
if (!(Flags & ACPI_FADT_GPE_REGISTER)) if (!(Flags & ACPI_FADT_GPE_REGISTER))
{ {
ACPI_ERROR ((AE_INFO, ACPI_ERROR ((AE_INFO,
@ -253,7 +269,7 @@ diff -Naur acpica-unix2-20150204.orig/source/components/tables/tbfadt.c acpica-u
"to convert to GAS struct - 255 bits max, truncating", "to convert to GAS struct - 255 bits max, truncating",
RegisterName, ByteWidth, (ByteWidth * 8))); RegisterName, ByteWidth, (ByteWidth * 8)));
} }
@@ -304,7 +304,7 @@ @@ -304,7 +304,7 @@ AcpiTbSelectAddress (
ACPI_BIOS_WARNING ((AE_INFO, ACPI_BIOS_WARNING ((AE_INFO,
"32/64X %s address mismatch in FADT: " "32/64X %s address mismatch in FADT: "
@ -262,7 +278,7 @@ diff -Naur acpica-unix2-20150204.orig/source/components/tables/tbfadt.c acpica-u
RegisterName, Address32, ACPI_FORMAT_UINT64 (Address64), RegisterName, Address32, ACPI_FORMAT_UINT64 (Address64),
AcpiGbl_Use32BitFadtAddresses ? 32 : 64)); AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
@@ -612,7 +612,7 @@ @@ -612,7 +612,7 @@ AcpiTbConvertFadt (
ACPI_BIOS_WARNING ((AE_INFO, ACPI_BIOS_WARNING ((AE_INFO,
"32/64X address mismatch in FADT/%s: " "32/64X address mismatch in FADT/%s: "
@ -271,10 +287,11 @@ diff -Naur acpica-unix2-20150204.orig/source/components/tables/tbfadt.c acpica-u
Name, Address32, Name, Address32,
ACPI_FORMAT_UINT64 (Address64->Address), ACPI_FORMAT_UINT64 (Address64->Address),
AcpiGbl_Use32BitFadtAddresses ? 32 : 64)); AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
diff -Naur acpica-unix2-20150204.orig/source/components/hardware/hwregs.c acpica-unix2-20150204/source/components/hardware/hwregs.c Index: src/source/components/hardware/hwregs.c
--- acpica-unix2-20150204.orig/source/components/hardware/hwregs.c 2015-02-04 14:12:19.000000000 -0700 ===================================================================
+++ acpica-unix2-20150204/source/components/hardware/hwregs.c 2015-03-05 16:46:17.157825532 -0700 --- src.orig/source/components/hardware/hwregs.c
@@ -299,7 +299,7 @@ +++ src/source/components/hardware/hwregs.c
@@ -299,7 +299,7 @@ AcpiHwClearAcpiStatus (
ACPI_DEBUG_PRINT ((ACPI_DB_IO, "About to write %04X to %8.8X%8.8X\n", ACPI_DEBUG_PRINT ((ACPI_DB_IO, "About to write %04X to %8.8X%8.8X\n",
@ -283,10 +300,11 @@ diff -Naur acpica-unix2-20150204.orig/source/components/hardware/hwregs.c acpica
ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address))); ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address)));
LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock); LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock);
diff -Naur acpica-unix2-20150204.orig/source/components/tables/tbxfroot.c acpica-unix2-20150204/source/components/tables/tbxfroot.c Index: src/source/components/tables/tbxfroot.c
--- acpica-unix2-20150204.orig/source/components/tables/tbxfroot.c 2015-02-04 14:12:20.000000000 -0700 ===================================================================
+++ acpica-unix2-20150204/source/components/tables/tbxfroot.c 2015-03-05 17:08:45.001594511 -0700 --- src.orig/source/components/tables/tbxfroot.c
@@ -177,7 +177,7 @@ +++ src/source/components/tables/tbxfroot.c
@@ -177,7 +177,7 @@ AcpiFindRootPointer (
{ {
ACPI_ERROR ((AE_INFO, ACPI_ERROR ((AE_INFO,
"Could not map memory at 0x%8.8X for length %u", "Could not map memory at 0x%8.8X for length %u",
@ -295,7 +313,7 @@ diff -Naur acpica-unix2-20150204.orig/source/components/tables/tbxfroot.c acpica
return_ACPI_STATUS (AE_NO_MEMORY); return_ACPI_STATUS (AE_NO_MEMORY);
} }
@@ -204,7 +204,7 @@ @@ -204,7 +204,7 @@ AcpiFindRootPointer (
{ {
ACPI_ERROR ((AE_INFO, ACPI_ERROR ((AE_INFO,
"Could not map memory at 0x%8.8X for length %u", "Could not map memory at 0x%8.8X for length %u",
@ -304,7 +322,7 @@ diff -Naur acpica-unix2-20150204.orig/source/components/tables/tbxfroot.c acpica
return_ACPI_STATUS (AE_NO_MEMORY); return_ACPI_STATUS (AE_NO_MEMORY);
} }
@@ -234,7 +234,7 @@ @@ -234,7 +234,7 @@ AcpiFindRootPointer (
{ {
ACPI_ERROR ((AE_INFO, ACPI_ERROR ((AE_INFO,
"Could not map memory at 0x%8.8X for length %u", "Could not map memory at 0x%8.8X for length %u",
@ -313,10 +331,11 @@ diff -Naur acpica-unix2-20150204.orig/source/components/tables/tbxfroot.c acpica
return_ACPI_STATUS (AE_NO_MEMORY); return_ACPI_STATUS (AE_NO_MEMORY);
} }
diff -Naur acpica-unix2-20150204.orig/source/components/utilities/utownerid.c acpica-unix2-20150204/source/components/utilities/utownerid.c Index: src/source/components/utilities/utownerid.c
--- acpica-unix2-20150204.orig/source/components/utilities/utownerid.c 2015-02-04 14:12:20.000000000 -0700 ===================================================================
+++ acpica-unix2-20150204/source/components/utilities/utownerid.c 2015-03-05 17:06:40.281055170 -0700 --- src.orig/source/components/utilities/utownerid.c
@@ -230,7 +230,7 @@ +++ src/source/components/utilities/utownerid.c
@@ -230,7 +230,7 @@ AcpiUtReleaseOwnerId (
else else
{ {
ACPI_ERROR ((AE_INFO, ACPI_ERROR ((AE_INFO,

11
name-miscompare.patch
View File

@ -4,10 +4,11 @@ to be compared were being treated as 32-bit ints, and not strings. Hence,
the characters were re-ordered incorrectly, mismatching the assumptions the characters were re-ordered incorrectly, mismatching the assumptions
made in the remainder of the function. made in the remainder of the function.
diff -urN acpica-unix2-20130214/source/compiler/aslanalyze.c acpica-unix2-20130214-names/source/compiler/aslanalyze.c Index: src/source/compiler/aslanalyze.c
--- acpica-unix2-20130214/source/compiler/aslanalyze.c 2013-03-21 17:31:25.803324990 -0600 ===================================================================
+++ acpica-unix2-20130214-names/source/compiler/aslanalyze.c 2013-03-21 17:43:45.357616802 -0600 --- src.orig/source/compiler/aslanalyze.c
@@ -445,7 +445,7 @@ +++ src/source/compiler/aslanalyze.c
@@ -445,7 +445,7 @@ ApCheckForGpeNameConflict (
/* Need a null-terminated string version of NameSeg */ /* Need a null-terminated string version of NameSeg */
@ -16,7 +17,7 @@ diff -urN acpica-unix2-20130214/source/compiler/aslanalyze.c acpica-unix2-201302
Name[ACPI_NAME_SIZE] = 0; Name[ACPI_NAME_SIZE] = 0;
/* /*
@@ -472,7 +472,7 @@ @@ -472,7 +472,7 @@ ApCheckForGpeNameConflict (
* We are now sure we have an _Lxx or _Exx. * We are now sure we have an _Lxx or _Exx.
* Create the target name that would cause collision (Flip E/L) * Create the target name that would cause collision (Flip E/L)
*/ */

9
re-enable-big-endian.patch
View File

@ -2,10 +2,11 @@ Re-enable use of these tools on big-endian machines.
Al Stone <ahs3@redhat.com> Al Stone <ahs3@redhat.com>
diff -Naur acpica-unix2-20140424/source/compiler/aslmain.c acpica-unix2-20140424-patch/source/compiler/aslmain.c Index: src/source/compiler/aslmain.c
--- acpica-unix2-20140424/source/compiler/aslmain.c 2014-04-24 09:48:59.000000000 -0600 ===================================================================
+++ acpica-unix2-20140424-patch/source/compiler/aslmain.c 2014-05-22 12:55:47.634904320 -0600 --- src.orig/source/compiler/aslmain.c
@@ -331,18 +319,6 @@ +++ src/source/compiler/aslmain.c
@@ -336,18 +336,6 @@ main (
int ReturnStatus = 0; int ReturnStatus = 0;