Sparc merge from Jakub.

1999-04-14  Jakub Jelinek  <jj@ultra.linux.cz>

	* scripts/config.sub: Allow sparcv[6789]-* and sparcv8plus{,a}-*
	architectures.
	* sysdeps/sparc/sparc32/sparcv8/Makefile: Use sysdep-CFLAGS
	instead of CFLAGS.
	* sysdeps/sparc/sparc32/sparcv8/Makefile: Use sysdep-CFLAGS
	instead of CFLAGS. For gnulib and string directories use
	-Wa,-Av9a gcc ASFLAGS.
	* sysdeps/sparc/sparc32/sparcv9/memmove.c: New file.
	* sysdeps/unix/sysv/linux/sparc/sparc32/dl-procinfo.h: New file.
	* sysdeps/unix/sysv/linux/sparc/sparc64/dl-procinfo.h: New file.
	* shlib-versions: Handle sparcv[6789]-* and sparcv8plus{,a}-*
	the same way as sparc-*.

8 files changed, 147 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 893faa1b69..195835d835 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+1999-04-14  Jakub Jelinek  <jj@ultra.linux.cz>
+
+	* scripts/config.sub: Allow sparcv[6789]-* and sparcv8plus{,a}-*
+	architectures.
+	* sysdeps/sparc/sparc32/sparcv8/Makefile: Use sysdep-CFLAGS
+	instead of CFLAGS.
+	* sysdeps/sparc/sparc32/sparcv8/Makefile: Use sysdep-CFLAGS
+	instead of CFLAGS. For gnulib and string directories use
+	-Wa,-Av9a gcc ASFLAGS.
+	* sysdeps/sparc/sparc32/sparcv9/memmove.c: New file.
+	* sysdeps/unix/sysv/linux/sparc/sparc32/dl-procinfo.h: New file.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/dl-procinfo.h: New file.
+	* shlib-versions: Handle sparcv[6789]-* and sparcv8plus{,a}-*
+	the same way as sparc-*.
+
 1999-04-14  Ulrich Drepper  <drepper@cygnus.com>
 
 	* locale/programs/locfile.c (locfile_read): Fix typo.
diff --git a/scripts/config.sub b/scripts/config.sub
index 8e0adacb9b..6a05483666 100755
--- a/scripts/config.sub
+++ b/scripts/config.sub
@@ -157,7 +157,8 @@ case $basic_machine in
 		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
 		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
 		| mipstx39 | mipstx39el | armv[34][lb] \
-		| sparc | sparclet | sparclite | sparc64 | v850)
+		| sparc | sparclet | sparclite | sparc64 \
+		| sparcv[6789] | sparcv8plus | sparcv8plusa | v850)
 		basic_machine=$basic_machine-unknown
 		;;
 	# We use `pc' rather than `unknown'
@@ -184,7 +185,8 @@ case $basic_machine in
 	      | sparc64-* | mips64-* | mipsel-* | armv[34][lb]-* \
 	      | mips64el-* | mips64orion-* | mips64orionel-*  \
 	      | mipstx39-* | mipstx39el-* \
-	      | f301-* | armv*-*)
+	      | f301-* | armv*-* | sparcv[6789]-* | sparcv8plus \
+	      | sparcv8plusa)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
diff --git a/shlib-versions b/shlib-versions
index 6530d396b3..ad77c4fa2b 100644
--- a/shlib-versions
+++ b/shlib-versions
@@ -11,8 +11,7 @@
 # The interface to -lm depends mostly only on cpu, not on operating system.
 i.86-.*-.*		libm=6
 m68k-.*-.*		libm=6
-sparc-.*-.*		libm=6
-sparc64-.*-.*		libm=6
+sparc.*-.*-.*		libm=6
 alpha.*-.*-linux.*	libm=6.1
 alpha.*-.*-.*		libm=6
 powerpc-.*-.*		libm=6
@@ -34,8 +33,8 @@ alpha.*-.*-linux.*	libc=6.1
 
 # The dynamic loader also requires different names.
 i.86-.*-linux.*		ld=ld-linux.so.2
-sparc-.*-linux.*	ld=ld-linux.so.2
 sparc64-.*-linux.*	ld=ld-linux64.so.2
+sparc.*-.*-linux.*	ld=ld-linux.so.2
 alpha.*-.*-linux.*	ld=ld-linux.so.2
 arm.*-.*-linux.*	ld=ld-linux.so.2
 # We use the ELF ABI standard name for the default.
