stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject svn commit: r554444 - /incubator/stdcxx/trunk/tests/src/driver.cpp
Date Sun, 08 Jul 2007 21:11:37 GMT
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  <sebor@roguewave.com>

	* 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 <linux/version.h>
-
-#    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)



Mime
View raw message