From stdcxx-commits-return-1514-apmail-incubator-stdcxx-commits-archive=incubator.apache.org@incubator.apache.org Sun Jul 08 21:11:58 2007 Return-Path: Delivered-To: apmail-incubator-stdcxx-commits-archive@www.apache.org Received: (qmail 12502 invoked from network); 8 Jul 2007 21:11:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Jul 2007 21:11:58 -0000 Received: (qmail 29908 invoked by uid 500); 8 Jul 2007 21:12:01 -0000 Delivered-To: apmail-incubator-stdcxx-commits-archive@incubator.apache.org Received: (qmail 29885 invoked by uid 500); 8 Jul 2007 21:12:01 -0000 Mailing-List: contact stdcxx-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: stdcxx-dev@incubator.apache.org Delivered-To: mailing list stdcxx-commits@incubator.apache.org Received: (qmail 29874 invoked by uid 99); 8 Jul 2007 21:12:01 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Jul 2007 14:12:01 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Jul 2007 14:11:58 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 63D551A981A; Sun, 8 Jul 2007 14:11:37 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r554444 - /incubator/stdcxx/trunk/tests/src/driver.cpp Date: Sun, 08 Jul 2007 21:11:37 -0000 To: stdcxx-commits@incubator.apache.org From: sebor@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070708211137.63D551A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sebor Date: Sun Jul 8 14:11:36 2007 New Revision: 554444 URL: http://svn.apache.org/viewvc?view=rev&rev=554444 Log: 2007-07-08 Martin Sebor * driver.cpp [Linux] (UTS_RELEASE): Removed conditionally-defined helper macro in favor of _RWSTD_LINUX_RELEASE. (__x86_64__): Moved check above __amd64__ and other x86 arches whose macros are always defined (e.g., __pentiumpro__). Modified: incubator/stdcxx/trunk/tests/src/driver.cpp Modified: incubator/stdcxx/trunk/tests/src/driver.cpp URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/src/driver.cpp?view=diff&rev=554444&r1=554443&r2=554444 ============================================================================== --- incubator/stdcxx/trunk/tests/src/driver.cpp (original) +++ incubator/stdcxx/trunk/tests/src/driver.cpp Sun Jul 8 14:11:36 2007 @@ -182,6 +182,12 @@ #ifndef RW_TEST_HARDWARE # if defined (__alpha__) || defined (__alpha) # define RW_TEST_ARCH "alpha" +# elif defined (__x86_64__) || defined (__x86_64) +# if defined (__LP64__) || defined (_LP64) +# define RW_TEST_ARCH "x86_64/LP64" +# else +# define RW_TEST_ARCH "x86_64/ILP32" +# endif # elif defined (__amd64__) || defined (__amd64) # if defined (__LP64__) || defined (_LP64) # define RW_TEST_ARCH "amd64/LP64" @@ -240,12 +246,6 @@ # define RW_TEST_ARCH "ia64" # elif defined (_WIN32) # define RW_TEST_ARCH "i86" -# elif defined (__x86_64__) || defined (__x86_64) -# if defined (__LP64__) || defined (_LP64) -# define RW_TEST_ARCH "x86_64/LP64" -# else -# define RW_TEST_ARCH "x86_64/ILP32" -# endif # else # define RW_TEST_ARCH "unknown" # endif @@ -276,23 +276,15 @@ # elif defined (__sgi) && defined (__mips) # define RW_TEST_OS "irix" # elif defined (__linux__) || defined (__linux) - - // get Linux release string (UTS_RELEASE) -# include - -# ifndef UTS_RELEASE -# define UTS_RELEASE "(unknown release)" -# endif // UTS_RELEASE - # if defined (__ELF__) # define LINUX_TYPE "linux-elf" # else # define LINUX_TYPE "linux" # endif -# define RW_TEST_OS LINUX_TYPE " " \ - UTS_RELEASE " with glibc " \ - RW_TEST_STR (__GLIBC__) "." \ +# define RW_TEST_OS LINUX_TYPE " (" \ + _RWSTD_LINUX_RELEASE ") with glibc " \ + RW_TEST_STR (__GLIBC__) "." \ RW_TEST_STR (__GLIBC_MINOR__) # elif defined (__SunOS_5_10)