Maintenance 5.004_04 changes

p4raw-id: //depot/maint-5.004/perl@128

diff --cc Makefile.SH
index 86fd6ed,f2a4a9f..f2a4a9f
mode 100644,100755..100644
--- 1/Makefile.SH
--- 2/Makefile.SH
+++ b/Makefile.SH

diff --cc Porting/makerel
index bc472ee,f719a5e..f719a5e
mode 100644,100755..100644
--- 1/Porting/makerel
--- 2/Porting/makerel
+++ b/Porting/makerel

diff --cc Porting/patchls
index f4de529,1d4bd5a..1d4bd5a
mode 100644,100755..100644
--- 1/Porting/patchls
--- 2/Porting/patchls
+++ b/Porting/patchls

diff --cc lib/diagnostics.pm
index 10016f3,78bf445..78bf445
mode 100644,100644..100755
--- 1/lib/diagnostics.pm
--- 2/lib/diagnostics.pm
+++ b/lib/diagnostics.pm

diff --cc t/lib/dosglob.t
index 0000000,7398a14..7398a14
mode 000000,100755..100644
--- /dev/null
--- 2/t/lib/dosglob.t
+++ b/t/lib/dosglob.t