summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2005-08-15 23:43:29 +0000
committerDavid Schleef <ds@schleef.org>2005-08-15 23:43:29 +0000
commit8580401aada75c91422d9ee4f2c055534105e434 (patch)
tree41f573c808adba706228d81abf9a891cf431dc5b
parentd0e03fd5e89c258ab1be3b4e1ec6013fd2bd1398 (diff)
downloadliboil-8580401aada75c91422d9ee4f2c055534105e434.tar.gz
* liboil/i386/Makefile.am: compile empty file on non-i386
* liboil/motovec/motovec.c: get underscore conditional correctly
-rw-r--r--ChangeLog5
-rw-r--r--liboil/i386/Makefile.am9
-rw-r--r--liboil/motovec/motovec.c2
3 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index bf016ea..578ed5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2005-08-15 David Schleef <ds@schleef.org>
+ * liboil/i386/Makefile.am: compile empty file on non-i386
+ * liboil/motovec/motovec.c: get underscore conditional correctly
+
+2005-08-15 David Schleef <ds@schleef.org>
+
* testsuite/abs.c: (test), (main): remove glib usage in testsuite
* testsuite/copy.c: (test), (main):
* testsuite/md5.c: (test), (main):
diff --git a/liboil/i386/Makefile.am b/liboil/i386/Makefile.am
index 1d66341..39ad275 100644
--- a/liboil/i386/Makefile.am
+++ b/liboil/i386/Makefile.am
@@ -1,4 +1,6 @@
+CLEANFILES = empty.c
+
noinst_LTLIBRARIES = libi386.la
sources = \
@@ -12,16 +14,19 @@ sources = \
if HAVE_CPU_I386
i386_sources = $(sources)
else
-i386_sources =
+i386_sources = empty.c
endif
if HAVE_CPU_AMD64
amd64_sources = $(sources)
else
-amd64_sources =
+amd64_sources = empty.c
endif
libi386_la_SOURCES = \
$(i386_sources)
libi386_la_CFLAGS = $(LIBOIL_CFLAGS)
+empty.c:
+ echo >empty.c
+
diff --git a/liboil/motovec/motovec.c b/liboil/motovec/motovec.c
index ae0c264..b94c9fc 100644
--- a/liboil/motovec/motovec.c
+++ b/liboil/motovec/motovec.c
@@ -34,7 +34,7 @@
OIL_DECLARE_CLASS(copy_u8);
OIL_DECLARE_CLASS(splat_u8_ns);
-#ifdef HAVE_LD_UNDERSCORE
+#ifdef HAVE_SYMBOL_UNDERSCORE
void *vec_memcpy(void *dest, void *src, int n);
void *vec_memset(void *dest, int val, int n);
#else