new upstream version

1 files changed, 102 insertions, 0 deletions

diff --git a/config.guess b/config.guess
index 396482d..f36bc0c 100755
--- a/config.guess
+++ b/config.guess
@@ -829,7 +829,11 @@ EOF
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     arm*:Linux:*:*)
+<<<<<<< .robocza
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+=======
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+>>>>>>> .merge-prawo.w227
 	exit ;;
     avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -841,16 +845,32 @@ EOF
 	echo crisv32-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
+<<<<<<< .robocza
     	echo frv-unknown-linux-gnu
+=======
+    	echo frv-${VENDOR}-linux-gnu
+>>>>>>> .merge-prawo.w227
 	exit ;;
     ia64:Linux:*:*)
+<<<<<<< .robocza
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+=======
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+>>>>>>> .merge-prawo.w227
 	exit ;;
     m32r*:Linux:*:*)
+<<<<<<< .robocza
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+=======
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+>>>>>>> .merge-prawo.w227
 	exit ;;
     m68*:Linux:*:*)
+<<<<<<< .robocza
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+=======
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+>>>>>>> .merge-prawo.w227
 	exit ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
@@ -868,12 +888,21 @@ EOF
 	#endif
 	#endif
 EOF
+<<<<<<< .robocza
 	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; }
+=======
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
+	test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
+>>>>>>> .merge-prawo.w227
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -891,21 +920,44 @@ EOF
 	#endif
 	#endif
 EOF
+<<<<<<< .robocza
 	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; }
+=======
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
+	test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
+>>>>>>> .merge-prawo.w227
 	;;
+<<<<<<< .robocza
     or32:Linux:*:*)
 	echo or32-unknown-linux-gnu
 	exit ;;
+=======
+    or32:Linux:*:*)
+	echo or32-${VENDOR}-linux-gnu
+	exit ;;
+>>>>>>> .merge-prawo.w227
     ppc:Linux:*:*)
+<<<<<<< .robocza
 	echo powerpc-unknown-linux-gnu
+=======
+	echo powerpc-${VENDOR}-linux-gnu
+>>>>>>> .merge-prawo.w227
 	exit ;;
     ppc64:Linux:*:*)
+<<<<<<< .robocza
 	echo powerpc64-unknown-linux-gnu
+=======
+	echo powerpc64-${VENDOR}-linux-gnu
+>>>>>>> .merge-prawo.w227
 	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -919,36 +971,66 @@ EOF
         esac
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+<<<<<<< .robocza
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+=======
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
+>>>>>>> .merge-prawo.w227
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+<<<<<<< .robocza
 	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
 	  *)    echo hppa-unknown-linux-gnu ;;
+=======
+	  PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;;
+	  PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
+	  *)    echo hppa-${VENDOR}-linux-gnu ;;
+>>>>>>> .merge-prawo.w227
 	esac
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
+<<<<<<< .robocza
 	echo hppa64-unknown-linux-gnu
+=======
+	echo hppa64-${VENDOR}-linux-gnu
+>>>>>>> .merge-prawo.w227
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
+<<<<<<< .robocza
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
+=======
+    	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+>>>>>>> .merge-prawo.w227
 	exit ;;
     sh*:Linux:*:*)
+<<<<<<< .robocza
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+=======
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+>>>>>>> .merge-prawo.w227
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
+<<<<<<< .robocza
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+=======
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+>>>>>>> .merge-prawo.w227
 	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
+<<<<<<< .robocza
 	echo x86_64-unknown-linux-gnu
+=======
+	echo x86_64-${VENDOR}-linux-gnu
+>>>>>>> .merge-prawo.w227
 	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
@@ -963,18 +1045,34 @@ EOF
 				    p'`
         case "$ld_supported_targets" in
 	  elf32-i386)
+<<<<<<< .robocza
 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+=======
+		TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux-gnu"
+>>>>>>> .merge-prawo.w227
 		;;
 	  a.out-i386-linux)
+<<<<<<< .robocza
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+=======
+		echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuaout"
+>>>>>>> .merge-prawo.w227
 		exit ;;
 	  coff-i386)
+<<<<<<< .robocza
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+=======
+		echo "${UNAME_MACHINE}-${VENDOR}-linux-gnucoff"
+>>>>>>> .merge-prawo.w227
 		exit ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
+<<<<<<< .robocza
 		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+=======
+		echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuoldld"
+>>>>>>> .merge-prawo.w227
 		exit ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
@@ -1008,7 +1106,11 @@ EOF
 		p
 	    }'`"
 	test x"${LIBC}" != x && {
+<<<<<<< .robocza
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+=======
+		echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}"
+>>>>>>> .merge-prawo.w227
 		exit
 	}
 	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }