* configure.in (alpha*-*-linux*): Unset $gnu_ld and $elf.

3 files changed, 31 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 7c9aa2de19..3e388606c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,12 @@
 Tue Mar 19 14:18:42 1996  Roland McGrath  <roland@charlie-brown.gnu.ai.mit.edu>
 
+	* configure.in (alpha*-*-linux*): Unset $gnu_ld and $elf.
+
 	* config.make.in (weak-symbols): Variable removed.
 	* configure.in (--with-weak-symbols): Option removed.
 	(NO_UNDERSCORES, HAVE_ASM_WEAK_DIRECTIVE, HAVE_ASM_WEAKEXT_DIRECTIVE):
 	New tests.
+
 	* config.h.in (HAVE_WEAK_SYMBOLS): #undef removed.
 	(NO_UNDERSCORES, HAVE_ASM_WEAK_DIRECTIVE, HAVE_ASM_WEAKEXT_DIRECTIVE):
 	New #undefs.
diff --git a/configure b/configure
index dc70be001c..3e44304275 100755
--- a/configure
+++ b/configure
@@ -711,12 +711,18 @@ config_machine=$host_cpu config_vendor=$host_vendor config_os=$host_os
 case "$host_os" in
 gnu* | linux* | bsd4.4* | netbsd* | freebsd*)
   # These systems always use GNU tools.
-  gnu_ld=yes gnu_as=yes
+  gnu_ld=yes gnu_as=yes ;;
 esac
 case "$host_os" in
 gnu* | linux* | sysv4* | solaris2*)
   # These systems always use the ELF format.
-  elf=yes
+  elf=yes ;;
+esac
+
+# Linux/Alpha does not use ELF yet.
+case "$host_cpu-$host_os" in
+alpha*-linux*)
+  gnu_ld=no elf=no ;;
 esac
 
 # Compute the list of sysdep directories for this configuration.
@@ -1137,13 +1143,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1141 "configure"
+#line 1147 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1147: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1152,13 +1158,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1156 "configure"
+#line 1162 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1207,7 +1213,7 @@ if eval "test \"`echo '$''{'libc_cv_friendly_stddef'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1211 "configure"
+#line 1217 "configure"
 #include "confdefs.h"
 #define __need_size_t
 #define __need_wchar_t
@@ -1223,7 +1229,7 @@ size_t size; wchar_t wchar;
 if (&size == NULL || &wchar == NULL) abort ();
 ; return 0; }
 EOF
-if { (eval echo configure:1227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   libc_cv_friendly_stddef=yes
 else
@@ -1330,7 +1336,7 @@ if eval "test \"`echo '$''{'libc_cv_have_initfini'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1334 "configure"
+#line 1340 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1339,7 +1345,7 @@ asm (".section .init");
 				    asm (".section .fini");
 ; return 0; }
 EOF
-if { (eval echo configure:1343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   libc_cv_have_initfini=yes
 else
@@ -1367,7 +1373,7 @@ if eval "test \"`echo '$''{'libc_cv_asm_underscores'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.$ac_ext <<EOF
-#line 1371 "configure"
+#line 1377 "configure"
 #include "confdefs.h"
 asm ("_glibc_foobar:");
 int main() { return 0; }
@@ -1375,7 +1381,7 @@ int t() {
 glibc_foobar ();
 ; return 0; }
 EOF
-if { (eval echo configure:1379: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   libc_cv_asm_underscores=yes
 else
@@ -1421,7 +1427,7 @@ fi
 
 echo "$ac_t""$libc_cv_asm_weak_directive" 1>&4
 
-if $libc_cv_asm_weak_directive = no; then
+if test $libc_cv_asm_weak_directive = no; then
   echo $ac_n "checking for assembler .weakext directive""... $ac_c" 1>&4
 if eval "test \"`echo '$''{'libc_cv_asm_weakext_directive'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
diff --git a/configure.in b/configure.in
index d124e49964..6f18093461 100644
--- a/configure.in
+++ b/configure.in
@@ -81,12 +81,18 @@ config_machine=$host_cpu config_vendor=$host_vendor config_os=$host_os
 case "$host_os" in
 gnu* | linux* | bsd4.4* | netbsd* | freebsd*)
   # These systems always use GNU tools.
-  gnu_ld=yes gnu_as=yes
+  gnu_ld=yes gnu_as=yes ;;
 esac
 case "$host_os" in
 gnu* | linux* | sysv4* | solaris2*)
   # These systems always use the ELF format.
-  elf=yes
+  elf=yes ;;
+esac
+
+# Linux/Alpha does not use ELF yet.
+case "$host_cpu-$host_os" in
+alpha*-linux*)
+  gnu_ld=no elf=no ;;
 esac
 
 # Compute the list of sysdep directories for this configuration.
@@ -436,7 +442,7 @@ EOF
   fi
   rm -f conftest*])
 
-if $libc_cv_asm_weak_directive = no; then
+if test $libc_cv_asm_weak_directive = no; then
   AC_CACHE_CHECK(for assembler .weakext directive,
 		 libc_cv_asm_weakext_directive,
 		 [dnl