[CMake] Detect amd64 as a valid 64-bit architecture.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 24 Sep 2011 03:12:24 +0000 (03:12 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 24 Sep 2011 03:12:24 +0000 (03:12 +0000)
https://bugs.webkit.org/show_bug.cgi?id=67481

Patch by Raphael Kubo da Costa <kubo@profusion.mobi> on 2011-09-23
Reviewed by Oliver Hunt.

Some operating systems (generally the BSDs) use amd64 instead of x86_64
to report they're running on 64 bits, so consider it a valid value.

* Source/CMakeLists.txt:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@95896 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/CMakeLists.txt

index cda6580..96f2a4c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-09-23  Raphael Kubo da Costa  <kubo@profusion.mobi>
+
+        [CMake] Detect amd64 as a valid 64-bit architecture.
+        https://bugs.webkit.org/show_bug.cgi?id=67481
+
+        Reviewed by Oliver Hunt.
+
+        Some operating systems (generally the BSDs) use amd64 instead of x86_64
+        to report they're running on 64 bits, so consider it a valid value.
+
+        * Source/CMakeLists.txt:
+
 2011-09-23  Adam Klein  <adamk@chromium.org>
 
         Add ENABLE_MUTATION_OBSERVERS feature flag
 2011-09-23  Adam Klein  <adamk@chromium.org>
 
         Add ENABLE_MUTATION_OBSERVERS feature flag
index 26477d9..abe7fe4 100644 (file)
@@ -62,7 +62,7 @@ IF (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
     SET(WTF_CPU_ARM 1)
 ELSEIF (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
     SET(WTF_CPU_MIPS 1)
     SET(WTF_CPU_ARM 1)
 ELSEIF (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
     SET(WTF_CPU_MIPS 1)
-ELSEIF (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)")
+ELSEIF (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|amd64)")
     SET(WTF_CPU_X86_64 1)
 ELSEIF (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
     SET(WTF_CPU_X86 1)
     SET(WTF_CPU_X86_64 1)
 ELSEIF (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
     SET(WTF_CPU_X86 1)