[69cde8d] | 1 | Submitted By: Jim Gifford (patches at jg555 dot com)
|
---|
| 2 | Date: 2005-05-06
|
---|
| 3 | Initial Package Version: 2.16
|
---|
| 4 | Origin: http://ttervo.vectorstar.net/nptl/posix-patches/binutils-2.14.90.0.7-posix-head-tail.patch
|
---|
| 5 | Upstream Status: Accepted/but Suspended
|
---|
| 6 | Description: Makes Posix Compliant
|
---|
| 7 | Rediffed against 2.16 by Jeremy Huntwork
|
---|
| 8 |
|
---|
| 9 | diff -Naur binutils-2.16-ORIG/gas/Makefile.am binutils-2.16/gas/Makefile.am
|
---|
| 10 | --- binutils-2.16-ORIG/gas/Makefile.am 2005-03-22 10:31:44.000000000 -0500
|
---|
| 11 | +++ binutils-2.16/gas/Makefile.am 2005-05-06 17:08:11.859876859 -0400
|
---|
| 12 | @@ -762,13 +762,13 @@
|
---|
| 13 | against=stage2
|
---|
| 14 |
|
---|
| 15 | # This rule is derived from corresponding code in the Makefile.in for gcc.
|
---|
| 16 | -# The "tail +16c" is to bypass headers which may include timestamps or
|
---|
| 17 | +# The "tail -c +16" is to bypass headers which may include timestamps or
|
---|
| 18 | # temporary assembly file names.
|
---|
| 19 | comparison:
|
---|
| 20 | x=0 ; \
|
---|
| 21 | for file in *.o ; do \
|
---|
| 22 | - tail +16c ./$$file > tmp-foo1; \
|
---|
| 23 | - if tail +16c ${against}/$$file > tmp-foo2 2>/dev/null ; then \
|
---|
| 24 | + tail -c +16 ./$$file > tmp-foo1; \
|
---|
| 25 | + if tail -c +16 ${against}/$$file > tmp-foo2 2>/dev/null ; then \
|
---|
| 26 | if cmp tmp-foo1 tmp-foo2 ; then \
|
---|
| 27 | true ; \
|
---|
| 28 | else \
|
---|
| 29 | diff -Naur binutils-2.16-ORIG/gas/Makefile.in binutils-2.16/gas/Makefile.in
|
---|
| 30 | --- binutils-2.16-ORIG/gas/Makefile.in 2005-04-29 09:57:16.000000000 -0400
|
---|
| 31 | +++ binutils-2.16/gas/Makefile.in 2005-05-06 17:08:11.868875659 -0400
|
---|
| 32 | @@ -3164,13 +3164,13 @@
|
---|
| 33 | if [ -f stage3/as-new$(EXEEXT) -a ! -f stage3/as$(EXEEXT) ] ; then (cd stage3 ; ln -s as-new as$(EXEEXT)) ; fi
|
---|
| 34 |
|
---|
| 35 | # This rule is derived from corresponding code in the Makefile.in for gcc.
|
---|
| 36 | -# The "tail +16c" is to bypass headers which may include timestamps or
|
---|
| 37 | +# The "tail -c +16" is to bypass headers which may include timestamps or
|
---|
| 38 | # temporary assembly file names.
|
---|
| 39 | comparison:
|
---|
| 40 | x=0 ; \
|
---|
| 41 | for file in *.o ; do \
|
---|
| 42 | - tail +16c ./$$file > tmp-foo1; \
|
---|
| 43 | - if tail +16c ${against}/$$file > tmp-foo2 2>/dev/null ; then \
|
---|
| 44 | + tail -c +16 ./$$file > tmp-foo1; \
|
---|
| 45 | + if tail -c +16 ${against}/$$file > tmp-foo2 2>/dev/null ; then \
|
---|
| 46 | if cmp tmp-foo1 tmp-foo2 ; then \
|
---|
| 47 | true ; \
|
---|
| 48 | else \
|
---|
| 49 | diff -Naur binutils-2.16-ORIG/ld/testsuite/ld-bootstrap/bootstrap.exp binutils-2.16/ld/testsuite/ld-bootstrap/bootstrap.exp
|
---|
| 50 | --- binutils-2.16-ORIG/ld/testsuite/ld-bootstrap/bootstrap.exp 2005-03-03 06:52:06.000000000 -0500
|
---|
| 51 | +++ binutils-2.16/ld/testsuite/ld-bootstrap/bootstrap.exp 2005-05-06 17:08:11.870875393 -0400
|
---|
| 52 | @@ -149,8 +149,8 @@
|
---|
| 53 | # Although this works, a way to set the date would be better.
|
---|
| 54 | # Removing or zeroing the date stamp in the binary produced by
|
---|
| 55 | # the linker is not possible as it is required by the target OS.
|
---|
| 56 | - exec tail +140 tmpdir/ld2 >tmpdir/ld2tail
|
---|
| 57 | - exec tail +140 tmpdir/ld3 >tmpdir/ld3tail
|
---|
| 58 | + exec tail -n +140 tmpdir/ld2 >tmpdir/ld2tail
|
---|
| 59 | + exec tail -n +140 tmpdir/ld3 >tmpdir/ld3tail
|
---|
| 60 | catch "exec cmp tmpdir/ld2tail tmpdir/ld3tail" exec_output
|
---|
| 61 | exec rm tmpdir/ld2tail tmpdir/ld3tail
|
---|
| 62 | } else {
|
---|
| 63 | diff -Naur binutils-2.16-ORIG/ltcf-c.sh binutils-2.16/ltcf-c.sh
|
---|
| 64 | --- binutils-2.16-ORIG/ltcf-c.sh 2004-10-05 09:34:42.000000000 -0400
|
---|
| 65 | +++ binutils-2.16/ltcf-c.sh 2005-05-06 17:08:11.873874993 -0400
|
---|
| 66 | @@ -153,7 +153,7 @@
|
---|
| 67 | # If the export-symbols file already is a .def file (1st line
|
---|
| 68 | # is EXPORTS), use it as is.
|
---|
| 69 | # If DATA tags from a recent dlltool are present, honour them!
|
---|
| 70 | - archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
|
---|
| 71 | + archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
|
---|
| 72 | cp $export_symbols $output_objdir/$soname-def;
|
---|
| 73 | else
|
---|
| 74 | echo EXPORTS > $output_objdir/$soname-def;
|
---|
| 75 | diff -Naur binutils-2.16-ORIG/ltcf-gcj.sh binutils-2.16/ltcf-gcj.sh
|
---|
| 76 | --- binutils-2.16-ORIG/ltcf-gcj.sh 2004-07-21 15:21:41.000000000 -0400
|
---|
| 77 | +++ binutils-2.16/ltcf-gcj.sh 2005-05-06 17:08:11.876874593 -0400
|
---|
| 78 | @@ -156,7 +156,7 @@
|
---|
| 79 | # If the export-symbols file already is a .def file (1st line
|
---|
| 80 | # is EXPORTS), use it as is.
|
---|
| 81 | # If DATA tags from a recent dlltool are present, honour them!
|
---|
| 82 | - archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
|
---|
| 83 | + archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
|
---|
| 84 | cp $export_symbols $output_objdir/$soname-def;
|
---|
| 85 | else
|
---|
| 86 | echo EXPORTS > $output_objdir/$soname-def;
|
---|
| 87 | diff -Naur binutils-2.16-ORIG/src-release binutils-2.16/src-release
|
---|
| 88 | --- binutils-2.16-ORIG/src-release 2004-12-03 05:30:06.000000000 -0500
|
---|
| 89 | +++ binutils-2.16/src-release 2005-05-06 17:08:11.878874327 -0400
|
---|
| 90 | @@ -69,7 +69,7 @@
|
---|
| 91 | elif grep AM_INIT_AUTOMAKE $(TOOL)/configure.in >/dev/null 2>&1; then \
|
---|
| 92 | sed < $(TOOL)/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'; \
|
---|
| 93 | elif test -f $(TOOL)/version.in; then \
|
---|
| 94 | - head -1 $(TOOL)/version.in; \
|
---|
| 95 | + head -n 1 $(TOOL)/version.in; \
|
---|
| 96 | elif grep VERSION $(TOOL)/Makefile.in > /dev/null 2>&1; then \
|
---|
| 97 | sed < $(TOOL)/Makefile.in -n 's/^VERSION *= *//p'; \
|
---|
| 98 | else \
|
---|