From owner-svn-src-projects@FreeBSD.ORG Thu Nov 19 18:56:07 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5ACBD1065672; Thu, 19 Nov 2009 18:56:07 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 303EA8FC14; Thu, 19 Nov 2009 18:56:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAJIu7oN015665; Thu, 19 Nov 2009 18:56:07 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAJIu7Pt015662; Thu, 19 Nov 2009 18:56:07 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200911191856.nAJIu7Pt015662@svn.freebsd.org> From: Nathan Whitehorn Date: Thu, 19 Nov 2009 18:56:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199541 - projects/ppc64/sys/powerpc/include X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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: Thu, 19 Nov 2009 18:56:07 -0000 Author: nwhitehorn Date: Thu Nov 19 18:56:06 2009 New Revision: 199541 URL: http://svn.freebsd.org/changeset/base/199541 Log: Fix some data type issues. Modified: projects/ppc64/sys/powerpc/include/_align.h projects/ppc64/sys/powerpc/include/_limits.h Modified: projects/ppc64/sys/powerpc/include/_align.h ============================================================================== --- projects/ppc64/sys/powerpc/include/_align.h Thu Nov 19 18:43:43 2009 (r199540) +++ projects/ppc64/sys/powerpc/include/_align.h Thu Nov 19 18:56:06 2009 (r199541) @@ -41,12 +41,14 @@ #ifndef _POWERPC_INCLUDE__ALIGN_H_ #define _POWERPC_INCLUDE__ALIGN_H_ +#include + /* * Round p (pointer or byte index) up to a correctly-aligned value * for all data types (int, long, ...). The result is unsigned int * and must be cast to any desired pointer type. */ -#define _ALIGNBYTES (sizeof(int) - 1) -#define _ALIGN(p) (((unsigned)(p) + _ALIGNBYTES) & ~_ALIGNBYTES) +#define _ALIGNBYTES (sizeof(register_t) - 1) +#define _ALIGN(p) (((uintptr_t)(p) + _ALIGNBYTES) & ~_ALIGNBYTES) #endif /* !_POWERPC_INCLUDE__ALIGN_H_ */ Modified: projects/ppc64/sys/powerpc/include/_limits.h ============================================================================== --- projects/ppc64/sys/powerpc/include/_limits.h Thu Nov 19 18:43:43 2009 (r199540) +++ projects/ppc64/sys/powerpc/include/_limits.h Thu Nov 19 18:56:06 2009 (r199541) @@ -59,8 +59,7 @@ #define __INT_MAX 0x7fffffff /* max value for an int */ #define __INT_MIN (-0x7fffffff - 1) /* min value for an int */ -/* Bad hack for gcc configured to give 64-bit longs. */ -#ifdef _LARGE_LONG +#if defined(_LARGE_LONG) || defined(__LP64__) #define __ULONG_MAX 0xffffffffffffffffUL #define __LONG_MAX 0x7fffffffffffffffL #define __LONG_MIN (-0x7fffffffffffffffL - 1) @@ -74,9 +73,13 @@ #define __LLONG_MAX 0x7fffffffffffffffLL /* max value for a long long */ #define __LLONG_MIN (-0x7fffffffffffffffLL - 1) /* min for a long long */ +#ifdef __powerpc64__ +#define __SSIZE_MAX __LONG_MAX /* max value for a ssize_t */ +#define __SIZE_T_MAX __ULONG_MAX /* max value for a size_t */ +#else #define __SSIZE_MAX __INT_MAX /* max value for a ssize_t */ - #define __SIZE_T_MAX __UINT_MAX /* max value for a size_t */ +#endif #define __OFF_MAX __LLONG_MAX /* max value for an off_t */ #define __OFF_MIN __LLONG_MIN /* min value for an off_t */ @@ -86,7 +89,7 @@ #define __QUAD_MAX __LLONG_MAX /* max value for a quad_t */ #define __QUAD_MIN __LLONG_MIN /* min value for a quad_t */ -#ifdef _LARGE_LONG +#if defined(_LARGE_LONG) || defined(__LP64__) #define __LONG_BIT 64 #else #define __LONG_BIT 32