aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Seebach <peter.seebach@windriver.com>2014-07-17 21:17:24 -0500
committerPeter Seebach <peter.seebach@windriver.com>2014-07-17 21:17:24 -0500
commitc20c4ad025a0ed5fa3ece333aff902ef93ff380c (patch)
tree5ccd45e0dad7edde45d132c4367599724fc1af85
parent512b84fb539c970464a93107995edf0e775d13fa (diff)
downloadpseudo-c20c4ad025a0ed5fa3ece333aff902ef93ff380c.tar.gz
pseudo-c20c4ad025a0ed5fa3ece333aff902ef93ff380c.tar.bz2
pseudo-c20c4ad025a0ed5fa3ece333aff902ef93ff380c.zip
linux/portdefs.h: fix non-x86 build
The assumption that a host is either x86_64 or x86_32 does not hold well on target systems.
-rw-r--r--ChangeLog.txt4
-rw-r--r--ports/linux/portdefs.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 11f492e..3b2b965 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,7 @@
+2014-07-17:
+ * (seebs) Restrict symbol version restrictions to x86-64 and i386
+ rather than x86-64 and any old thing. Fixes build problems on ARM.
+
2014-07-11:
* (seebs) merge in symbol version restrictions (slightly tweaked)
for Linux.
diff --git a/ports/linux/portdefs.h b/ports/linux/portdefs.h
index 60a8cc1..f0a0e40 100644
--- a/ports/linux/portdefs.h
+++ b/ports/linux/portdefs.h
@@ -22,6 +22,6 @@
#ifdef __amd64__
GLIBC_COMPAT_SYMBOL(memcpy,2.2.5);
-#else /* tentatively assume this means x86 */
+#elif defined(__i386__)
GLIBC_COMPAT_SYMBOL(memcpy,2.0);
#endif