Date: Sat, 6 Jan 2018 15:52:22 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r327622 - in projects/clang600-import: sys/contrib/dev/acpica/include usr.sbin/acpi/acpidb Message-ID: <201801061552.w06FqMx9015498@repo.freebsd.org>
index | next in thread | raw e-mail
Author: dim Date: Sat Jan 6 15:52:21 2018 New Revision: 327622 URL: https://svnweb.freebsd.org/changeset/base/327622 Log: Revert r327338, undoing the changes to the ACPI_ADD_PTR and ACPI_SUB_PTR macros. Instead, turn off clang 6.0.0 warnings about null pointer arithmetic in usr.sbin/acpi/acpidb instead. Modified: projects/clang600-import/sys/contrib/dev/acpica/include/actypes.h projects/clang600-import/usr.sbin/acpi/acpidb/Makefile Modified: projects/clang600-import/sys/contrib/dev/acpica/include/actypes.h ============================================================================== --- projects/clang600-import/sys/contrib/dev/acpica/include/actypes.h Sat Jan 6 14:21:32 2018 (r327621) +++ projects/clang600-import/sys/contrib/dev/acpica/include/actypes.h Sat Jan 6 15:52:21 2018 (r327622) @@ -651,8 +651,8 @@ typedef UINT64 ACPI_INTEGER; #define ACPI_CAST_PTR(t, p) ((t *) (ACPI_UINTPTR_T) (p)) #define ACPI_CAST_INDIRECT_PTR(t, p) ((t **) (ACPI_UINTPTR_T) (p)) -#define ACPI_ADD_PTR(t, a, b) ACPI_CAST_PTR (t, (ACPI_UINTPTR_T) (a) + (ACPI_SIZE)(b)) -#define ACPI_SUB_PTR(t, a, b) ACPI_CAST_PTR (t, (ACPI_UINTPTR_T) (a) - (ACPI_SIZE)(b)) +#define ACPI_ADD_PTR(t, a, b) ACPI_CAST_PTR (t, (ACPI_CAST_PTR (UINT8, (a)) + (ACPI_SIZE)(b))) +#define ACPI_SUB_PTR(t, a, b) ACPI_CAST_PTR (t, (ACPI_CAST_PTR (UINT8, (a)) - (ACPI_SIZE)(b))) #define ACPI_PTR_DIFF(a, b) (ACPI_SIZE) (ACPI_CAST_PTR (UINT8, (a)) - ACPI_CAST_PTR (UINT8, (b))) /* Pointer/Integer type conversions */ Modified: projects/clang600-import/usr.sbin/acpi/acpidb/Makefile ============================================================================== --- projects/clang600-import/usr.sbin/acpi/acpidb/Makefile Sat Jan 6 14:21:32 2018 (r327621) +++ projects/clang600-import/usr.sbin/acpi/acpidb/Makefile Sat Jan 6 15:52:21 2018 (r327622) @@ -80,3 +80,7 @@ CFLAGS+= -DACPI_EXEC_APP -fno-strict-aliasing LIBADD= pthread .include <bsd.prog.mk> + +.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 60000 +CWARNFLAGS+= -Wno-null-pointer-arithmetic +.endifhelp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801061552.w06FqMx9015498>