Makefile.in: Remove RANLIB definition.

        * Makefile.in: Remove RANLIB definition. Use RANLIB
        in RANLIB_FOR_TARGET, EXTRA_HOST_FLAGS, EXTRA_TARGET_FLAGS,
        EXTRA_GCC_FLAGS, $(DO_X) targets only when the RANLIB is set.

        * Makefile.in: Set RANLIB to @RANLIB@.
        Remove RANLIB_TEST.

        * fixinc/inclhack.def (djgpp_wchar_h): New test.
        * fixinc/fixincl.x: Regenerated.

From-SVN: r40299

ChangeLog

+2001-03-06  Laurynas Biveinis  <lauras@softhome.net>
+
+	* Makefile.in: Remove RANLIB definition. Use RANLIB
+	in RANLIB_FOR_TARGET, EXTRA_HOST_FLAGS, EXTRA_TARGET_FLAGS,
+	EXTRA_GCC_FLAGS, $(DO_X) targets only when the RANLIB is set.
+		    
 2001-02-28  Benjamin Kosnik  <bkoz@redhat.com>
             Alexandre Oliva  <aoliva@redhat.com>
 	

Makefile.in

@@ -102,8 +102,6 @@ LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
 CXXFLAGS_FOR_TARGET = $(CXXFLAGS)
 LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
 
-RANLIB = ranlib
-
 DLLTOOL = dlltool
 WINDRES = windres
 
@@ -288,7 +286,11 @@ RANLIB_FOR_TARGET = ` \
     echo $$r/binutils/ranlib ; \
   else \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
-      echo $(RANLIB); \
+      if [ x"$(RANLIB)" != x ]; then \
+         echo $(RANLIB); \
+      else \
+         echo ranlib; \
+      fi; \
     else \
        t='$(program_transform_name)'; echo ranlib | sed -e 's/x/x/' $$t ; \
     fi; \
@@ -399,7 +401,7 @@ EXTRA_HOST_FLAGS = \
 	'DLLTOOL=$(DLLTOOL)' \
 	'LD=$(LD)' \
 	'NM=$(NM)' \
-	'RANLIB=$(RANLIB)' \
+	"`echo 'RANLIB=$(RANLIB)' | sed -e s/.*=$$/XFOO=/`" \
 	'WINDRES=$(WINDRES)'
 
 FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)
@@ -432,7 +434,7 @@ EXTRA_TARGET_FLAGS = \
 	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
 	'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
 	'NM=$$(NM_FOR_TARGET)' \
-	'RANLIB=$$(RANLIB_FOR_TARGET)' \
+	"`echo 'RANLIB=$(RANLIB)' | sed -e s/.*=$$/XFOO=/`" \
 	'WINDRES=$$(WINDRES_FOR_TARGET)'
 
 TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
@@ -453,7 +455,7 @@ EXTRA_GCC_FLAGS = \
 	'HOST_PREFIX=$(HOST_PREFIX)' \
 	'HOST_PREFIX_1=$(HOST_PREFIX_1)' \
 	'NM=$(NM)' \
-	'RANLIB=$(RANLIB)' \
+	"`echo 'RANLIB=$(RANLIB)' | sed -e s/.*=$$/XFOO=/`" \
 	'WINDRES=$$(WINDRES_FOR_TARGET)' \
 	"GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
 	"`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s/.*=$$/XFOO=/`" \
@@ -965,7 +967,7 @@ $(DO_X):
 	    if (cd ./$$i; \
 	        $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 			"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-			"RANLIB=$${RANLIB}" \
+	                "`echo 'RANLIB=$${RANLIB}' | sed -e s/.*=$$/XFOO=/`" \
 			"DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 			$${target}); \
 	    then true; else exit 1; fi; \
@@ -984,7 +986,7 @@ $(DO_X):
 	    if (cd $(TARGET_SUBDIR)/$$i; \
 	        $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 			"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-			"RANLIB=$${RANLIB}" \
+	                "`echo 'RANLIB=$(RANLIB)' | sed -e s/.*=$$/XFOO=/`" \
 			"DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
 			$${target}); \
 	    then true; else exit 1; fi; \

gcc/ChangeLog

+2001-03-07  Laurynas Biveinis  <lauras@softhome.net>
+
+        * Makefile.in: Set RANLIB to @RANLIB@.
+        Remove RANLIB_TEST.
+
+2001-03-07  Laurynas Biveinis  <lauras@softhome.net>
+	 
+	* fixinc/inclhack.def (djgpp_wchar_h): New test.
+	* fixinc/fixincl.x: Regenerated.
+
 2001-03-07  Richard Henderson  <rth@redhat.com>
 
 	* config/alpha/alpha.md (call_osf_1_noreturn): New pattern.

gcc/Makefile.in

@@ -112,6 +112,7 @@ FLEXFLAGS =
 AR = ar
 AR_FLAGS = rc
 DLLTOOL = dlltool
+RANLIB = @RANLIB@
 SHELL = /bin/sh
 # on sysV, define this as cp.
 INSTALL = @INSTALL@
@@ -140,13 +141,6 @@ OUTPUT_OPTION = @OUTPUT_OPTION@
 ZLIB = @zlibdir@ -lz
 ZLIBINC = @zlibinc@
 
-# How to invoke ranlib.
-RANLIB = ranlib
-# Test to use to see whether ranlib exists on the system.
-RANLIB_TEST = \
-  [ -f $(RANLIB) ] \
-  || [ -f /usr/bin/ranlib -o -f /bin/ranlib ]
-
 # Substitution type for target's getgroups 2nd arg.
 TARGET_GETGROUPS_T = @TARGET_GETGROUPS_T@
 
@@ -958,7 +952,7 @@ compilations: $(BACKEND)
 libbackend.a: $(OBJS)
 	-rm -rf libbackend.a
 	$(AR) $(AR_FLAGS) libbackend.a $(OBJS)
-	if $(RANLIB_TEST) ; then $(RANLIB) libbackend.a ; else true ; fi
+	-$(RANLIB) libbackend.a
 
 # We call this executable `xgcc' rather than `gcc'
 # to avoid confusion if the current directory is in the path
@@ -1907,7 +1901,7 @@ LIBCPP_DEPS =	cpplib.h cpphash.h intl.h system.h
 libcpp.a: $(LIBCPP_OBJS)
 	-rm -rf libcpp.a
 	$(AR) $(AR_FLAGS) libcpp.a $(LIBCPP_OBJS)
-	if $(RANLIB_TEST) ; then $(RANLIB) libcpp.a ; else true ; fi
+	-$(RANLIB) libcpp.a
 
 cpp0$(exeext): cppmain.o intl.o libcpp.a $(LIBDEPS)
 	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o cpp0$(exeext) cppmain.o \

gcc/fixinc/inclhack.def

@@ -1000,6 +1000,20 @@ fix = {
 
 
 /*
+ * Fix typo in <wchar.h> on DJGPP 2.03.
+ */
+fix = {
+    hackname  = djgpp_wchar_h;
+    file      = wchar.h;
+    select    = "__DJ_wint_t";
+    bypass    = "sys/djtypes.h";
+    c_fix     = format;
+    c_fix_arg = "%0\n#include <sys/djtypes.h>";
+    c_fix_arg = "#include <stddef.h>";
+    test_text = "__DJ_wint_t\n#undef __DJ_wint_t\n#define __DJ_wint_t";
+};
+
+/*
  * Fix these Sun OS files to avoid an invalid identifier in an #ifdef.
  */
 fix = {