packages: gcc/gcc-branch.diff, gcc/gcc.spec - rel 4

arekm arekm at pld-linux.org
Sun Mar 28 22:57:28 CEST 2010


Author: arekm                        Date: Sun Mar 28 20:57:28 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4

---- Files affected:
packages/gcc:
   gcc-branch.diff (1.25 -> 1.26) , gcc.spec (1.599 -> 1.600) 

---- Diffs:

================================================================
Index: packages/gcc/gcc-branch.diff
diff -u packages/gcc/gcc-branch.diff:1.25 packages/gcc/gcc-branch.diff:1.26
--- packages/gcc/gcc-branch.diff:1.25	Thu Mar 11 19:51:49 2010
+++ packages/gcc/gcc-branch.diff	Sun Mar 28 22:57:20 2010
@@ -1,58 +1,90 @@
-Index: libgcc/config/libbid/ChangeLog
+Index: libgomp/env.c
 ===================================================================
---- libgcc/config/libbid/ChangeLog	(.../tags/gcc_4_4_2_release)	(wersja 157390)
-+++ libgcc/config/libbid/ChangeLog	(.../branches/gcc-4_4-branch)	(wersja 157390)
-@@ -1,3 +1,7 @@
-+2010-01-21  Release Manager
-+
-+	* GCC 4.4.3 released.
-+
- 2009-10-15  Release Manager
+--- libgomp/env.c	(.../tags/gcc_4_4_3_release)	(wersja 157785)
++++ libgomp/env.c	(.../branches/gcc-4_4-branch)	(wersja 157785)
+@@ -1,4 +1,5 @@
+-/* Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
++/* Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
++   Free Software Foundation, Inc.
+    Contributed by Richard Henderson <rth at redhat.com>.
  
- 	* GCC 4.4.2 released.
-Index: libgcc/ChangeLog
-===================================================================
---- libgcc/ChangeLog	(.../tags/gcc_4_4_2_release)	(wersja 157390)
-+++ libgcc/ChangeLog	(.../branches/gcc-4_4-branch)	(wersja 157390)
-@@ -1,3 +1,7 @@
-+2010-01-21  Release Manager
-+
-+	* GCC 4.4.3 released.
-+
- 2009-10-15  Release Manager
+    This file is part of the GNU OpenMP Library (libgomp).
+@@ -145,7 +146,7 @@
+    present and it was successfully parsed.  */
+ 
+ static bool
+-parse_unsigned_long (const char *name, unsigned long *pvalue)
++parse_unsigned_long (const char *name, unsigned long *pvalue, bool allow_zero)
+ {
+   char *env, *end;
+   unsigned long value;
+@@ -161,7 +162,7 @@
+ 
+   errno = 0;
+   value = strtoul (env, &end, 10);
+-  if (errno || (long) value <= 0)
++  if (errno || (long) value <= 0 - allow_zero)
+     goto invalid;
+ 
+   while (isspace ((unsigned char) *end))
+@@ -481,8 +482,9 @@
+   parse_schedule ();
+   parse_boolean ("OMP_DYNAMIC", &gomp_global_icv.dyn_var);
+   parse_boolean ("OMP_NESTED", &gomp_global_icv.nest_var);
+-  parse_unsigned_long ("OMP_MAX_ACTIVE_LEVELS", &gomp_max_active_levels_var);
+-  parse_unsigned_long ("OMP_THREAD_LIMIT", &gomp_thread_limit_var);
++  parse_unsigned_long ("OMP_MAX_ACTIVE_LEVELS", &gomp_max_active_levels_var,
++		       true);
++  parse_unsigned_long ("OMP_THREAD_LIMIT", &gomp_thread_limit_var, false);
+   if (gomp_thread_limit_var != ULONG_MAX)
+     gomp_remaining_threads_count = gomp_thread_limit_var - 1;
+ #ifndef HAVE_SYNC_BUILTINS
+@@ -490,7 +492,8 @@
+ #endif
+   gomp_init_num_threads ();
+   gomp_available_cpus = gomp_global_icv.nthreads_var;
+-  if (!parse_unsigned_long ("OMP_NUM_THREADS", &gomp_global_icv.nthreads_var))
++  if (!parse_unsigned_long ("OMP_NUM_THREADS", &gomp_global_icv.nthreads_var,
++			    false))
+     gomp_global_icv.nthreads_var = gomp_available_cpus;
+   if (parse_affinity ())
+     gomp_init_affinity ();
+@@ -632,7 +635,7 @@
+ void
+ omp_set_max_active_levels (int max_levels)
+ {
+-  if (max_levels > 0)
++  if (max_levels >= 0)
+     gomp_max_active_levels_var = max_levels;
+ }
  
- 	* GCC 4.4.2 released.
 Index: libgomp/ChangeLog
 ===================================================================
---- libgomp/ChangeLog	(.../tags/gcc_4_4_2_release)	(wersja 157390)
-+++ libgomp/ChangeLog	(.../branches/gcc-4_4-branch)	(wersja 157390)
-@@ -1,3 +1,22 @@
+--- libgomp/ChangeLog	(.../tags/gcc_4_4_3_release)	(wersja 157785)
++++ libgomp/ChangeLog	(.../branches/gcc-4_4-branch)	(wersja 157785)
+@@ -1,3 +1,18 @@
++2010-03-22  Jakub Jelinek  <jakub at redhat.com>
++
++	PR libgomp/42942
++	* env.c (parse_unsigned_long): Add ALLOW_ZERO argument.
++	(initialize_env): Adjust callers.
++	(omp_set_max_active_levels): Set gomp_max_active_levels_var even
++	when the argument is 0.
++
++	* testsuite/libgomp.c/pr42942.c: New test.
++
 +2010-01-26  Jakub Jelinek  <jakub at redhat.com>
 +
 +	PR fortran/42866
 +	* testsuite/libgomp.fortran/allocatable5.f90: New test.
 +
-+2010-01-21  Release Manager
-+
-+	* GCC 4.4.3 released.
-+
-+2009-11-25  Jakub Jelinek  <jakub at redhat.com>
-+
-+	PR fortran/42162
-+	* testsuite/libgomp.fortran/pr42162.f90: New test.
-+
-+2009-11-13  Jakub Jelinek  <jakub at redhat.com>
-+
-+	PR middle-end/42029
-+	* testsuite/libgomp.c/pr42029.c: New test.
-+
- 2009-10-15  Release Manager
+ 2010-01-21  Release Manager
  
- 	* GCC 4.4.2 released.
+ 	* GCC 4.4.3 released.
 Index: libgomp/testsuite/libgomp.fortran/allocatable5.f90
 ===================================================================
---- libgomp/testsuite/libgomp.fortran/allocatable5.f90	(.../tags/gcc_4_4_2_release)	(wersja 0)
-+++ libgomp/testsuite/libgomp.fortran/allocatable5.f90	(.../branches/gcc-4_4-branch)	(wersja 157390)
+--- libgomp/testsuite/libgomp.fortran/allocatable5.f90	(.../tags/gcc_4_4_3_release)	(wersja 0)
++++ libgomp/testsuite/libgomp.fortran/allocatable5.f90	(.../branches/gcc-4_4-branch)	(wersja 157785)
 @@ -0,0 +1,17 @@
 +! PR fortran/42866
 +! { dg-do run }
@@ -71,481 +103,113 @@
 +  if (any (a.ne.3)) call abort
 +  deallocate (a)
 +end
-Index: libgomp/testsuite/libgomp.fortran/pr42162.f90
-===================================================================
---- libgomp/testsuite/libgomp.fortran/pr42162.f90	(.../tags/gcc_4_4_2_release)	(wersja 0)
-+++ libgomp/testsuite/libgomp.fortran/pr42162.f90	(.../branches/gcc-4_4-branch)	(wersja 157390)
-@@ -0,0 +1,53 @@
-+! PR fortran/42162
-+! { dg-do run }
-+
-+subroutine sub1(k, a)
-+  implicit none
-+  integer :: k, a(3)
-+  !$omp do
-+    do k=1,3
-+      a(k) = a(k) + 1
-+    enddo
-+  !$omp end do
-+end subroutine sub1
-+
-+subroutine sub2(k, a)
-+  implicit none
-+  integer :: k, a(3)
-+  !$omp do private (k)
-+    do k=1,3
-+      a(k) = a(k) + 1
-+    enddo
-+  !$omp end do
-+end subroutine sub2
-+
-+subroutine sub3(k, a)
-+  implicit none
-+  integer :: k, a(3)
-+  !$omp do lastprivate (k)
-+    do k=1,3
-+      a(k) = a(k) + 1
-+    enddo
-+  !$omp end do
-+end subroutine sub3
-+
-+program pr42162
-+  implicit none
-+  integer :: k, a(3), b(3), c(3)
-+  a = 1
-+  b = 2
-+  c = 3
-+  k = 3
-+  !$omp parallel num_threads(3)
-+  call sub1 (k, a)
-+  !$omp end parallel
-+  k = 4
-+  !$omp parallel num_threads(3)
-+  call sub2 (k, b)
-+  !$omp end parallel
-+  k = 10
-+  !$omp parallel num_threads(3)
-+  call sub3 (k, c)
-+  !$omp end parallel
-+  if (k.ne.4.or.any(a.ne.2).or.any(b.ne.3).or.any(c.ne.4)) call abort
-+end
-Index: libgomp/testsuite/libgomp.c/pr42029.c
+Index: libgomp/testsuite/libgomp.c/pr42942.c
 ===================================================================
---- libgomp/testsuite/libgomp.c/pr42029.c	(.../tags/gcc_4_4_2_release)	(wersja 0)
-+++ libgomp/testsuite/libgomp.c/pr42029.c	(.../branches/gcc-4_4-branch)	(wersja 157390)
-@@ -0,0 +1,19 @@
-+/* PR middle-end/42029 */
+--- libgomp/testsuite/libgomp.c/pr42942.c	(.../tags/gcc_4_4_3_release)	(wersja 0)
++++ libgomp/testsuite/libgomp.c/pr42942.c	(.../branches/gcc-4_4-branch)	(wersja 157785)
+@@ -0,0 +1,61 @@
++/* PR libgomp/42942 */
 +/* { dg-do run } */
 +
-+extern void abort (void);
++#include <omp.h>
++#include <stdlib.h>
 +
 +int
-+main ()
++main (void)
 +{
-+  int i;
-+  _Complex int c = 0;
-+
-+#pragma omp parallel for private(i) reduction(+:c)
-+  for (i = 0; i < 8; ++i)
-+    c += 1;
-+
-+  if (c != 8)
++  int e = 0;
++  omp_set_dynamic (0);
++  omp_set_nested (1);
++  omp_set_max_active_levels (1);
++  if (omp_get_max_active_levels () != 1)
++    abort ();
++#pragma omp parallel num_threads(2) reduction(|:e)
++  if (!omp_in_parallel ()
++      || omp_get_num_threads () != 2)
++    e = 1;
++  else
++#pragma omp parallel num_threads(2) reduction(|:e)
++    if (!omp_in_parallel ()
++	|| omp_get_num_threads () != 1)
++      e = 1;
++  if (e)
++    abort ();
++  omp_set_max_active_levels (0);
++  if (omp_get_max_active_levels () != 0)
++    abort ();
++#pragma omp parallel num_threads(2) reduction(|:e)
++  if (omp_in_parallel ()
++      || omp_get_num_threads () != 1)
++    e = 1;
++  else
++#pragma omp parallel num_threads(2) reduction(|:e)
++    if (omp_in_parallel ()
++	|| omp_get_num_threads () != 1)
++      e = 1;
++  if (e)
++    abort ();
++  omp_set_max_active_levels (2);
++  if (omp_get_max_active_levels () != 2)
++    abort ();
++#pragma omp parallel num_threads(2) reduction(|:e)
++  if (!omp_in_parallel ()
++      || omp_get_num_threads () != 2)
++    e = 1;
++  else
++#pragma omp parallel num_threads(2) reduction(|:e)
++    if (!omp_in_parallel ()
++	|| omp_get_num_threads () != 2)
++      e = 1;
++    else
++#pragma omp parallel num_threads(2) reduction(|:e)
++      if (!omp_in_parallel ()
++	  || omp_get_num_threads () != 1)
++	e = 1;
++  if (e)
 +    abort ();
 +  return 0;
 +}
-Index: config.guess
+Index: gcc/attribs.c
 ===================================================================
---- config.guess	(.../tags/gcc_4_4_2_release)	(wersja 157390)
-+++ config.guess	(.../branches/gcc-4_4-branch)	(wersja 157390)
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
- #   Free Software Foundation, Inc.
- 
--timestamp='2008-12-18'
-+timestamp='2009-11-19'
- 
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -27,16 +27,16 @@
- # the same distribution terms that you use for the rest of that program.
- 
- 
--# Originally written by Per Bothner <per at bothner.com>.
--# Please send patches to <config-patches at gnu.org>.  Submit a context
--# diff and a properly formatted ChangeLog entry.
-+# Originally written by Per Bothner.  Please send patches (context
-+# diff format) to <config-patches at gnu.org> and include a ChangeLog
-+# entry.
- #
- # This script attempts to guess a canonical system name similar to
- # config.sub.  If it succeeds, it prints the system name on stdout, and
- # exits with 0.  Otherwise, it exits with 1.
- #
--# The plan is that this can be called by configure scripts if you
--# don't specify an explicit build system type.
-+# You can get the latest version of this script from:
-+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
- 
- me=`echo "$0" | sed -e 's,.*/,,'`
- 
-@@ -170,7 +170,7 @@
- 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- 		eval $set_cc_for_build
- 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
--			| grep __ELF__ >/dev/null
-+			| grep -q __ELF__
- 		then
- 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- 		    # Return netbsd for either.  FIX?
-@@ -324,6 +324,9 @@
- 	case `/usr/bin/uname -p` in
- 	    sparc) echo sparc-icl-nx7; exit ;;
- 	esac ;;
-+    s390x:SunOS:*:*)
-+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-     sun4H:SunOS:5.*:*)
- 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- 	exit ;;
-@@ -653,7 +656,7 @@
- 	    # => hppa64-hp-hpux11.23
- 
- 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
--		grep __LP64__ >/dev/null
-+		grep -q __LP64__
- 	    then
- 		HP_ARCH="hppa2.0w"
- 	    else
-@@ -804,12 +807,12 @@
-     i*:PW*:*)
- 	echo ${UNAME_MACHINE}-pc-pw32
- 	exit ;;
--    *:Interix*:[3456]*)
-+    *:Interix*:*)
-     	case ${UNAME_MACHINE} in
- 	    x86)
- 		echo i586-pc-interix${UNAME_RELEASE}
- 		exit ;;
--	    EM64T | authenticamd | genuineintel)
-+	    authenticamd | genuineintel | EM64T)
- 		echo x86_64-unknown-interix${UNAME_RELEASE}
- 		exit ;;
- 	    IA64)
-@@ -819,6 +822,9 @@
-     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- 	echo i${UNAME_MACHINE}-pc-mks
- 	exit ;;
-+    8664:Windows_NT:*)
-+	echo x86_64-pc-mks
-+	exit ;;
-     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-@@ -848,6 +854,20 @@
-     i*86:Minix:*:*)
- 	echo ${UNAME_MACHINE}-pc-minix
- 	exit ;;
-+    alpha:Linux:*:*)
-+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-+	  EV5)   UNAME_MACHINE=alphaev5 ;;
-+	  EV56)  UNAME_MACHINE=alphaev56 ;;
-+	  PCA56) UNAME_MACHINE=alphapca56 ;;
-+	  PCA57) UNAME_MACHINE=alphapca56 ;;
-+	  EV6)   UNAME_MACHINE=alphaev6 ;;
-+	  EV67)  UNAME_MACHINE=alphaev67 ;;
-+	  EV68*) UNAME_MACHINE=alphaev68 ;;
-+        esac
-+	objdump --private-headers /bin/sh | grep -q ld.so.1
-+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+	exit ;;
-     arm*:Linux:*:*)
- 	eval $set_cc_for_build
- 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-@@ -870,6 +890,17 @@
-     frv:Linux:*:*)
-     	echo frv-unknown-linux-gnu
- 	exit ;;
-+    i*86:Linux:*:*)
-+	LIBC=gnu
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#ifdef __dietlibc__
-+	LIBC=dietlibc
-+	#endif
-+EOF
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-+	exit ;;
-     ia64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-@@ -879,78 +910,34 @@
-     m68*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
--    mips:Linux:*:*)
-+    mips:Linux:*:* | mips64:Linux:*:*)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
- 	#undef CPU
--	#undef mips
--	#undef mipsel
-+	#undef ${UNAME_MACHINE}
-+	#undef ${UNAME_MACHINE}el
- 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
--	CPU=mipsel
-+	CPU=${UNAME_MACHINE}el
- 	#else
- 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
--	CPU=mips
-+	CPU=${UNAME_MACHINE}
- 	#else
- 	CPU=
- 	#endif
- 	#endif
- EOF
--	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
--	    /^CPU/{
--		s: ::g
--		p
--	    }'`"
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- 	;;
--    mips64:Linux:*:*)
--	eval $set_cc_for_build
--	sed 's/^	//' << EOF >$dummy.c
--	#undef CPU
--	#undef mips64
--	#undef mips64el
--	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
--	CPU=mips64el
--	#else
--	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
--	CPU=mips64
--	#else
--	CPU=
--	#endif
--	#endif
--EOF
--	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
--	    /^CPU/{
--		s: ::g
--		p
--	    }'`"
--	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
--	;;
-     or32:Linux:*:*)
- 	echo or32-unknown-linux-gnu
- 	exit ;;
--    ppc:Linux:*:*)
--	echo powerpc-unknown-linux-gnu
--	exit ;;
--    ppc64:Linux:*:*)
--	echo powerpc64-unknown-linux-gnu
--	exit ;;
--    alpha:Linux:*:*)
--	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
--	  EV5)   UNAME_MACHINE=alphaev5 ;;
--	  EV56)  UNAME_MACHINE=alphaev56 ;;
--	  PCA56) UNAME_MACHINE=alphapca56 ;;
--	  PCA57) UNAME_MACHINE=alphapca56 ;;
--	  EV6)   UNAME_MACHINE=alphaev6 ;;
--	  EV67)  UNAME_MACHINE=alphaev67 ;;
--	  EV68*) UNAME_MACHINE=alphaev68 ;;
--        esac
--	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
--	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
--	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
--	exit ;;
-     padre:Linux:*:*)
- 	echo sparc-unknown-linux-gnu
- 	exit ;;
-+    parisc64:Linux:*:* | hppa64:Linux:*:*)
-+	echo hppa64-unknown-linux-gnu
-+	exit ;;
-     parisc:Linux:*:* | hppa:Linux:*:*)
- 	# Look for CPU level
- 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -959,9 +946,12 @@
- 	  *)    echo hppa-unknown-linux-gnu ;;
- 	esac
- 	exit ;;
--    parisc64:Linux:*:* | hppa64:Linux:*:*)
--	echo hppa64-unknown-linux-gnu
-+    ppc64:Linux:*:*)
-+	echo powerpc64-unknown-linux-gnu
- 	exit ;;
-+    ppc:Linux:*:*)
-+	echo powerpc-unknown-linux-gnu
-+	exit ;;
-     s390:Linux:*:* | s390x:Linux:*:*)
- 	echo ${UNAME_MACHINE}-ibm-linux
- 	exit ;;
-@@ -983,66 +973,6 @@
-     xtensa*:Linux:*:*)
-     	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
--    i*86:Linux:*:*)
--	# The BFD linker knows what the default object file format is, so
--	# first see if it will tell us. cd to the root directory to prevent
--	# problems with other programs or directories called `ld' in the path.
--	# Set LC_ALL=C to ensure ld outputs messages in English.
--	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
--			 | sed -ne '/supported targets:/!d
--				    s/[ 	][ 	]*/ /g
--				    s/.*supported targets: *//
--				    s/ .*//
--				    p'`
--        case "$ld_supported_targets" in
--	  elf32-i386)
--		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
--		;;
--	  a.out-i386-linux)
--		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
--		exit ;;
--	  "")
--		# Either a pre-BFD a.out linker (linux-gnuoldld) or
--		# one that does not give us useful --help.
--		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
--		exit ;;
--	esac
--	# Determine whether the default compiler is a.out or elf
--	eval $set_cc_for_build
--	sed 's/^	//' << EOF >$dummy.c
--	#include <features.h>
--	#ifdef __ELF__
--	# ifdef __GLIBC__
--	#  if __GLIBC__ >= 2
--	LIBC=gnu
--	#  else
--	LIBC=gnulibc1
--	#  endif
--	# else
--	LIBC=gnulibc1
--	# endif
--	#else
--	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
--	LIBC=gnu
--	#else
--	LIBC=gnuaout
--	#endif
--	#endif
--	#ifdef __dietlibc__
--	LIBC=dietlibc
--	#endif
--EOF
--	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
--	    /^LIBC/{
--		s: ::g
--		p
--	    }'`"
--	test x"${LIBC}" != x && {
--		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
--		exit
--	}
--	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
--	;;
-     i*86:DYNIX/ptx:4*:*)
- 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
- 	# earlier versions are messed up and put the nodename in both
-@@ -1071,7 +1001,7 @@
-     i*86:syllable:*:*)
- 	echo ${UNAME_MACHINE}-pc-syllable
- 	exit ;;
--    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- 	echo i386-unknown-lynxos${UNAME_RELEASE}
- 	exit ;;
-     i*86:*DOS:*:*)
-@@ -1115,8 +1045,11 @@
-     pc:*:*:*)
- 	# Left here for compatibility:
-         # uname -m prints for DJGPP always 'pc', but it prints nothing about
--        # the processor, so we play safe by assuming i386.
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gcc/gcc-branch.diff?r1=1.25&r2=1.26&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gcc/gcc.spec?r1=1.599&r2=1.600&f=u



More information about the pld-cvs-commit mailing list