summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFumitoshi Ukai <fumitoshi.ukai@gmail.com>2016-04-13 05:00:49 (GMT)
committerFumitoshi Ukai <fumitoshi.ukai@gmail.com>2016-04-13 05:00:49 (GMT)
commit202b395c0478e060755ef9e20781e9bc0e9c5cf7 (patch)
tree62b06258a0d4ff270337a2a65adc17dd63f1a53f /src
parent2a7423b346fe77c53ba103e0dfc62909393be085 (diff)
parentb27d0420fb67d86be335d6d88c2e5face84c40bd (diff)
downloadglog-202b395c0478e060755ef9e20781e9bc0e9c5cf7.zip
glog-202b395c0478e060755ef9e20781e9bc0e9c5cf7.tar.gz
glog-202b395c0478e060755ef9e20781e9bc0e9c5cf7.tar.bz2
Merge pull request #91 from abdasgupta/master
Added support for PowerPC.
Diffstat (limited to 'src')
-rw-r--r--src/stacktrace_powerpc-inl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/stacktrace_powerpc-inl.h b/src/stacktrace_powerpc-inl.h
index 1090dde..03b9108 100644
--- 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)