re PR other/13873 (gcc/longlong.h uses test for PPC)

	PR other/13873
	* longlong.h: Merge PPC tests from upstream.

From-SVN: r108113

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f52da64006f93c9dde9848373f6c892a9b7b798b..8bd38784889f655e6bfca143ce8f8017f0c14105 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-06  Alan Modra  <amodra@bigpond.net.au>
+
+       PR other/13873
+       * longlong.h: Merge PPC tests from upstream.
+
 2005-12-03  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        PR middle-end/25022

diff --git a/gcc/longlong.h b/gcc/longlong.h
index e59e712326305b9bf1504cab5f9ddd64a2acab8d..45d649fbcc12e49232b85a907a9a9445b8fb5852 100644 (file)
--- a/gcc/longlong.h
+++ b/gcc/longlong.h
@@ -1,6 +1,6 @@
 /* longlong.h -- definitions for mixed size 32/64 bit arithmetic.
-   Copyright (C) 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000
-   Free Software Foundation, Inc.
+   Copyright (C) 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+   2005 Free Software Foundation, Inc.
 
    This definition file is free software; you can redistribute it
    and/or modify it under the terms of the GNU General Public
@@ -646,7 +646,9 @@ UDItype __umulsidi3 (USItype, USItype);
      || defined (__powerpc__)  /* gcc */                               \
      || defined (__POWERPC__)  /* BEOS */                              \
      || defined (__ppc__)      /* Darwin */                            \
-     || defined (PPC)          /* GNU/Linux, SysV */                   \
+     || (defined (PPC) && ! defined (CPU_FAMILY)) /* gcc 2.7.x GNU&SysV */    \
+     || (defined (PPC) && defined (CPU_FAMILY)    /* VxWorks */               \
+         && CPU_FAMILY == PPC)                                                \
      ) && W_TYPE_SIZE == 32
 #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
   do {                                                                 \
@@ -684,7 +686,10 @@ UDItype __umulsidi3 (USItype, USItype);
   __asm__ ("{cntlz|cntlzw} %0,%1" : "=r" (count) : "r" (x))
 #define COUNT_LEADING_ZEROS_0 32
 #if defined (_ARCH_PPC) || defined (__powerpc__) || defined (__POWERPC__) \
-  || defined (__ppc__) || defined (PPC)
+  || defined (__ppc__)                                                    \
+  || (defined (PPC) && ! defined (CPU_FAMILY)) /* gcc 2.7.x GNU&SysV */       \
+  || (defined (PPC) && defined (CPU_FAMILY)    /* VxWorks */                  \
+         && CPU_FAMILY == PPC)
 #define umul_ppmm(ph, pl, m0, m1) \
   do {                                                                 \
     USItype __m0 = (m0), __m1 = (m1);                                  \