From 1bced8cadc82077f0201801239e89eb24b68e9aa Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 23 Aug 2019 14:14:29 -0700
Subject: [PATCH] Don't put non-ASCII into installed headers

Move non-ASCII contributor names from installed headers
into contrib.texi when possible, and when it's not (the
copyright notice in sysdeps/unix/sysv/linux/mips/sys/user.h)
go back to ASCIIfied names.  Problem reported by Joseph Myers in:
https://www.sourceware.org/ml/libc-alpha/2019-08/msg00646.html
---
 manual/contrib.texi                     | 9 +++++++++
 sysdeps/mips/fpu_control.h              | 1 -
 sysdeps/mips/regdef.h                   | 1 -
 sysdeps/mips/sgidefs.h                  | 1 -
 sysdeps/mips/sys/asm.h                  | 1 -
 sysdeps/mips/sys/regdef.h               | 1 -
 sysdeps/unix/sysv/linux/mips/sys/user.h | 4 ++--
 7 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/manual/contrib.texi b/manual/contrib.texi
index 47fdd59ffe..b04724b7b5 100644
--- a/manual/contrib.texi
+++ b/manual/contrib.texi
@@ -29,6 +29,11 @@ as FSF Project Steward for @theglibc{}.
 Miles Bader for writing the @code{argp} argument-parsing package, and the
 @code{argz}/@code{envz} interfaces.
 
+@item
+Ralf B@"achle for contributing @file{fpu_control.h},
+@file{regdef.h}, @file{sgidefs.h}, @file{sys/asm.h}, and @file{sys/regdef.h}
+under the @file{sysdeps/mips} directory.
+
 @item
 Jeff Bailey for his maintainership of the HPPA architecture.
 
@@ -131,6 +136,10 @@ Tulio Magno Quites Machado Filho for adding a new class of installed
 headers for low-level platform-specific functionality and one such for
 PowerPC and various fixes.
 
+@item
+Olaf Flebbe and Ralf B@"achle for contributing
+@file{sysdeps/mips/fpu_control.h}.
+
 @item
 Mike Frysinger for his maintaining of the IA64 architecture and for
 testing and bug fixing.
diff --git a/sysdeps/mips/fpu_control.h b/sysdeps/mips/fpu_control.h
index 6a68f92830..f8c834a0a7 100644
--- a/sysdeps/mips/fpu_control.h
+++ b/sysdeps/mips/fpu_control.h
@@ -1,7 +1,6 @@
 /* FPU control word bits.  Mips version.
    Copyright (C) 1996-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Olaf Flebbe and Ralf BÃ¤chle.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
diff --git a/sysdeps/mips/regdef.h b/sysdeps/mips/regdef.h
index 6d55f8a18d..62652864fc 100644
--- a/sysdeps/mips/regdef.h
+++ b/sysdeps/mips/regdef.h
@@ -1,6 +1,5 @@
 /* Copyright (C) 1994-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Ralf BÃ¤chle <ralf@gnu.org>.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
diff --git a/sysdeps/mips/sgidefs.h b/sysdeps/mips/sgidefs.h
index 656a7f07f7..ad45dceb19 100644
--- a/sysdeps/mips/sgidefs.h
+++ b/sysdeps/mips/sgidefs.h
@@ -1,6 +1,5 @@
 /* Copyright (C) 1996-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Ralf BÃ¤chle <ralf@gnu.org>.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
diff --git a/sysdeps/mips/sys/asm.h b/sysdeps/mips/sys/asm.h
index 8161495595..3a04974a76 100644
--- a/sysdeps/mips/sys/asm.h
+++ b/sysdeps/mips/sys/asm.h
@@ -1,6 +1,5 @@
 /* Copyright (C) 1997-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Ralf BÃ¤chle <ralf@gnu.org>.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
diff --git a/sysdeps/mips/sys/regdef.h b/sysdeps/mips/sys/regdef.h
index 1c6be23ba3..2b53e6dbb9 100644
--- a/sysdeps/mips/sys/regdef.h
+++ b/sysdeps/mips/sys/regdef.h
@@ -1,6 +1,5 @@
 /* Copyright (C) 1997-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Ralf BÃ¤chle <ralf@gnu.org>.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
diff --git a/sysdeps/unix/sysv/linux/mips/sys/user.h b/sysdeps/unix/sysv/linux/mips/sys/user.h
index ef1077da52..29a6c36785 100644
--- a/sysdeps/unix/sysv/linux/mips/sys/user.h
+++ b/sysdeps/unix/sysv/linux/mips/sys/user.h
@@ -41,7 +41,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1995, 1999 by Ralf BÃ¤chle
+ * Copyright (C) 1995, 1999 by Ralf Baechle
  */
 #ifndef __ASM_MIPS_REG_H
 #define __ASM_MIPS_REG_H
@@ -110,7 +110,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1995, 1999 Ralf BÃ¤chle
+ * Copyright (C) 1995, 1999 Ralf Baechle
  * Copyright (C) 1995, 1999 Silicon Graphics
  */
 #ifndef _ASM_REG_H
-- 
2.17.1

