Make shebang interpreter directives consistent

66 files changed, 134 insertions, 64 deletions

diff --git a/ChangeLog b/ChangeLog
index acaf7a87a0a..7dc2a942a8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,61 @@
+2016-01-07  Marko Myllynen  <myllynen@redhat.com>
+
+	* catgets/test-gencat.sh: Remove space after shebang.
+	* conform/GlibcConform.pm: Likewise.
+	* conform/check-header-lists.sh: Likewise.
+	* conform/conformtest.pl: Likewise.
+	* conform/linknamespace.pl: Likewise.
+	* conform/list-header-symbols.pl: Likewise.
+	* debug/catchsegv.sh: Likewise.
+	* elf/genrtldtbl.awk: Likewise.
+	* elf/tst-pathopt.sh: Likewise.
+	* elf/tst-rtld-load-self.sh: Likewise.
+	* grp/tst_fgetgrent.sh: Likewise.
+	* iconvdata/gen-8bit-gap-1.sh: Likewise.
+	* iconvdata/gen-8bit-gap.sh: Likewise.
+	* iconvdata/gen-8bit.sh: Likewise.
+	* iconvdata/run-iconv-test.sh: Likewise.
+	* intl/tst-gettext.sh: Likewise.
+	* intl/tst-gettext2.sh: Likewise.
+	* intl/tst-gettext4.sh: Likewise.
+	* intl/tst-gettext6.sh: Likewise.
+	* intl/tst-translit.sh: Likewise.
+	* io/ftwtest-sh: Likewise.
+	* libio/test-freopen.sh: Likewise.
+	* locale/gen-translit.pl: Likewise.
+	* malloc/tst-mtrace.sh: Likewise.
+	* manual/check-safety.sh: Likewise.
+	* manual/libc-texinfo.sh: Likewise.
+	* manual/tsort.awk: Likewise.
+	* manual/xtract-typefun.awk: Likewise.
+	* nptl/tst-cancel-wrappers.sh: Likewise.
+	* nptl/tst-tls6.sh: Likewise.
+	* posix/globtest.sh: Likewise.
+	* posix/tst-getconf.sh: Likewise.
+	* posix/wordexp-tst.sh: Likewise.
+	* scripts/check-c++-types.sh: Likewise.
+	* scripts/check-local-headers.sh: Likewise.
+	* scripts/config.guess: Likewise.
+	* scripts/config.sub: Likewise.
+	* scripts/cpp: Likewise.
+	* scripts/cross-test-ssh.sh: Likewise.
+	* scripts/documented.sh: Likewise.
+	* scripts/evaluate-test.sh: Likewise.
+	* scripts/gen-libc-abis: Likewise.
+	* scripts/gen-sorted.awk: Likewise.
+	* scripts/list-fixed-bugs.py: Likewise.
+	* scripts/merge-test-results.sh: Likewise.
+	* scripts/mkinstalldirs: Likewise.
+	* scripts/rellns-sh: Likewise.
+	* scripts/test-installation.pl: Likewise.
+	* scripts/update-copyrights: Likewise.
+	* stdio-common/tst-printf.sh: Likewise.
+	* stdio-common/tst-unbputc.sh: Likewise.
+	* stdlib/tst-fmtmsg.sh: Likewise.
+	* stdlib/tst-setcontext3.sh: Likewise.
+	* sysdeps/i386/tst-ld-sse-use.sh: Likewise.
+	* sysdeps/unix/make-syscalls.sh: Likewise.
+
 2016-01-06  John David Anglin  <dave.anglin@bell.net>
 
 	* sysdeps/hppa/nptl/pthread_spin_init.c (pthread_spin_init): Replace
diff --git a/catgets/test-gencat.sh b/catgets/test-gencat.sh
index a672f123d86..48b21207c95 100755
--- a/catgets/test-gencat.sh
+++ b/catgets/test-gencat.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Test escape character handling in gencat.
 # Copyright (C) 2000-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/conform/GlibcConform.pm b/conform/GlibcConform.pm
index 3f4dc2061fb..b83204384e3 100644
--- a/conform/GlibcConform.pm
+++ b/conform/GlibcConform.pm
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/perl
 
 # Shared code for glibc conformance tests.
 
