From owner-svn-src-projects@freebsd.org Sat Jan 6 15:52:23 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 23249EBF11A for ; Sat, 6 Jan 2018 15:52:23 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F0CD773EC9; Sat, 6 Jan 2018 15:52:22 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 41F7B147BE; Sat, 6 Jan 2018 15:52:22 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w06FqMXj015500; Sat, 6 Jan 2018 15:52:22 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w06FqMx9015498; Sat, 6 Jan 2018 15:52:22 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201801061552.w06FqMx9015498@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 6 Jan 2018 15:52:22 +0000 (UTC) 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 X-SVN-Group: projects X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in projects/clang600-import: sys/contrib/dev/acpica/include usr.sbin/acpi/acpidb X-SVN-Commit-Revision: 327622 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jan 2018 15:52:23 -0000 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 + +.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 60000 +CWARNFLAGS+= -Wno-null-pointer-arithmetic +.endif