84 lines
3.1 KiB
Diff
84 lines
3.1 KiB
Diff
|
diff --git a/acinclude.m4 b/acinclude.m4
|
||
|
|
index 86175ce42..8228d20dc 100644
|
||
|
|
--- a/acinclude.m4
|
||
|
|
+++ b/acinclude.m4
|
||
|
|
@@ -1649,7 +1649,7 @@ AC_DEFUN([GMP_TRY_ASSEMBLE],
|
||
|
|
[cat >conftest.s <<EOF
|
||
|
|
[$1]
|
||
|
|
EOF
|
||
|
|
-gmp_assemble="$CCAS $CFLAGS $CPPFLAGS conftest.s >conftest.out 2>&1"
|
||
|
|
+gmp_assemble="$CCAS $CPPFLAGS $ASMFLAGS conftest.s >conftest.out 2>&1"
|
||
|
|
if AC_TRY_EVAL(gmp_assemble); then
|
||
|
|
cat conftest.out >&AC_FD_CC
|
||
|
|
ifelse([$2],,:,[$2])
|
||
|
|
@@ -2382,7 +2382,7 @@ for tmp_underscore in "" "_"; do
|
||
|
|
${tmp_gsym_prefix}main$gmp_cv_asm_label_suffix
|
||
|
|
addl $ ${tmp_underscore}_GLOBAL_OFFSET_TABLE_, %ebx
|
||
|
|
EOF
|
||
|
|
- gmp_compile="$CCAS $CFLAGS $CPPFLAGS $lt_prog_compiler_pic conftest.s >&AC_FD_CC && $CC $CFLAGS $CPPFLAGS $lt_prog_compiler_pic conftest.$OBJEXT >&AC_FD_CC"
|
||
|
|
+ gmp_compile="$CCAS $CPPFLAGS $ASMFLAGS $lt_prog_compiler_pic conftest.s >&AC_FD_CC && $CC $CPPFLAGS $ASMFLAGS $lt_prog_compiler_pic conftest.$OBJEXT >&AC_FD_CC"
|
||
|
|
if AC_TRY_EVAL(gmp_compile); then
|
||
|
|
if test "$tmp_underscore" = "_"; then
|
||
|
|
gmp_cv_asm_x86_got_underscore=yes
|
||
|
|
@@ -2556,7 +2556,7 @@ movq-bug)
|
||
|
|
AC_MSG_WARN([+----------------------------------------------------------])
|
||
|
|
AC_MSG_WARN([| WARNING WARNING WARNING])
|
||
|
|
AC_MSG_WARN([| Host CPU has MMX code, but the assembler])
|
||
|
|
- AC_MSG_WARN([| $CCAS $CFLAGS $CPPFLAGS])
|
||
|
|
+ AC_MSG_WARN([| $CCAS $CPPFLAGS $ASMFLAGS])
|
||
|
|
AC_MSG_WARN([| has the Solaris 2.6 and 2.7 bug where register to register])
|
||
|
|
AC_MSG_WARN([| movq operands are reversed.])
|
||
|
|
AC_MSG_WARN([| Non-MMX replacements will be used.])
|
||
|
|
diff --git a/mpn/Makeasm.am b/mpn/Makeasm.am
|
||
|
|
index 5d7306c22..75692128d 100644
|
||
|
|
--- a/mpn/Makeasm.am
|
||
|
|
+++ b/mpn/Makeasm.am
|
||
|
|
@@ -32,7 +32,7 @@
|
||
|
|
# COMPILE minus CC.
|
||
|
|
#
|
||
|
|
COMPILE_FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
||
|
|
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ASMFLAGS)
|
||
|
|
+ $(CPPFLAGS) $(ASMFLAGS)
|
||
|
|
|
||
|
|
# Flags used for preprocessing (in ansi2knr rules).
|
||
|
|
#
|
||
|
|
diff --git a/mpn/Makefile.in b/mpn/Makefile.in
|
||
|
|
index 2bc061012..59c805976 100644
|
||
|
|
--- a/mpn/Makefile.in
|
||
|
|
+++ b/mpn/Makefile.in
|
||
|
|
@@ -403,7 +403,7 @@ EXTRA_DIST = asm-defs.m4 cpp-ccas m4-ccas $(TARG_DIST)
|
||
|
|
# COMPILE minus CC.
|
||
|
|
#
|
||
|
|
COMPILE_FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
||
|
|
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ASMFLAGS)
|
||
|
|
+ $(CPPFLAGS) $(ASMFLAGS)
|
||
|
|
|
||
|
|
|
||
|
|
# Flags used for preprocessing (in ansi2knr rules).
|
||
|
|
diff --git a/tests/Makefile.in b/tests/Makefile.in
|
||
|
|
index 9742a4016..430603cef 100644
|
||
|
|
--- a/tests/Makefile.in
|
||
|
|
+++ b/tests/Makefile.in
|
||
|
|
@@ -666,7 +666,7 @@ SUBDIRS = . devel mpn mpz mpq mpf rand misc cxx
|
||
|
|
# COMPILE minus CC.
|
||
|
|
#
|
||
|
|
COMPILE_FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
||
|
|
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ASMFLAGS)
|
||
|
|
+ $(CPPFLAGS) $(ASMFLAGS)
|
||
|
|
|
||
|
|
|
||
|
|
# Flags used for preprocessing (in ansi2knr rules).
|
||
|
|
diff --git a/tune/Makefile.in b/tune/Makefile.in
|
||
|
|
index f82cd13e2..351bcd9b1 100644
|
||
|
|
--- a/tune/Makefile.in
|
||
|
|
+++ b/tune/Makefile.in
|
||
|
|
@@ -549,7 +549,7 @@ TUNE_MPN_SRCS_BASIC = div_qr_2.c bdiv_q.c bdiv_qr.c \
|
||
|
|
# COMPILE minus CC.
|
||
|
|
#
|
||
|
|
COMPILE_FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
||
|
|
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ASMFLAGS)
|
||
|
|
+ $(CPPFLAGS) $(ASMFLAGS)
|
||
|
|
|
||
|
|
|
||
|
|
# Flags used for preprocessing (in ansi2knr rules).
|