summaryrefslogtreecommitdiff
path: root/libio
diff options
context:
space:
mode:
authorZack Weinberg <zack@wolery.cumb.org>2000-08-14 18:08:46 +0000
committerZack Weinberg <zack@gcc.gnu.org>2000-08-14 18:08:46 +0000
commit57119aa9ebf8dbeb7e3fcab520153c2eb664b63f (patch)
tree877039da923ca899b45ce7942f147ff9d2d04d77 /libio
parentd9f204241be3449693b5ff3a3779ed3703f2f85e (diff)
downloadgcc-57119aa9ebf8dbeb7e3fcab520153c2eb664b63f.tar.gz
top level:
* configure: Make enable_threads and enable_shared defaults explicit. Substitute enable_threads into generated Makefiles. * configure.in: Accept *-*-linux* not just *-*-linux-gnu*. * libtool.m4: Accept *-*-linux* not just *-*-linux-gnu*. gcc: * configure.in: Accept *-*-linux* not just *-*-linux-gnu*. * fixinc/inclhack.def: Likewise. * fixinc/mkfixinc.sh: Likewise. * configure: Regenerate. * fixinc/fixincl.x: Regenerate. * install.texi: Document equivalence of linux and linux-gnu. libio: * configure.in: Accept *-*-linux* not just *-*-linux-gnu*. Honor --disable-threads. libstdc++: * configure.in: Accept *-*-linux* not just *-*-linux-gnu*. Honor --disable-threads. libstdc++-v3: * configure: Regenerate after change to ../libtool.m4. libobjc: * configure: Regenerate after change to ../libtool.m4. From-SVN: r35680
Diffstat (limited to 'libio')
-rw-r--r--libio/ChangeLog5
-rw-r--r--libio/configure.in25
2 files changed, 20 insertions, 10 deletions
diff --git a/libio/ChangeLog b/libio/ChangeLog
index edac14e01c1..8376dd7e62b 100644
--- a/libio/ChangeLog
+++ b/libio/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-14 Zack Weinberg <zack@wolery.cumb.org>
+
+ * configure.in: Accept *-*-linux* not just *-*-linux-gnu*.
+ Honor --disable-threads.
+
Sun Jul 23 15:16:23 2000 Krister Walfridsson <cato@df.lth.se>
* gen-params: Added trailing space for 'long long int' regexp.
diff --git a/libio/configure.in b/libio/configure.in
index 7f4f0c67463..2a14a926d39 100644
--- a/libio/configure.in
+++ b/libio/configure.in
@@ -47,22 +47,27 @@ package_makefile_rules_frag=Make.pack.r
echo "# Warning: this fragment is automatically generated" > temp.mt
frags=
+case x$enable_threads in
+ xno) ;;
+ *) mtsafe=mtsafe.mt ;;
+esac
case "${target}" in
*-mpeix*) frags="mpeix.mt" ;;
*-hpux*) frags=hpux.mt ;;
- alpha*-*-linux-gnulibc1)
- frags="linux.mt linuxaxp1.mt mtsafe.mt" ;;
- powerpc*-*-linux-gnulibc1)
- frags="linux.mt linuxaxp1.mt mtsafe.mt" ;;
- *-linux-gnulibc1)
+ alpha*-*-linux*libc1)
+ frags="linux.mt linuxaxp1.mt $mtsafe" ;;
+ powerpc*-*-linux*libc1)
+ frags="linux.mt linuxaxp1.mt $mtsafe" ;;
+ *-linux*libc1)
frags=linuxlibc1.mt ;;
- *-linux-gnu*) frags="linux.mt mtsafe.mt" ;;
+ *-linux*)
+ frags="linux.mt $mtsafe" ;;
*-isc*) frags=isc.mt ;;
*-netware*) frags=netware.mt ;;
*-dgux*) frags=dgux.mt ;;
*vxworks*) frags="vxworks.mt" ;;
- *-beos*) frags="beos.mt mtsafe.mt" ;;
+ *-beos*) frags="beos.mt $mtsafe" ;;
*) frags=${target_cpu}.mt ;;
esac
@@ -88,7 +93,7 @@ fi
# Take care of header file lossage.
case "${target}" in
- alpha*-*-linux-gnulibc1)
+ alpha*-*-linux*libc1)
# For some reason stdio-lock.h is not installed on Red Hat systems.
# Further, libc-lock.h needs to define the pthreads stuff weak, and
# fails to do this for other than _LIBC. Install our own versions
@@ -96,7 +101,7 @@ case "${target}" in
cp ${srcdir}/config/linuxaxp1-libc-lock.h libc-lock.h
cp ${srcdir}/config/linuxaxp1-stdio-lock.h stdio-lock.h
;;
- powerpc*-*-linux-gnulibc1)
+ powerpc*-*-linux*libc1)
# For some reason stdio-lock.h is not installed on Red Hat systems.
# Further, libc-lock.h needs to define the pthreads stuff weak, and
# fails to do this for other than _LIBC. Install our own versions
@@ -104,7 +109,7 @@ case "${target}" in
cp ${srcdir}/config/linuxaxp1-libc-lock.h libc-lock.h
cp ${srcdir}/config/linuxaxp1-stdio-lock.h stdio-lock.h
;;
- *-linux-gnu*)
+ *-linux*)
# We have a correct libc-lock.h in glibc 2.1 but not all glibc 2.0.
# Create a wrapper if necessary.
(echo "#include <bits/libc-lock.h>" | ${CC-cc} -E -) >/dev/null 2>&1 ||