configure.in: Allow enable_threads_flag value of "aix".

	* configure.in: Allow enable_threads_flag value of "aix".  Define
	thread_file as "aix" for AIX 4.3 and above..
	* configure: Regenerated.

	* gthr-aix.h: New file.

	* rs6000/t-aix43: Replace soft-float multilib with pthread.
	Remove 403 processor multilib match.  Fix rios2 processor multilib
	match.

	* rs6000/aix.h (ASM_DECLARE_FUNCTION_NAME): Use function_section
	to return to appropriate csect.

From-SVN: r36541

gcc/ChangeLog

+2000-09-19  David Edelsohn  <edelsohn@gnu.org>
+
+	* configure.in: Allow enable_threads_flag value of "aix".  Define
+	thread_file as "aix" for AIX 4.3 and above..
+	* configure: Regenerated.
+	* rs6000/t-aix43: Replace soft-float multilib with pthread.
+	Remove 403 processor multilib match.  Fix rios2 processor multilib
+	match.
+
 2000-09-19  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* builtins.c (is_valid_printf_arglist, expand_builtin_printf): New

gcc/config/rs6000/aix.h

@@ -425,10 +425,7 @@ toc_section ()						\
   RS6000_OUTPUT_BASENAME (FILE, NAME);				\
   fputs (", TOC[tc0], 0\n", FILE);				\
   in_section = no_section;					\
-  if (flag_function_sections)					\
-    named_section ((DECL), (char *) 0, 0);			\
-  else								\
-    text_section();						\
+  function_section(DECL);					\
   putc ('.', FILE);						\
   RS6000_OUTPUT_BASENAME (FILE, NAME);				\
   fputs (":\n", FILE);						\

gcc/config/rs6000/t-aix43

@@ -14,24 +14,23 @@ fp-bit.c: $(srcdir)/config/fp-bit.c
 	echo '#define FLOAT' > fp-bit.c
 	cat $(srcdir)/config/fp-bit.c >> fp-bit.c
 
-# Build the libraries for both hard and soft floating point and all of the 
+# Build the libraries for pthread and all of the 
 # different processor models
 
-MULTILIB_OPTIONS	= msoft-float \
+MULTILIB_OPTIONS	= pthread \
 			  mcpu=common/mcpu=power/mcpu=powerpc/maix64
 
-MULTILIB_DIRNAMES	= soft-float \
+MULTILIB_DIRNAMES	= pthread \
 			  common power powerpc ppc64
 
-MULTILIB_MATCHES	= msoft-float=mcpu?403 \
-			  mcpu?power=mpower \
+MULTILIB_MATCHES	= mcpu?power=mpower \
 			  mcpu?power=mrios1 \
 			  mcpu?power=mcpu?rios1 \
 			  mcpu?power=mcpu?rsc \
 			  mcpu?power=mcpu?rsc1 \
 			  mcpu?power=mpower2 \
 			  mcpu?power=mrios2 \
-			  mcpu?power=mcpu=rios2 \
+			  mcpu?power=mcpu?rios2 \
 			  mcpu?powerpc=mcpu?rs64a \
 			  mcpu?powerpc=mcpu?601 \
 			  mcpu?powerpc=mcpu?602 \

gcc/configure.in

@@ -298,7 +298,7 @@ case x${enable_threads_flag} in
 		target_thread_file=''
 		;;
 	xdecosf1 | xirix | xmach | xos2 | xposix | xpthreads | xsingle | \
-	xsolaris | xwin32 | xdce | xvxworks)
+	xsolaris | xwin32 | xdce | xvxworks | xaix)
 		target_thread_file=$enable_threads_flag
 		;;
 	*)
@@ -3343,6 +3343,7 @@ changequote([,])dnl
 		xmake_file=rs6000/x-aix41
 		float_format=none
 		use_collect2=yes
+		thread_file='aix'
 		;;
 changequote(,)dnl
 	rs6000-ibm-aix[56789].* | powerpc-ibm-aix[56789].*)
@@ -3352,6 +3353,7 @@ changequote([,])dnl
 		xmake_file=rs6000/x-aix41
 		float_format=none
 		use_collect2=yes
+		thread_file='aix'
 		;;
 	rs6000-ibm-aix*)
 		float_format=none

gcc/gthr-aix.h

+/* Threads compatibility routines for libgcc2 and libobjc.  */
+/* Compile this one with gcc.  */
+/* Copyright (C) 2000 Free Software Foundation, Inc.
+
+This file is part of GNU CC.
+
+GNU CC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU CC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU CC; see the file COPYING.  If not, write to
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+/* As a special exception, if you link this library with other files,
+   some of which are compiled with GCC, to produce an executable,
+   this library does not by itself cause the resulting executable
+   to be covered by the GNU General Public License.
+   This exception does not however invalidate any other reasons why
+   the executable file might be covered by the GNU General Public License.  */
+
+#ifndef __gthr_aix_h
+#define __gthr_aix_h
+
+#ifdef _THREAD_SAFE
+#include "gthr-posix.h"
+#else
+#include "gthr-single.h"
+#endif
+
+#endif /* __gthr_aix_h */