projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor clean-up in crypto/bn/asm.
[openssl.git]
/
config
diff --git
a/config
b/config
index 7008a1a659942072ddbfde814e28ffa020cb9ae0..1d5fd91e8c7453066412b6dd0f87f7ffd2ed9cbe 100755
(executable)
--- a/
config
+++ b/
config
@@
-122,6
+122,14
@@
case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
echo "${MACHINE}-ibm-aix3"; exit 0
;;
echo "${MACHINE}-ibm-aix3"; exit 0
;;
+ BeOS:*:BePC)
+ if [ -e /boot/develop/headers/be/bone ]; then
+ echo "beos-x86-bone"; exit 0
+ else
+ echo "beos-x86-r5"; exit 0
+ fi
+ ;;
+
dgux:*)
echo "${MACHINE}-dg-dgux"; exit 0
;;
dgux:*)
echo "${MACHINE}-dg-dgux"; exit 0
;;
@@
-406,7
+414,7
@@
if [ "$GCCVER" != "" ]; then
CC=gcc
# then strip off whatever prefix egcs prepends the number with...
# Hopefully, this will work for any future prefixes as well.
CC=gcc
# then strip off whatever prefix egcs prepends the number with...
# Hopefully, this will work for any future prefixes as well.
- GCCVER=`echo $GCCVER | sed 's/^[a-zA-Z]*\-//'`
+ GCCVER=`echo $GCCVER |
LC_ALL=C
sed 's/^[a-zA-Z]*\-//'`
# Since gcc 3.1 gcc --version behaviour has changed. gcc -dumpversion
# does give us what we want though, so we use that. We just just the
# major and minor version numbers.
# Since gcc 3.1 gcc --version behaviour has changed. gcc -dumpversion
# does give us what we want though, so we use that. We just just the
# major and minor version numbers.
@@
-451,8
+459,6
@@
if [ "$SYSTEM" = "SunOS" ]; then
echo " patch #107357-01 or later applied."
sleep 5
fi
echo " patch #107357-01 or later applied."
sleep 5
fi
- elif [ "$CC" = "cc" -a $CCVER -gt 0 ]; then
- CC=sc3
fi
fi
fi
fi
@@
-529,9
+535,9
@@
case "$GUESSOS" in
esac
if [ "$CC" = "gcc" ]; then
case ${ISA:-generic} in
esac
if [ "$CC" = "gcc" ]; then
case ${ISA:-generic} in
- EV5|EV45) options="$options -m
cpu
=ev5";;
- EV56|PCA56) options="$options -m
cpu
=ev56";;
- *) options="$options -m
cpu
=ev6";;
+ EV5|EV45) options="$options -m
arch
=ev5";;
+ EV56|PCA56) options="$options -m
arch
=ev56";;
+ *) options="$options -m
arch
=ev6";;
esac
fi
;;
esac
fi
;;
@@
-592,13
+598,13
@@
case "$GUESSOS" in
*86-*-linux2) OUT="linux-elf"
if [ "$GCCVER" -gt 28 ]; then
if grep '^model.*Pentium' /proc/cpuinfo >/dev/null ; then
*86-*-linux2) OUT="linux-elf"
if [ "$GCCVER" -gt 28 ]; then
if grep '^model.*Pentium' /proc/cpuinfo >/dev/null ; then
- options="$options -m
cpu
=pentium"
+ options="$options -m
arch
=pentium"
fi
if grep '^model.*Pentium Pro' /proc/cpuinfo >/dev/null ; then
fi
if grep '^model.*Pentium Pro' /proc/cpuinfo >/dev/null ; then
- options="$options -m
cpu
=pentiumpro"
+ options="$options -m
arch
=pentiumpro"
fi
if grep '^model.*K6' /proc/cpuinfo >/dev/null ; then
fi
if grep '^model.*K6' /proc/cpuinfo >/dev/null ; then
- options="$options -m
cpu
=k6"
+ options="$options -m
arch
=k6"
fi
fi ;;
*-*-linux1) OUT="linux-aout" ;;
fi
fi ;;
*-*-linux1) OUT="linux-aout" ;;
@@
-719,9
+725,9
@@
case "$GUESSOS" in
fi
fi
elif [ $CPU_VERSION -ge 528 ]; then # PA-RISC 1.1+ CPU
fi
fi
elif [ $CPU_VERSION -ge 528 ]; then # PA-RISC 1.1+ CPU
- OUT="hpux-parisc-${CC}
+ OUT="hpux-parisc-${CC}
"
elif [ $CPU_VERSION -ge 523 ]; then # PA-RISC 1.0 CPU
elif [ $CPU_VERSION -ge 523 ]; then # PA-RISC 1.0 CPU
- OUT="hpux-parisc-${CC}
+ OUT="hpux-parisc-${CC}
"
else # Motorola(?) CPU
OUT="hpux-$CC"
fi
else # Motorola(?) CPU
OUT="hpux-$CC"
fi
@@
-747,6
+753,11
@@
case "$GUESSOS" in
fi
fi
fi
fi
fi
fi
+ if (lsattr -E -O -l proc0 | grep -i powerpc) >/dev/null 2>&1; then
+ : # this applies even to Power3 and later, as they return PowerPC_POWER[345]
+ else
+ options="$options no-asm"
+ fi
;;
# these are all covered by the catchall below
# *-dgux) OUT="dgux" ;;
;;
# these are all covered by the catchall below
# *-dgux) OUT="dgux" ;;
@@
-756,6
+767,7
@@
case "$GUESSOS" in
t3e-cray-unicosmk) OUT="cray-t3e" ;;
j90-cray-unicos) OUT="cray-j90" ;;
nsr-tandem-nsk) OUT="tandem-c89" ;;
t3e-cray-unicosmk) OUT="cray-t3e" ;;
j90-cray-unicos) OUT="cray-j90" ;;
nsr-tandem-nsk) OUT="tandem-c89" ;;
+ beos-*) OUT="$GUESSOS" ;;
*) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
esac
*) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
esac
@@
-771,7
+783,7
@@
esac
# options="$options -DATALLA"
#fi
# options="$options -DATALLA"
#fi
-# gcc < 2.8 does not support -m
cpu
=ultrasparc
+# gcc < 2.8 does not support -m
arch
=ultrasparc
if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ]
then
echo "WARNING! Falling down to 'solaris-sparcv8-gcc'."
if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ]
then
echo "WARNING! Falling down to 'solaris-sparcv8-gcc'."
@@
-791,7
+803,7
@@
case "$GUESSOS" in
i386-*) options="$options 386" ;;
esac
i386-*) options="$options 386" ;;
esac
-for i in
bf cast des dh dsa ec hmac idea md2 md5 mdc2 rc2 rc4 rc5 aes
ripemd rsa sha
+for i in
aes bf camellia cast des dh dsa ec hmac idea md2 md5 mdc2 rc2 rc4 rc5
ripemd rsa sha
do
if [ ! -d crypto/$i ]
then
do
if [ ! -d crypto/$i ]
then