Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 19 Sep 2014 20:59:52 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r368597 - head/sysutils/acpica-tools/files
Message-ID:  <201409192059.s8JKxqlD037455@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jkim
Date: Fri Sep 19 20:59:51 2014
New Revision: 368597
URL: http://svnweb.freebsd.org/changeset/ports/368597
QAT: https://qat.redports.org/buildarchive/r368597/

Log:
  Work around GCC 4.2 bugs to fix build.
  
  Reported by:	antoine

Added:
  head/sysutils/acpica-tools/files/patch-source__compiler__dtcompile.c   (contents, props changed)
  head/sysutils/acpica-tools/files/patch-source__compiler__dtsubtable.c   (contents, props changed)

Added: head/sysutils/acpica-tools/files/patch-source__compiler__dtcompile.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/acpica-tools/files/patch-source__compiler__dtcompile.c	Fri Sep 19 20:59:51 2014	(r368597)
@@ -0,0 +1,20 @@
+--- ../../source/compiler/dtcompile.c	2014-08-28 13:10:01.000000000 -0400
++++ ../../source/compiler/dtcompile.c	2014-09-19 16:32:31.000000000 -0400
+@@ -438,6 +438,7 @@
+     UINT8                   *Buffer;
+     UINT8                   *FlagBuffer = NULL;
+     UINT32                  CurrentFlagByteOffset = 0;
++    char                    *String;
+     ACPI_STATUS             Status;
+ 
+ 
+@@ -465,7 +466,8 @@
+ 
+     if (Length > 0)
+     {
+-        Subtable->Buffer = ACPI_CAST_PTR (UINT8, UtStringCacheCalloc (Length));
++        String = UtStringCacheCalloc (Length);
++        Subtable->Buffer = ACPI_CAST_PTR (UINT8, String);
+     }
+     Subtable->Length = Length;
+     Subtable->TotalLength = Length;

Added: head/sysutils/acpica-tools/files/patch-source__compiler__dtsubtable.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/acpica-tools/files/patch-source__compiler__dtsubtable.c	Fri Sep 19 20:59:51 2014	(r368597)
@@ -0,0 +1,19 @@
+--- ../../source/compiler/dtsubtable.c	2014-08-28 13:10:01.000000000 -0400
++++ ../../source/compiler/dtsubtable.c	2014-09-19 16:47:23.000000000 -0400
+@@ -73,13 +73,15 @@
+     DT_SUBTABLE             **RetSubtable)
+ {
+     DT_SUBTABLE             *Subtable;
++    char                    *String;
+ 
+ 
+     Subtable = UtSubtableCacheCalloc ();
+ 
+     /* Create a new buffer for the subtable data */
+ 
+-    Subtable->Buffer = ACPI_CAST_PTR (UINT8, UtStringCacheCalloc (Length));
++    String = UtStringCacheCalloc (Length);
++    Subtable->Buffer = ACPI_CAST_PTR (UINT8, String);
+     ACPI_MEMCPY (Subtable->Buffer, Buffer, Length);
+ 
+     Subtable->Length = Length;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409192059.s8JKxqlD037455>