[src/trunk]: src/sys/arch/powerpc/oea inline HAVE_64BIT_HID0 and remove macro...

[maya <maya%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/df37880fcf8d
branches:  trunk
changeset: 825350:df37880fcf8d
user:      maya <maya%NetBSD.org@localhost>
date:      Tue Jul 11 03:07:22 2017 +0000

description:
inline HAVE_64BIT_HID0 and remove macro definition.

Fixes llvm INSTALL kernel build, which failed with:
error: macro expansion producing 'defined' has undefined behavior

diffstat:

 sys/arch/powerpc/oea/cpu_subr.c |  12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diffs (54 lines):

diff -r 9c38c77fe521 -r df37880fcf8d sys/arch/powerpc/oea/cpu_subr.c
--- a/sys/arch/powerpc/oea/cpu_subr.c   Mon Jul 10 22:49:40 2017 +0000
+++ b/sys/arch/powerpc/oea/cpu_subr.c   Tue Jul 11 03:07:22 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu_subr.c,v 1.84 2017/07/07 23:45:53 macallan Exp $   */
+/*     $NetBSD: cpu_subr.c,v 1.85 2017/07/11 03:07:22 maya Exp $       */
 
 /*-
  * Copyright (c) 2001 Matt Thomas.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.84 2017/07/07 23:45:53 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.85 2017/07/11 03:07:22 maya Exp $");
 
 #include "opt_ppcparam.h"
 #include "opt_ppccache.h"
@@ -487,8 +487,6 @@
        return (ci);
 }
 
-#define HAVE_64BIT_HID0 (defined(PPC_OEA64_BRIDGE) || defined(_ARCH_PPC64))
-
 void
 cpu_setup(device_t self, struct cpu_info *ci)
 {
@@ -497,7 +495,7 @@
        const char *bitmask;
        char hidbuf[128];
        char model[80];
-#if HAVE_64BIT_HID0
+#if defined(PPC_OEA64_BRIDGE) || defined(_ARCH_PPC64)
        char hidbuf_u[128];
        const char *bitmasku = NULL;
 #endif
@@ -663,7 +661,7 @@
        case IBM970FX:
        case IBM970MP:
                bitmask = HID0_970_BITMASK;
-#if HAVE_64BIT_HID0
+#if defined(PPC_OEA64_BRIDGE) || defined(_ARCH_PPC64)
                bitmasku = HID0_970_BITMASK_U;
 #endif
                break;
@@ -672,7 +670,7 @@
                break;
        }
        
-#if HAVE_64BIT_HID0
+#if defined(PPC_OEA64_BRIDGE) || defined(_ARCH_PPC64)
        if (bitmasku != NULL) {
                snprintb(hidbuf, sizeof hidbuf, bitmask, hid0 & 0xffffffff);
                snprintb(hidbuf_u, sizeof hidbuf_u, bitmasku, hid0 >> 32);