From 821dcbccd172d8f35644cd6da81337cc739dde94 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 16 Nov 2000 01:59:23 +0000
Subject: [PATCH] Update.

	* iconvdata/gconv-modules: Add CP950 alias.

2000-11-13  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/unix/sysv/linux/Makefile: Allow ports to override
	syscall-list.h goal.
	* sysdeps/unix/sysv/linux/sparc/Makefile: New file.

2000-11-15  Ulrich Drepper  <drepper@redhat.com>
---
 ChangeLog                              | 11 ++++++++-
 iconvdata/gconv-modules                |  1 +
 sysdeps/unix/sysv/linux/Makefile       |  2 ++
 sysdeps/unix/sysv/linux/sparc/Makefile | 44 ++++++++++++++++++++++++++++++++++
 4 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 sysdeps/unix/sysv/linux/sparc/Makefile

diff --git a/ChangeLog b/ChangeLog
index 93d2ed1..da9aac7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2000-11-15  Ulrich Drepper  <drepper@redhat.com>
 
+	* iconvdata/gconv-modules: Add CP950 alias.
+
+2000-11-13  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/sysv/linux/Makefile: Allow ports to override
+	syscall-list.h goal.
+	* sysdeps/unix/sysv/linux/sparc/Makefile: New file.
+
+2000-11-15  Ulrich Drepper  <drepper@redhat.com>
+
 	* intl/Makefile: tst-gettext2.sh does not need a third parameter.
 
 	* intl/tst-gettext2.sh: Copy locale data.  Adjust LOCPATH.  Verify
@@ -73,7 +83,6 @@
 	(_DL_HWCAP_PLATFORM): New.
 	(_dl_platform_string): New.
 
-
 2000-11-14  Ulrich Drepper  <drepper@redhat.com>
 
 	* iconvdata/gconv-modules: Add CP936 as alias for GBK.
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index 0ccc75e..0aa334c 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -934,6 +934,7 @@ alias	BIG-FIVE//		BIG5//
 alias	BIGFIVE//		BIG5//
 alias	BIG-5//			BIG5//
 alias	CN-BIG5//		BIG5//
+alias	CP950//			BIG5//
 module	BIG5//			INTERNAL		BIG5		1
 module	INTERNAL		BIG5//			BIG5		1
 
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 08070ee..c4d81f6 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -25,6 +25,7 @@ sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
 
 install-others += $(inst_includedir)/bits/syscall.h
 
+ifndef no_syscall_list_h
 # Generate the list of SYS_* macros for the system calls (__NR_* macros).
 $(objpfx)syscall-%.h $(objpfx)syscall-%.d: ../sysdeps/unix/sysv/linux/sys/syscall.h
 	rm -f $(@:.h=.d)-t
@@ -45,6 +46,7 @@ $(objpfx)syscall-%.h $(objpfx)syscall-%.d: ../sysdeps/unix/sysv/linux/sys/syscal
 					      $(@:.d=.h) $(@:.h=.d)),'
 	rm -f $(@:.h=.d)-t
 	mv -f $(@:.h=.d)-t2 $(@:.h=.d)
+endif
 
 $(inst_includedir)/bits/syscall.h: $(objpfx)syscall-list.h $(+force)
 	$(make-target-directory)
diff --git a/sysdeps/unix/sysv/linux/sparc/Makefile b/sysdeps/unix/sysv/linux/sparc/Makefile
new file mode 100644
index 0000000..9b46a7e
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sparc/Makefile
@@ -0,0 +1,44 @@
+ifeq ($(subdir),misc)
+
+no_syscall_list_h = 1
+
+# Generate the list of SYS_* macros for the system calls (__NR_* macros).
+$(objpfx)syscall-%.h $(objpfx)syscall-%.d: ../sysdeps/unix/sysv/linux/sys/syscall.h
+	rm -f $(@:.h=.d)-t
+	{ \
+	 echo '/* Generated at libc build time from kernel syscall list.  */';\
+	 echo ''; \
+	 echo '#ifndef _SYSCALL_H'; \
+	 echo '# error "Never use <bits/syscall.h> directly; include <sys/syscall.h> instead."'; \
+	 echo '#endif'; \
+	 echo ''; \
+	 SUNPRO_DEPENDENCIES='$(@:.h=.d)-t $@' \
+	 $(CC) -E -x c $(sysincludes) $< -U__sparc_v9__ -U__arch64__ -D_LIBC -dM | \
+	 sed -n 's@^#define __NR_\([^ ]*\) .*$$@#define SYS_\1 __NR_\1@p' | \
+	 LC_ALL=C sort > $(@:.d=.h).new32; \
+	 SUNPRO_DEPENDENCIES='$(@:.h=.d)-t $@' \
+	 $(CC) -E -x c $(sysincludes) $< -D__sparc_v9__ -D__arch64__ -D_LIBC -dM | \
+	 sed -n 's@^#define __NR_\([^ ]*\) .*$$@#define SYS_\1 __NR_\1@p' | \
+	 LC_ALL=C sort > $(@:.d=.h).new64; \
+	 if cmp -s $(@:.d=.h).new32 $(@:.d=.h).new64; then \
+	   cat $(@:.d=.h).new32; \
+	 else \
+	   echo '#include <bits/wordsize.h>'; \
+	   echo ''; \
+	   comm -12 $(@:.d=.h).new32 $(@:.d=.h).new64; \
+	   echo '#if __WORDSIZE == 64'; \
+	   comm -13 $(@:.d=.h).new32 $(@:.d=.h).new64; \
+	   echo '#else'; \
+	   comm -23 $(@:.d=.h).new32 $(@:.d=.h).new64; \
+	   echo '#endif'; \
+	 fi; \
+	 rm -f $(@:.d=.h).new32 $(@:.d=.h).new64; \
+	} > $(@:.d=.h).new
+	mv -f $(@:.d=.h).new $(@:.d=.h)
+	sed < $(@:.h=.d)-t > $(@:.h=.d)-t2 \
+	    -e 's,$(subst .,\.,$@),$(patsubst $(objpfx)%,$$(objpfx)%,\
+					      $(@:.d=.h) $(@:.h=.d)),'
+	rm -f $(@:.h=.d)-t
+	mv -f $(@:.h=.d)-t2 $(@:.h=.d)
+
+endif
-- 
2.7.4