Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2009-07-01 12:57:32 -07:00
parent bdcf52a8fd bd2e01b87e
commit f2d80ee1f5
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/libspl/asm-powerpc64/Makefile.am
View File

@ -2,11 +2,14 @@ include $(top_srcdir)/config/Rules.am
DEFAULT_INCLUDES += \ DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libspl/include -I${top_srcdir}/lib/libspl/include
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
atomic_SOURCE = atomic.c atomic_SOURCE = atomic.c
atomic_ASM = atomic.S atomic_ASM = atomic.S
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
EXTRA_DIST = ${atomic_SOURCE}
# Generates assembly to simplify inclusion in ../Makefile.am # Generates assembly to simplify inclusion in ../Makefile.am
all-am: all-am:
$(COMPILE) -c -S ${atomic_SOURCE} -o ${atomic_ASM} $(COMPILE) -c -S ${atomic_SOURCE} -o ${atomic_ASM}

6
lib/libspl/asm-powerpc64/atomic.S Normal file
View File

@ -0,0 +1,6 @@
Stub file for 'make dist' distdir rule.
This file is directly referenced by ../Makefile.am as a source
file and thus will be expected by 'make dist'. To avoid this
being a problem this stub file was added. It will be overwritten
at build time based on assmebly generated from atomic.c.