diff --git a/sysdeps/sparc/sparc32/sparcv8/Makefile b/sysdeps/sparc/sparc32/sparcv8/Makefile
index 02139eceb0..ed2fe8c597 100644
--- a/sysdeps/sparc/sparc32/sparcv8/Makefile
+++ b/sysdeps/sparc/sparc32/sparcv8/Makefile
@@ -1 +1 @@
-CFLAGS += -mv8
+sysdep-CFLAGS += -mv8
diff --git a/sysdeps/sparc/sparc32/sparcv9/Makefile b/sysdeps/sparc/sparc32/sparcv9/Makefile
index 00675fd671..1d1a6c13c0 100644
--- a/sysdeps/sparc/sparc32/sparcv9/Makefile
+++ b/sysdeps/sparc/sparc32/sparcv9/Makefile
@@ -1 +1,10 @@
-CFLAGS += -mv8 -mtune=ultrasparc
+sysdep-CFLAGS += -mv8 -mtune=ultrasparc
+
+ifeq ($(subst gnulib,string,$(subdir)),string)
+ASFLAGS-.o += -Wa,-Av9a
+ASFLAGS-.os += -Wa,-Av9a
+ASFLAGS-.op += -Wa,-Av9a
+ASFLAGS-.og += -Wa,-Av9a
+ASFLAGS-.ob += -Wa,-Av9a
+ASFLAGS-.oS += -Wa,-Av9a
+endif
diff --git a/sysdeps/sparc/sparc32/sparcv9/memmove.c b/sysdeps/sparc/sparc32/sparcv9/memmove.c
new file mode 100644
index 0000000000..9dcf627aee
--- /dev/null
+++ b/sysdeps/sparc/sparc32/sparcv9/memmove.c
@@ -0,0 +1 @@
+#include <sysdeps/generic/memmove.c>
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/dl-procinfo.h b/sysdeps/unix/sysv/linux/sparc/sparc32/dl-procinfo.h
new file mode 100644
index 0000000000..8d6ba28067
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/dl-procinfo.h
@@ -0,0 +1,57 @@
+/* Linux/sparc32 version of processor capability information handling macros.
+   Copyright (C) 1999 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Jakub Jelinek <jj@ultra.linux.cz>, 1999.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifndef _DL_PROCINFO_H
+#define _DL_PROCINFO_H	1
+
+/* If anything should be added here check whether the size of each string
+   is still ok with the given array size.  */
+static const char sparc32_cap_flags[][7] =
+  {
+    "flush", "stbar", "swap", "muldiv", "v9"
+  };
+
+static inline int
+__attribute__ ((unused))
+_dl_procinfo (int word)
+{
+  int i;
+
+  _dl_sysdep_message ("AT_HWCAP:   ", NULL);
+
+  for (i = 0; i < 5; ++i)
+    if (word & (1 << i))
+      _dl_sysdep_message (" ", sparc32_cap_flags[i], NULL);
+
+  _dl_sysdep_message ("\n", NULL);
+
+  return 0;
+}
+
+static inline const char *
+__attribute__ ((unused))
+_dl_hwcap_string (int idx)
+{
+  return sparc32_cap_flags[idx];
+};
+
+#define HWCAP_IMPORTANT (HWCAP_SPARC_V9)
+
+#endif /* dl-procinfo.h */
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/dl-procinfo.h b/sysdeps/unix/sysv/linux/sparc/sparc64/dl-procinfo.h
new file mode 100644
index 0000000000..824d8473ea
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/dl-procinfo.h
@@ -0,0 +1,57 @@
+/* Linux/sparc64 version of processor capability information handling macros.
+   Copyright (C) 1999 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Jakub Jelinek <jj@ultra.linux.cz>, 1999.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifndef _DL_PROCINFO_H
+#define _DL_PROCINFO_H	1
+
+/* If anything should be added here check whether the size of each string
+   is still ok with the given array size.  */
+static const char sparc64_cap_flags[][7] =
+  {
+    "flush", "stbar", "swap", "muldiv", "v9"
+  };
+
+static inline int
+__attribute__ ((unused))
+_dl_procinfo (int word)
+{
+  int i;
+
+  _dl_sysdep_message ("AT_HWCAP:   ", NULL);
+
+  for (i = 0; i < 5; ++i)
+    if (word & (1 << i))
+      _dl_sysdep_message (" ", sparc64_cap_flags[i], NULL);
+
+  _dl_sysdep_message ("\n", NULL);
+
+  return 0;
+}
+
+static inline const char *
+__attribute__ ((unused))
+_dl_hwcap_string (int idx)
+{
+  return sparc64_cap_flags[idx];
+};
+
+#define HWCAP_IMPORTANT (0)
+
+#endif /* dl-procinfo.h */