diff --git a/conform/check-header-lists.sh b/conform/check-header-lists.sh
index f6e76c6ade4..849dfbcbceb 100755
--- a/conform/check-header-lists.sh
+++ b/conform/check-header-lists.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Check the set of headers with conformtest expectations for a given standard.
 # Copyright (C) 2014-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/conform/conformtest.pl b/conform/conformtest.pl
index cc0944a889d..fedcbc3f162 100644
--- a/conform/conformtest.pl
+++ b/conform/conformtest.pl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/perl
 
 use GlibcConform;
 use Getopt::Long;
diff --git a/conform/linknamespace.pl b/conform/linknamespace.pl
index d6a18503a76..4b7b288165e 100644
--- a/conform/linknamespace.pl
+++ b/conform/linknamespace.pl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/perl
 
 # Check that use of symbols declared in a given header does not result
 # in any symbols being brought in that are not reserved with external
diff --git a/conform/list-header-symbols.pl b/conform/list-header-symbols.pl
index 2b012c7457e..ab7ae578949 100644
--- a/conform/list-header-symbols.pl
+++ b/conform/list-header-symbols.pl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/perl
 
 # Print a list of symbols exported by some headers that would
 # otherwise be in the user's namespace.
diff --git a/debug/catchsegv.sh b/debug/catchsegv.sh
index a4ef821ea0d..3c788d21256 100755
--- a/debug/catchsegv.sh
+++ b/debug/catchsegv.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Copyright (C) 1998-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
diff --git a/elf/genrtldtbl.awk b/elf/genrtldtbl.awk
index 54cdc8c5896..0e2a3749018 100644
--- a/elf/genrtldtbl.awk
+++ b/elf/genrtldtbl.awk
@@ -1,4 +1,4 @@
-#! /usr/bin/awk
+#!/usr/bin/awk
 BEGIN {
   FS=":";
   count=0;
diff --git a/elf/tst-pathopt.sh b/elf/tst-pathopt.sh
index 892f22ef843..309b628bc9d 100755
--- a/elf/tst-pathopt.sh
+++ b/elf/tst-pathopt.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Test lookup path optimization.
 # Copyright (C) 2000-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/elf/tst-rtld-load-self.sh b/elf/tst-rtld-load-self.sh
index a5488d3f71a..aa97ee6ca96 100755
--- a/elf/tst-rtld-load-self.sh
+++ b/elf/tst-rtld-load-self.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Test how rtld loads itself.
 # Copyright (C) 2012-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/grp/tst_fgetgrent.sh b/grp/tst_fgetgrent.sh
index e7837bd667a..8dbf095ba9e 100644
--- a/grp/tst_fgetgrent.sh
+++ b/grp/tst_fgetgrent.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Copyright (C) 1999-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Andreas Jaeger <aj@arthur.rhein-neckar.de>, 1999.
diff --git a/iconvdata/gen-8bit-gap-1.sh b/iconvdata/gen-8bit-gap-1.sh
index e86ac53e89f..46567f235f1 100644
--- a/iconvdata/gen-8bit-gap-1.sh
+++ b/iconvdata/gen-8bit-gap-1.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 echo "static const uint32_t iso88597_to_ucs4[96] = {"
 sed -ne '/^[^[:space:]]*[[:space:]]*.x00/d;/^END/q' \
     -e 's/^<U\(....\)>[[:space:]]*.x\([A-Fa-f].\).*/  [0x\2 - 0xA0] = 0x\1,/p' \
diff --git a/iconvdata/gen-8bit-gap.sh b/iconvdata/gen-8bit-gap.sh
index e1dabaebdbf..bcd6d12ce1a 100644
--- a/iconvdata/gen-8bit-gap.sh
+++ b/iconvdata/gen-8bit-gap.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 echo "static const uint32_t to_ucs4[256] = {"
 sed -ne '/^[^[:space:]]*[[:space:]]*.x00/d;/^END/q' \
     -e 's/^<U\(....\)>[[:space:]]*.x\(..\).*/  [0x\2] = 0x\1,/p' \
diff --git a/iconvdata/gen-8bit.sh b/iconvdata/gen-8bit.sh
index d1a21bc03dc..94de6fdd093 100644
--- a/iconvdata/gen-8bit.sh
+++ b/iconvdata/gen-8bit.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 echo "static const uint32_t to_ucs4[256] = {"
 sed -ne '/^[^[:space:]]*[[:space:]]*.x00/d;/^END/q' \
     -e 's/^<U\(....\)>[[:space:]]*.x\(..\).*/  [0x\2] = 0x\1,/p' \
diff --git a/iconvdata/run-iconv-test.sh b/iconvdata/run-iconv-test.sh
index c18072668e4..2e7105a2d92 100755
--- a/iconvdata/run-iconv-test.sh
+++ b/iconvdata/run-iconv-test.sh
@@ -1,4 +1,4 @@
-#! /bin/sh -f
+#!/bin/sh -f
 # Run available iconv(1) tests.
 # Copyright (C) 1998-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/intl/tst-gettext.sh b/intl/tst-gettext.sh
index 3c83645652a..fe8bd2896f3 100755
--- a/intl/tst-gettext.sh
+++ b/intl/tst-gettext.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Test of gettext functions.
 # Copyright (C) 2000-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/intl/tst-gettext2.sh b/intl/tst-gettext2.sh
index 6d791752a67..ae02455f078 100644
--- a/intl/tst-gettext2.sh
+++ b/intl/tst-gettext2.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Test of gettext functions.
 # Copyright (C) 2000-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/intl/tst-gettext4.sh b/intl/tst-gettext4.sh
index fac7d8889e0..f692b431e35 100755
--- a/intl/tst-gettext4.sh
+++ b/intl/tst-gettext4.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Test that gettext() in multithreaded applications works correctly if
 # different threads operate in different locales with the same encoding.
 # Copyright (C) 2001-2016 Free Software Foundation, Inc.
diff --git a/intl/tst-gettext6.sh b/intl/tst-gettext6.sh
index 9d2d7f4ab3b..88bf50d6a28 100644
--- a/intl/tst-gettext6.sh
+++ b/intl/tst-gettext6.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Test that gettext() in multithreaded applications works correctly.
 # Copyright (C) 2008-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/intl/tst-translit.sh b/intl/tst-translit.sh
index b1c5a3ff6b4..a29a0e86f8a 100755
--- a/intl/tst-translit.sh
+++ b/intl/tst-translit.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Test of transliteration in gettext functions.
 # Copyright (C) 2000-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/io/ftwtest-sh b/io/ftwtest-sh
index 8a440e8de40..db8435ab5ab 100644
--- a/io/ftwtest-sh
+++ b/io/ftwtest-sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Test for nftw(3).
 # Copyright (C) 1997-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/libio/test-freopen.sh b/libio/test-freopen.sh
index 318bac937c1..5db163fb4b4 100755
--- a/libio/test-freopen.sh
+++ b/libio/test-freopen.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Test of freopen.
 # Copyright (C) 2000-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/locale/gen-translit.pl b/locale/gen-translit.pl
index 5f30e30851b..30d3f2f1959 100644
--- a/locale/gen-translit.pl
+++ b/locale/gen-translit.pl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl -w
+#!/usr/bin/perl -w
 open F, "cat C-translit.h.in | gcc -E - |" || die "Cannot preprocess input file";
 
 
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index c14bb2c661e..7baecb48906 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,15 @@
+2016-01-07  Marko Myllynen  <myllynen@redhat.com>
+
+	* gen-locale.sh: Remove space after shebang.
+	* sort-test.sh: Likewise.
+	* tst-ctype.sh: Likewise.
+	* tst-fmon.sh: Likewise.
+	* tst-langinfo.sh: Likewise.
+	* tst-locale.sh: Likewise.
+	* tst-numeric.sh: Likewise.
+	* tst-rpmatch.sh: Likewise.
+	* tst-trans.sh: Likewise.
+
 2016-01-04  Joseph Myers  <joseph@codesourcery.com>
 
 	* All files with FSF copyright notices: Update copyright dates
diff --git a/localedata/gen-locale.sh b/localedata/gen-locale.sh
index ce1b9c8aaa6..d471086d0d1 100644
--- a/localedata/gen-locale.sh
+++ b/localedata/gen-locale.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Generate test locale files.
 # Copyright (C) 2000-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/localedata/sort-test.sh b/localedata/sort-test.sh
index 42d9e7c5024..7b6927236c0 100644
--- a/localedata/sort-test.sh
+++ b/localedata/sort-test.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Test collation using xfrm-test.
 # Copyright (C) 1997-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/localedata/tst-ctype.sh b/localedata/tst-ctype.sh
index d5439bfdbb2..eb7bdc85e95 100755
--- a/localedata/tst-ctype.sh
+++ b/localedata/tst-ctype.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Testing the implementation of the isxxx() and toxxx() functions.
 # Copyright (C) 2000-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/localedata/tst-fmon.sh b/localedata/tst-fmon.sh
index c244c87cec8..bec4322da0f 100755
--- a/localedata/tst-fmon.sh
+++ b/localedata/tst-fmon.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Testing the implementation of strfmon(3).
 # Copyright (C) 1996-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/localedata/tst-langinfo.sh b/localedata/tst-langinfo.sh
index c6437634295..835d7c00305 100755
--- a/localedata/tst-langinfo.sh
+++ b/localedata/tst-langinfo.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Test nl_langinfo.
 # Copyright (C) 2000-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/localedata/tst-locale.sh b/localedata/tst-locale.sh
index fd1edf7af0e..202936d4c72 100755
--- a/localedata/tst-locale.sh
+++ b/localedata/tst-locale.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Testing the implementation of localedata.
 # Copyright (C) 1998-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/localedata/tst-numeric.sh b/localedata/tst-numeric.sh
index f1e68c28840..77c2215104d 100644
--- a/localedata/tst-numeric.sh
+++ b/localedata/tst-numeric.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Testing the implementation of LC_NUMERIC and snprintf(3).
 # Copyright (C) 1996-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/localedata/tst-rpmatch.sh b/localedata/tst-rpmatch.sh
index 1d0d69aadf5..45ffabad60b 100755
--- a/localedata/tst-rpmatch.sh
+++ b/localedata/tst-rpmatch.sh
@@ -1,4 +1,4 @@
-#! /bin/sh -f
+#!/bin/sh -f
 #
 # Copyright (C) 1998-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library and contains tests for
diff --git a/localedata/tst-trans.sh b/localedata/tst-trans.sh
index be03ef625f4..ea8bb51c61a 100755
--- a/localedata/tst-trans.sh
+++ b/localedata/tst-trans.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Test character mapping definitions.
 # Copyright (C) 1999-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/malloc/tst-mtrace.sh b/malloc/tst-mtrace.sh
index 06fb5dcf4ce..cbcaea81223 100755
--- a/malloc/tst-mtrace.sh
+++ b/malloc/tst-mtrace.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Testing the mtrace function.
 # Copyright (C) 2000-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/manual/check-safety.sh b/manual/check-safety.sh
index 8867ed9d9b5..2eba0009e83 100644
--- a/manual/check-safety.sh
+++ b/manual/check-safety.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 
 # Copyright 2014-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/manual/libc-texinfo.sh b/manual/libc-texinfo.sh
index 1ef09fcbb41..4d0a52213bd 100644
--- a/manual/libc-texinfo.sh
+++ b/manual/libc-texinfo.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 
 OUTDIR=$1
 shift
diff --git a/manual/tsort.awk b/manual/tsort.awk
index 0260dccda6c..82ac3decb7a 100644
--- a/manual/tsort.awk
+++ b/manual/tsort.awk
@@ -1,4 +1,4 @@
-#! /usr/bin/awk -f
+#!/usr/bin/awk -f
 # Generate topologically sorted list of manual chapters.
 # Copyright (C) 1998-2016 Free Software Foundation, Inc.
 # Written by Ulrich Drepper <drepper@cygnus.com>, 1998.
diff --git a/manual/xtract-typefun.awk b/manual/xtract-typefun.awk
index d39ceef188c..57e567f9ba1 100644
--- a/manual/xtract-typefun.awk
+++ b/manual/xtract-typefun.awk
@@ -1,4 +1,4 @@
-#! /usr/local/bin/gawk -f
+#!/usr/local/bin/gawk -f
 BEGIN {
   last_node="";
 }
diff --git a/nptl/tst-cancel-wrappers.sh b/nptl/tst-cancel-wrappers.sh
index 4df9074a133..9098e3238f5 100644
--- a/nptl/tst-cancel-wrappers.sh
+++ b/nptl/tst-cancel-wrappers.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Test whether all cancelable functions are cancelable.
 # Copyright (C) 2002-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/nptl/tst-tls6.sh b/nptl/tst-tls6.sh
index 85c9ce7b3c4..f828008303e 100755
--- a/nptl/tst-tls6.sh
+++ b/nptl/tst-tls6.sh
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/bash
 # A tls test.
 # Copyright (C) 2003-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/posix/globtest.sh b/posix/globtest.sh
index a50a6b9a170..73fe11bd76d 100755
--- a/posix/globtest.sh
+++ b/posix/globtest.sh
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/bash
 # Test for glob(3).
 # Copyright (C) 1997-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/posix/tst-getconf.sh b/posix/tst-getconf.sh
index 3881a9c8afd..95d11f59ec1 100644
--- a/posix/tst-getconf.sh
+++ b/posix/tst-getconf.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Test for getconf(1).
 # Copyright (C) 2001-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/posix/wordexp-tst.sh b/posix/wordexp-tst.sh
index 8d68e0faae7..c52825b4704 100755
--- a/posix/wordexp-tst.sh
+++ b/posix/wordexp-tst.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Test for wordexp(3).
 # Copyright (C) 1998-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/scripts/check-c++-types.sh b/scripts/check-c++-types.sh
index 2016c162f56..489c4f066f5 100755
--- a/scripts/check-c++-types.sh
+++ b/scripts/check-c++-types.sh
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/bash
 # Copyright (C) 2003-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
diff --git a/scripts/check-local-headers.sh b/scripts/check-local-headers.sh
index 3ca59351330..0670da16bc3 100755
--- a/scripts/check-local-headers.sh
+++ b/scripts/check-local-headers.sh
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/bash
 # Copyright (C) 2005-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
diff --git a/scripts/config.guess b/scripts/config.guess
index dcd5149681d..8b42ae71616 100755
--- a/scripts/config.guess
+++ b/scripts/config.guess
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2016 Free Software Foundation, Inc.
 
diff --git a/scripts/config.sub b/scripts/config.sub
index da6d1b6826a..738ff5cbb8d 100755
--- a/scripts/config.sub
+++ b/scripts/config.sub
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Configuration validation subroutine script.
 #   Copyright 1992-2016 Free Software Foundation, Inc.
 
diff --git a/scripts/cpp b/scripts/cpp
index 65f273ee48a..cb24fe2bbab 100755
--- a/scripts/cpp
+++ b/scripts/cpp
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 
 # This script is used solely by rpcgen when run by sunrpc/Makefile,
 # which passes CPP in the environment to tell us what to run.
diff --git a/scripts/cross-test-ssh.sh b/scripts/cross-test-ssh.sh
index cc1d1e98248..73c4e3ea0fc 100755
--- a/scripts/cross-test-ssh.sh
+++ b/scripts/cross-test-ssh.sh
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/bash
 # Run a testcase on a remote system, via ssh.
 # Copyright (C) 2012-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/scripts/documented.sh b/scripts/documented.sh
index a0399872b71..047a1d34935 100644
--- a/scripts/documented.sh
+++ b/scripts/documented.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 bindir=$1
 
 VERSION=1.0
diff --git a/scripts/evaluate-test.sh b/scripts/evaluate-test.sh
index d5ba59dd3d6..f2c85ed1924 100755
--- a/scripts/evaluate-test.sh
+++ b/scripts/evaluate-test.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Output a test status line.
 # Copyright (C) 2012-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/scripts/gen-libc-abis b/scripts/gen-libc-abis
index ce9ac5e20d2..c5537645dc0 100644
--- a/scripts/gen-libc-abis
+++ b/scripts/gen-libc-abis
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 triple="$1"
 
 printf "#ifndef _LIBC_ABIS_H\n#define _LIBC_ABIS_H 1\n\n"
diff --git a/scripts/gen-sorted.awk b/scripts/gen-sorted.awk
index b36649758b0..9669277b31f 100755
--- a/scripts/gen-sorted.awk
+++ b/scripts/gen-sorted.awk
@@ -1,4 +1,4 @@
-#! /usr/bin/awk -f
+#!/usr/bin/awk -f
 # Generate sorted list of directories.  The sorting is stable but with
 # dependencies between directories resolved by moving dependees in front.
 # Copyright (C) 1998-2016 Free Software Foundation, Inc.
diff --git a/scripts/list-fixed-bugs.py b/scripts/list-fixed-bugs.py
index dad0fc353e9..51f3c36e693 100755
--- a/scripts/list-fixed-bugs.py
+++ b/scripts/list-fixed-bugs.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python3
+#!/usr/bin/python3
 # Copyright (C) 2015-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 #
diff --git a/scripts/merge-test-results.sh b/scripts/merge-test-results.sh
index 6287d103685..1175b207173 100755
--- a/scripts/merge-test-results.sh
+++ b/scripts/merge-test-results.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Merge test results of individual tests or subdirectories.
 # Copyright (C) 2014-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/scripts/mkinstalldirs b/scripts/mkinstalldirs
index 55d537f872c..a17570aca95 100755
--- a/scripts/mkinstalldirs
+++ b/scripts/mkinstalldirs
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # mkinstalldirs --- make directory hierarchy
 
 scriptversion=2009-04-28.21; # UTC
diff --git a/scripts/rellns-sh b/scripts/rellns-sh
index e1566436bb8..a57f601a900 100755
--- a/scripts/rellns-sh
+++ b/scripts/rellns-sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # rellns-sh - Simplified ln program to generate relative symbolic link.
 # Copyright (C) 1996-2016 Free Software Foundation, Inc.
 # Written by Ulrich Drepper <drepper@cygnus.com>, October 1996
diff --git a/scripts/test-installation.pl b/scripts/test-installation.pl
index fcbb7a94aae..5e84dd71845 100755
--- a/scripts/test-installation.pl
+++ b/scripts/test-installation.pl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl -w
+#!/usr/bin/perl -w
 # Copyright (C) 1997-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Andreas Jaeger <aj@arthur.rhein-neckar.de>, 1997.
diff --git a/scripts/update-copyrights b/scripts/update-copyrights
index 066c510224a..588041ce86a 100755
--- a/scripts/update-copyrights
+++ b/scripts/update-copyrights
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Update copyright year lists.
 # Copyright (C) 2012-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/stdio-common/tst-printf.sh b/stdio-common/tst-printf.sh
index 6e8f8508db3..5755a1bc0ad 100644
--- a/stdio-common/tst-printf.sh
+++ b/stdio-common/tst-printf.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Testing of printf.
 # Copyright (C) 2000-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/stdio-common/tst-unbputc.sh b/stdio-common/tst-unbputc.sh
index 1305ee2a8e8..81564007307 100755
--- a/stdio-common/tst-unbputc.sh
+++ b/stdio-common/tst-unbputc.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Testing the stdio implementation
 # Copyright (C) 2000-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/stdlib/tst-fmtmsg.sh b/stdlib/tst-fmtmsg.sh
index 884f1792fc5..90654654a9e 100755
--- a/stdlib/tst-fmtmsg.sh
+++ b/stdlib/tst-fmtmsg.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Test of fmtmsg function family.
 # Copyright (C) 2000-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/stdlib/tst-setcontext3.sh b/stdlib/tst-setcontext3.sh
index e3c6b627f8f..4b2adb5f23e 100644
--- a/stdlib/tst-setcontext3.sh
+++ b/stdlib/tst-setcontext3.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Bug 18125: Test the exit functionality of setcontext().
 # Copyright (C) 2015-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/sysdeps/i386/tst-ld-sse-use.sh b/sysdeps/i386/tst-ld-sse-use.sh
index 74846feb31a..2863de6f8b5 100755
--- a/sysdeps/i386/tst-ld-sse-use.sh
+++ b/sysdeps/i386/tst-ld-sse-use.sh
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/bash
 # Make sure no code in ld.so uses xmm/ymm/zmm registers on i386.
 # Copyright (C) 2009-2016 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/sysdeps/unix/make-syscalls.sh b/sysdeps/unix/make-syscalls.sh
index bbef3eb360b..58d165e0156 100644
--- a/sysdeps/unix/make-syscalls.sh
+++ b/sysdeps/unix/make-syscalls.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 
 # Usage: make-syscalls.sh ../sysdeps/unix/common
 # Expects $sysdirs in environment.