diff --git a/clisp-2.49-configure.dif b/clisp-2.49-configure.dif index 841d378..952d904 100644 --- a/clisp-2.49-configure.dif +++ b/clisp-2.49-configure.dif @@ -1,9 +1,9 @@ --- clisp-536a48a9/configure | 4 ++-- clisp-536a48a9/src/lispbibl.d | 16 +++++++++++----- - clisp-536a48a9/src/makemake.in | 15 ++++++++++++++- + clisp-536a48a9/src/makemake.in | 16 +++++++++++++--- clisp-536a48a9/utils/modprep.lisp | 2 +- - 4 files changed, 28 insertions(+), 9 deletions(-) + 4 files changed, 27 insertions(+), 11 deletions(-) --- clisp-536a48a9/configure +++ clisp-536a48a9/configure 2016-11-29 16:47:05.962094941 +0000 @@ -70,7 +70,7 @@ #elif !(oint_addr_shift==0) #define type_data_object(type,data) \ --- clisp-536a48a9/src/makemake.in -+++ clisp-536a48a9/src/makemake.in 2016-11-29 17:01:02.228991542 +0000 ++++ clisp-536a48a9/src/makemake.in 2016-12-05 15:16:19.800662503 +0000 @@ -246,6 +246,9 @@ verbose=${CLISP_MAKEMAKE_VERBOSE:-false} # Handle --with-... arguments while test -z "$endofargs"; do @@ -89,18 +89,24 @@ cpu=$host_cpu_c_abi if test -z "$cpu"; then echo "$0: WARNING: host_cpu_c_abi is void; using host_cpu=${host_cpu}" >&2 -@@ -1125,6 +1129,10 @@ if test -z "$cpu"; then +@@ -1125,6 +1129,7 @@ if test -z "$cpu"; then * ) cpu=${host_cpu} esac fi -+case "$cpu" in -+ arm*) cpu=arm ;; -+esac +set +x test "${verbose}" = true -o "${verbose}" = yes && \ cat <&2 -@@ -1272,6 +1280,10 @@ if [ $XCC_GCC = true ] ; then +@@ -1240,7 +1245,7 @@ if [ $XCC_GCC = true ] ; then + fi + # For platforms that use global register variables... + case "$cpu" in +- m68k | i386 | sparc | sparc64 | hppa | m88k | arm | alpha* | convex | s390*) ++ m68k | i386 | sparc | sparc64 | hppa | m88k | arm* | alpha* | convex | s390*) + if [ $CROSS = false ] ; then + case "$XCC_GCC_VERSION" in + 3.1*) +@@ -1272,6 +1277,10 @@ if [ $XCC_GCC = true ] ; then XCFLAGS=${XCFLAGS}" -pthread" fi @@ -111,7 +117,16 @@ else if [ $TSYS = sun4 -a $CROSS = false ] ; then -@@ -3417,8 +3429,9 @@ if [ $CROSS = false ] ; then +@@ -1602,7 +1611,7 @@ if [ "$cpu" = hppa ] ; then + ARI_ASMD=$ARI_ASMD' arihppa' + ARI_ASMS=$ARI_ASMS' arihppa' + fi +-if [ "$cpu" = arm ] ; then ++if [ "$cpu" = arm -o "$cpu" = armel ] ; then + ARI_ASMD=$ARI_ASMD' ariarm' + ARI_ASMS=$ARI_ASMS' ariarm' + fi +@@ -3417,8 +3426,9 @@ if [ $CROSS = false ] ; then echol if [ "${with_dynamic_modules}" != no ]; then depends="full install-modules force" diff --git a/clisp.spec b/clisp.spec index 3fc9bb5..7eb2e1f 100644 --- a/clisp.spec +++ b/clisp.spec @@ -171,6 +171,7 @@ CC="${CC} -g ${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC -pipe" case "$RPM_ARCH" in i[0-9]86) CC="${CC} -falign-functions=4 -mieee-fp -ffloat-store" ;; + arm) CC="${CC}" ;; ppc) CC="${CC}" ;; s390) CC="${CC}" ;; x86_64) CC="${CC} -fno-gcse" ;; @@ -186,7 +187,9 @@ safety='-DSAFETY=3 -O' MYCFLAGS="${MYCFLAGS} -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" MYCFLAGS="${MYCFLAGS} -D_GNU_SOURCE -Wno-unused -Wno-uninitialized" case "$RPM_ARCH" in - i[0-9]86) MYCFLAGS="${MYCFLAGS} ${noexec}" ;; + i[0-9]86) + MYCFLAGS="${MYCFLAGS} ${noexec}" ;; + arm) MYCFLAGS="${MYCFLAGS} ${noexec}" ;; ppc) MYCFLAGS="${MYCFLAGS} ${noexec}" ;; s390) MYCFLAGS="${MYCFLAGS} ${noexec}" ;; x86_64) MYCFLAGS="${MYCFLAGS} ${safety}" ;;