You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@locus.apache.org on 2000/03/28 19:47:15 UTC
cvs commit: apache-2.0/src/lib/apr config.sub config.guess
rbb 00/03/28 09:47:14
Modified: src/lib/apr config.sub config.guess
Log:
Update the versions of config.sub and config.guess in APR
PR: 8
Submitted by: Neale.Ferguson@sterling.com
Revision Changes Path
1.3 +6 -8 apache-2.0/src/lib/apr/config.sub
Index: config.sub
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/config.sub,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.sub 1999/08/28 08:05:43 1.2
+++ config.sub 2000/03/28 17:47:13 1.3
@@ -162,7 +162,7 @@
case $basic_machine in
# Recognize the basic CPU types without company name.
# Some are omitted here because they have special meanings below.
- tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+ tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
| 580 | i960 | h8300 \
| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
@@ -171,8 +171,8 @@
| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
| mips64orion | mips64orionel | mipstx39 | mipstx39el \
| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
- | mips64vr5000 | miprs64vr5000el | mcore \
- | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
+ | mips64vr5000 | miprs64vr5000el \
+ | armv[34][lb] | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
| thumb | d10v)
basic_machine=$basic_machine-unknown
;;
@@ -191,8 +191,7 @@
exit 1
;;
# Recognize the basic CPU types with company name.
- # FIXME: clean up the formatting here.
- vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
+ vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
| m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
| mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
| power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
@@ -205,7 +204,8 @@
| sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
| mips64el-* | mips64orion-* | mips64orionel-* \
| mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
- | mipstx39-* | mipstx39el-* | mcore-* \
+ | mipstx39-* | mipstx39el-* \
+ | armv[34][lb]-* \
| f301-* | armv*-* | t3e-* \
| m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
| thumb-* | v850-* | d30v-* | tic30-* | c30-* )
@@ -890,8 +890,6 @@
;;
-gnu/linux*)
os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
- ;;
- -os2_emx)
;;
# First accept the basic system types.
# The portable systems comes first.
1.3 +14 -11 apache-2.0/src/lib/apr/config.guess
Index: config.guess
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/config.guess,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.guess 1999/08/28 08:05:43 1.2
+++ config.guess 2000/03/28 17:47:13 1.3
@@ -579,6 +579,12 @@
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit 0 ;;
*:FreeBSD:*:*)
+ if test -x /usr/bin/objformat; then
+ if test "elf" = "`/usr/bin/objformat`"; then
+ echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
+ exit 0
+ fi
+ fi
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit 0 ;;
*:NetBSD:*:*)
@@ -612,12 +618,12 @@
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit 0 ;;
*:Linux:*:*)
- # uname on the ARM produces all sorts of strangeness, and we need to
- # filter it out.
- case "$UNAME_MACHINE" in
- armv*) UNAME_MACHINE=$UNAME_MACHINE ;;
- arm* | sa110*) UNAME_MACHINE="arm" ;;
- esac
+# # uname on the ARM produces all sorts of strangeness, and we need to
+# # filter it out.
+# case "$UNAME_MACHINE" in
+# armv*) UNAME_MACHINE=$UNAME_MACHINE ;;
+# arm* | sa110*) UNAME_MACHINE="arm" ;;
+# esac
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -630,13 +636,13 @@
s/ .*//
p'`
case "$ld_supported_emulations" in
- *ia64) echo "${UNAME_MACHINE}-unknown-linux" ; exit 0 ;;
i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;;
i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;;
sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
- elf32ppc | elf32ppclinux)
+ elf32arm) echo "${UNAME_MACHINE}-unknown-linux-gnu" ; exit 0 ;;
+ elf32ppc)
# Determine Lib Version
cat >$dummy.c <<EOF
#include <features.h>
@@ -938,9 +944,6 @@
*:Rhapsody:*:*)
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
exit 0 ;;
- *:OS/2:*:*)
- echo "i386-pc-os2_emx"
- exit 0;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
Re: cvs commit: apache-2.0/src/lib/apr config.sub config.guess
Posted by rb...@apache.org.
How? I just copied the config.sub and config.guess from the Apache
directory. Can we add the code back into the current config.sub and
config.guess?
Ryan
On Wed, 29 Mar 2000, Brian Havard wrote:
> Err, hang on. You just killed the OS/2 stuff.
>
>
> On 28 Mar 2000 17:47:15 -0000, rbb@locus.apache.org wrote:
>
> >rbb 00/03/28 09:47:14
> >
> > Modified: src/lib/apr config.sub config.guess
> > Log:
> > Update the versions of config.sub and config.guess in APR
> > PR: 8
> > Submitted by: Neale.Ferguson@sterling.com
> >
Re: cvs commit: apache-2.0/src/lib/apr config.sub config.guess
Posted by Brian Havard <br...@kheldar.apana.org.au>.
Err, hang on. You just killed the OS/2 stuff.
On 28 Mar 2000 17:47:15 -0000, rbb@locus.apache.org wrote:
>rbb 00/03/28 09:47:14
>
> Modified: src/lib/apr config.sub config.guess
> Log:
> Update the versions of config.sub and config.guess in APR
> PR: 8
> Submitted by: Neale.Ferguson@sterling.com
>
> Revision Changes Path
> 1.3 +6 -8 apache-2.0/src/lib/apr/config.sub
>
> Index: config.sub
> ===================================================================
> RCS file: /home/cvs/apache-2.0/src/lib/apr/config.sub,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- config.sub 1999/08/28 08:05:43 1.2
> +++ config.sub 2000/03/28 17:47:13 1.3
[...]
> @@ -890,8 +890,6 @@
> ;;
> -gnu/linux*)
> os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
> - ;;
> - -os2_emx)
> ;;
> # First accept the basic system types.
> # The portable systems comes first.
>
>
>
> 1.3 +14 -11 apache-2.0/src/lib/apr/config.guess
>
> Index: config.guess
> ===================================================================
> RCS file: /home/cvs/apache-2.0/src/lib/apr/config.guess,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- config.guess 1999/08/28 08:05:43 1.2
> +++ config.guess 2000/03/28 17:47:13 1.3
[...]
> @@ -938,9 +944,6 @@
> *:Rhapsody:*:*)
> echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
> exit 0 ;;
> - *:OS/2:*:*)
> - echo "i386-pc-os2_emx"
> - exit 0;;
> esac
>
> #echo '(No uname command or uname output not recognized.)' 1>&2
>
>
>
--
______________________________________________________________________________
| Brian Havard | "He is not the messiah! |
| brianh@kheldar.apana.org.au | He's a very naughty boy!" - Life of Brian |
------------------------------------------------------------------------------