ACPICA: Clib: Add -nostdinc support for EFI layer

ACPICA commit d261d40ea168f8e4c4e3986de720b8651c4aba1c

This patch adds sprintf()/snprintf()/vsnprintf()/printf()/vfprintf()
support for OSPMs that have ACPI_USE_SYSTEM_CLIBRARY defined but do not
have ACPI_USE_STANDARD_HEADERS defined.

-iwithprefix include is required to include <stdarg.h> which contains
compiler specific implementation of vargs when -nostdinc is specified.
-fno-builtin is required for GCC to avoid optimization performed printf().
This optimization cannot be automatically disabled by specifying -nostdlib.
Please refer to the first link below for the details. However, the build
option changes do not affect Linux kernel builds and are not included.
Lv Zheng.

Link: http://www.ciselant.de/projects/gcc_printf/gcc_printf.html
Link: https://github.com/acpica/acpica/commit/d261d40e
Link: https://bugs.acpica.org/show_bug.cgi?id=1302
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

2 files changed, 4 insertions, 5 deletions

diff --git a/tools/power/acpi/tools/acpidump/apdump.c b/tools/power/acpi/tools/acpidump/apdump.c
index fb8f1d9e3b1b..2a1507c89dbf 100644
--- a/tools/power/acpi/tools/acpidump/apdump.c
+++ b/tools/power/acpi/tools/acpidump/apdump.c
@@ -195,13 +195,13 @@ ap_dump_table_buffer(struct acpi_table_header *table,
          * Note: simplest to just always emit a 64-bit address. acpi_xtract
          * utility can handle this.
          */
-        acpi_ut_file_printf(gbl_output_file, "%4.4s @ 0x%8.8X%8.8X\n",
-                            table->signature, ACPI_FORMAT_UINT64(address));
+        fprintf(gbl_output_file, "%4.4s @ 0x%8.8X%8.8X\n",
+                table->signature, ACPI_FORMAT_UINT64(address));
 
         acpi_ut_dump_buffer_to_file(gbl_output_file,
                                     ACPI_CAST_PTR(u8, table), table_length,
                                     DB_BYTE_DISPLAY, 0);
-        acpi_ut_file_printf(gbl_output_file, "\n");
+        fprintf(gbl_output_file, "\n");
         return (0);
 }
 
diff --git a/tools/power/acpi/tools/acpidump/apfiles.c b/tools/power/acpi/tools/acpidump/apfiles.c
index 44a0010d16c9..71edeb499096 100644
--- a/tools/power/acpi/tools/acpidump/apfiles.c
+++ b/tools/power/acpi/tools/acpidump/apfiles.c
@@ -157,8 +157,7 @@ int ap_write_to_binary_file(struct acpi_table_header *table, u32 instance)
         /* Handle multiple SSDts - create different filenames for each */
 
         if (instance > 0) {
-                acpi_ut_snprintf(instance_str, sizeof(instance_str), "%u",
-                                 instance);
+                snprintf(instance_str, sizeof(instance_str), "%u", instance);
                 strcat(filename, instance_str);
         }