Merge pull request google#91 from abdasgupta/master

Added support for PowerPC.
durswd · Apr 13, 2016 · 053c923 · 053c923
2 parents 119289e + 11ac254
commit 053c923
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/AUTHORS b/AUTHORS
@@ -8,6 +8,7 @@
 #
 # Please keep the list sorted.
 
+Abhishek Dasgupta <[email protected]>
 Abhishek Parmar <[email protected]>
 Brian Silverman <[email protected]>
 Google Inc.

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -22,6 +22,7 @@
 #
 # Please keep the list sorted.
 
+Abhishek Dasgupta <[email protected]>
 Abhishek Parmar <[email protected]>
 Brian Silverman <[email protected]>
 Fumitoshi Ukai <[email protected]>

diff --git a/config.guess b/config.guess
@@ -911,6 +911,9 @@ EOF
     ppc64:Linux:*:*)
 	echo powerpc64-unknown-linux-gnu
 	exit ;;
+    ppc64le:Linux:*:*)
+        echo powerpc64le-unknown-linux-gnu
+        exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;

diff --git a/src/stacktrace_powerpc-inl.h b/src/stacktrace_powerpc-inl.h
@@ -111,7 +111,7 @@ int GetStackTrace(void** result, int max_depth, int skip_count) {
       result[n++] = *(sp+2);
 #elif defined(_CALL_SYSV)
       result[n++] = *(sp+1);
-#elif defined(__APPLE__) || (defined(__linux) && defined(__PPC64__))
+#elif defined(__APPLE__) || ((defined(__linux) || defined(__linux__)) && defined(__PPC64__))
       // This check is in case the compiler doesn't define _CALL_AIX/etc.
       result[n++] = *(sp+2);
 #elif defined(__linux)