We need to force the compiler to preprocess these files as some of
them use #include. The standard way is to rename to file .S instead of .s. This commit was SVN r18290.
Этот коммит содержится в:
родитель
4c2c6c9bd8
Коммит
465f690f90
@ -21,7 +21,7 @@
|
|||||||
######################################################################
|
######################################################################
|
||||||
#
|
#
|
||||||
# This is a bit complicated. If there is anything in the library,
|
# This is a bit complicated. If there is anything in the library,
|
||||||
# it will always be atomic-asm.s. We just symlink atomic-asm.s to
|
# it will always be atomic-asm.S. We just symlink atomic-asm.S to
|
||||||
# the best atomic operations available (as determined at configure
|
# the best atomic operations available (as determined at configure
|
||||||
# time)
|
# time)
|
||||||
#
|
#
|
||||||
@ -29,20 +29,20 @@
|
|||||||
generated/@OMPI_ASM_FILE@: base/@OMPI_ASSEMBLY_ARCH@.asm
|
generated/@OMPI_ASM_FILE@: base/@OMPI_ASSEMBLY_ARCH@.asm
|
||||||
$(PERL) '$(top_srcdir)/opal/asm/generate-asm.pl' '@OMPI_ASSEMBLY_ARCH@' '@OMPI_ASSEMBLY_FORMAT@' '$(top_srcdir)/opal/asm/base' '$(top_builddir)/opal/asm/generated/@OMPI_ASM_FILE@'
|
$(PERL) '$(top_srcdir)/opal/asm/generate-asm.pl' '@OMPI_ASSEMBLY_ARCH@' '@OMPI_ASSEMBLY_FORMAT@' '$(top_srcdir)/opal/asm/base' '$(top_builddir)/opal/asm/generated/@OMPI_ASM_FILE@'
|
||||||
|
|
||||||
atomic-asm.s: generated/@OMPI_ASM_FILE@
|
atomic-asm.S: generated/@OMPI_ASM_FILE@
|
||||||
rm -f atomic-asm.s
|
rm -f atomic-asm.S
|
||||||
@ if test -f "$(top_builddir)/opal/asm/generated/@OMPI_ASM_FILE@" ; then \
|
@ if test -f "$(top_builddir)/opal/asm/generated/@OMPI_ASM_FILE@" ; then \
|
||||||
cmd="ln -s \"$(top_builddir)/opal/asm/generated/@OMPI_ASM_FILE@\" atomic-asm.s" ; \
|
cmd="ln -s \"$(top_builddir)/opal/asm/generated/@OMPI_ASM_FILE@\" atomic-asm.S" ; \
|
||||||
echo "$$cmd" ; \
|
echo "$$cmd" ; \
|
||||||
eval $$cmd ; \
|
eval $$cmd ; \
|
||||||
else \
|
else \
|
||||||
cmd="ln -s \"$(top_srcdir)/opal/asm/generated/@OMPI_ASM_FILE@\" atomic-asm.s" ; \
|
cmd="ln -s \"$(top_srcdir)/opal/asm/generated/@OMPI_ASM_FILE@\" atomic-asm.S" ; \
|
||||||
echo "$$cmd" ; \
|
echo "$$cmd" ; \
|
||||||
eval $$cmd ; \
|
eval $$cmd ; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if OMPI_HAVE_ASM_FILE
|
if OMPI_HAVE_ASM_FILE
|
||||||
nodist_libasm_la_SOURCES = atomic-asm.s
|
nodist_libasm_la_SOURCES = atomic-asm.S
|
||||||
libasm_la_DEPENDENCIES = generated/@OMPI_ASM_FILE@
|
libasm_la_DEPENDENCIES = generated/@OMPI_ASM_FILE@
|
||||||
else
|
else
|
||||||
nodist_libasm_la_SOURCES =
|
nodist_libasm_la_SOURCES =
|
||||||
@ -72,7 +72,7 @@ EXTRA_DIST = \
|
|||||||
######################################################################
|
######################################################################
|
||||||
|
|
||||||
clean-local:
|
clean-local:
|
||||||
rm -f atomic-asm.s
|
rm -f atomic-asm.S
|
||||||
|
|
||||||
maintainer-clean-local:
|
maintainer-clean-local:
|
||||||
rm -f generated/atomic-local.s
|
rm -f generated/atomic-local.s
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user