Module Name: src
Committed By: matt
Date: Mon Jul 28 17:28:13 UTC 2014
Modified Files:
src/libexec/ld.elf_so/arch/powerpc: ppc_reloc.c
Log Message:
Fix parenthesis on __ha macro
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c
diff -u src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c:1.51 src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c:1.52
--- src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c:1.51 Thu Mar 6 19:19:40 2014
+++ src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c Mon Jul 28 17:28:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ppc_reloc.c,v 1.51 2014/03/06 19:19:40 matt Exp $ */
+/* $NetBSD: ppc_reloc.c,v 1.52 2014/07/28 17:28:13 matt Exp $ */
/*-
* Copyright (C) 1998 Tsubai Masanari
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ppc_reloc.c,v 1.51 2014/03/06 19:19:40 matt Exp $");
+__RCSID("$NetBSD: ppc_reloc.c,v 1.52 2014/07/28 17:28:13 matt Exp $");
#endif /* not lint */
#include <stdarg.h>
@@ -51,7 +51,7 @@ void _rtld_powerpc_pltresolve(Elf_Word,
#define __ha48 __u64(0xffffffff8000)
#define __ha32 __u64(0xffff8000)
#define __ha16 __u32(0x8000)
-#define __ha(x,n) ((((x) >> (n)) + ((x) & __ha##n) == __ha##n) & 0xffff)
+#define __ha(x,n) ((((x) >> (n)) + (((x) & __ha##n) == __ha##n)) & 0xffff)
#define __hi(x,n) (((x) >> (n)) & 0xffff)
#ifdef __LP64
#define highesta(x) __ha(__u64(x), 48)
