02/07: patch doc

[Jan Nieuwenhuizen]

janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit c87917149e82437576a2e94aee42190ccfe2cd32
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Tue Sep 18 06:49:38 2018 +0200

    patch doc
---
 gnu/packages/patches/binutils-boot-2.20.1a.patch | 147 ++---------------------
 1 file changed, 10 insertions(+), 137 deletions(-)

diff --git a/gnu/packages/patches/binutils-boot-2.20.1a.patch 
b/gnu/packages/patches/binutils-boot-2.20.1a.patch
index 2f0327e..0dd0c8f 100644
--- a/gnu/packages/patches/binutils-boot-2.20.1a.patch
+++ b/gnu/packages/patches/binutils-boot-2.20.1a.patch
@@ -1,23 +1,13 @@
-Binary files ../binutils-2.20.1a/bfd/doc/chew and 
binutils-2.20.1a/bfd/doc/chew differ
-diff -purN -x config.status -x config.h -x BOOT 
../binutils-2.20.1a/bfd/elf32-i386.c binutils-2.20.1a/bfd/elf32-i386.c
---- ../binutils-2.20.1a/bfd/elf32-i386.c       2009-09-10 13:47:12.000000000 
+0200
-+++ binutils-2.20.1a/bfd/elf32-i386.c  2018-06-23 19:33:20.068134411 +0200
-@@ -4254,6 +4254,7 @@ elf_i386_finish_dynamic_symbol (bfd *out
-             if (!h->pointer_equality_needed)
-               abort ();
- 
-+              {
-             /* For non-shared object, we can't use .got.plt, which
-                contains the real function addres if we need pointer
-                equality.  We load the GOT entry with the PLT entry.  */
-@@ -4262,6 +4263,7 @@ elf_i386_finish_dynamic_symbol (bfd *out
-                         (plt->output_section->vma
-                          + plt->output_offset + h->plt.offset),
-                         htab->elf.sgot->contents + h->got.offset);
-+              }
-             return TRUE;
-           }
-       }
+This patch enables building binutils using TCC and Mes C Library
+
+  * disable building DOC
+  * remove signed int trickery that does not work with TCC
+  * fixe the malloc prototype to use size_t
+  * add missing includes
+  * remove a C99'ism of mixing code and variable declaration
+  * [MES_BOOTSTRAP]: remove strncmp to avoid duplicat symbol
+
+
 diff -purN -x config.status -x config.h -x BOOT 
../binutils-2.20.1a/bfd/elfcode.h binutils-2.20.1a/bfd/elfcode.h
 --- ../binutils-2.20.1a/bfd/elfcode.h  2009-09-10 13:47:12.000000000 +0200
 +++ binutils-2.20.1a/bfd/elfcode.h     2018-06-19 19:07:16.647627075 +0200
@@ -90,123 +80,6 @@ diff -purN -x config.status -x config.h -x BOOT 
../binutils-2.20.1a/binutils/sys
  #   endif
  #  endif
  #  ifndef YYFREE
-diff -purN -x config.status -x config.h -x BOOT ../binutils-2.20.1a/BOOT-DEBUG 
binutils-2.20.1a/BOOT-DEBUG
---- ../binutils-2.20.1a/BOOT-DEBUG     1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.20.1a/BOOT-DEBUG        2018-06-19 07:43:48.341211651 +0200
-@@ -0,0 +1,113 @@
-+#! /bin/sh
-+
-+set -x
-+. ../config.sh
-+
-+PATH=$I686_GCC_PREFIX/bin/:$PATH
-+PATH=/gnu/store/gqicgnqmcaf3nfvv9ck9m5fp7n510j0x-flex-2.6.4/bin:$PATH
-+
-+CCBIN=i686-unknown-linux-gnu-gcc
-+
-+CPPFLAGS="-D __GLIBC_MINOR__=6 -D MES_BOOTSTRAP=1 -I $HOME/src/mes/include"
-+#CPPFLAGS="-D __GLIBC_MINOR__=6 -D MES_BOOTSTRAP=1"
-+
-+rm -f $HOME/src/mes/lib/x86-mes-gcc/libc+gnu.a
-+ar rc $HOME/src/mes/lib/x86-mes-gcc/libc+gnu.a 
$HOME/src/mes/lib/x86-mes-gcc/libc+gnu.o
-+CFLAGS="-g -nostdlib -nostdinc -fno-builtin -L$HOME/src/mes/lib/x86-mes-gcc"
-+CPP="$CCBIN -E $CPPFLAGS"
-+CXXCPP="$CCBIN -E $CPPFLAGS"
-+CC="i686-unknown-linux-gnu-gcc -static $CPPFLAGS $CFLAGS"
-+#LDFLAGS="-static $CFLAGS $HOME/src/mes/lib/x86-mes-gcc/crt1.o -lc"
-+LDFLAGS="-static $CFLAGS $HOME/src/mes/lib/x86-mes-gcc/crt1.o"
-+LIBS="-lc+gnu"
-+LD="$CCBIN $LDFLAGS"
-+AR="ar"
-+RANLIB="true"
-+
-+LDFLAGS_FOR_BUILD="$LDFLAGS"
-+LIBS_FOR_BUILD=$LIBS
-+export CFLAGS LIBS LDFLAGS_FOR_BUILD LIBS_FOR_BUILD
-+
-+
-+# libtool: link: require no space between `-L' and 
`/home/janneke/src/mes/lib/x86-mes-gcc'
-+
-+# make CC="$CC" LDFLAGS="$LDFLAGS" LIBS="$LIBS" CXXCPP="$CXXCPP" AR="$AR" 
RANLIB="true" ZLIB="$ZLIB"
-+# make install CC="$CC" AR="$AR" RANLIB="true"
-+
-+# exit 0
-+
-+make distclean >/dev/null 2>&1
-+rm -rf debug */debug */*/debug
-+rm -rf */usr */*/usr
-+
-+# (cd gas && make distclean >/dev/null 2>&1)
-+# rm -f TAGS
-+rm -f foo.a foo.o binutils/foo.a binutils/foo.o
-+rm -f config.log */config.log */*/config.log
-+rm -f config.cache */config.cache
-+rm -f config.status */config.status */*/config.status */*/*/config.status 
*/*/*/*/config.status
-+rm -f if30295.c
-+rm -f if30640.c
-+rm -f config.h */config.h
-+rm config.back
-+rm -f $(find . -name '*.tmp')
-+rm -f $(find . -name '*.lo')
-+[ -d ../../binutils-2.25 ] && (cd .. && diff -purN -x usr -x debug -x foo.a 
-x foo.c -x foo.o -x config.status -x config.h -x BOOT -x BOOT-DEBUG 
../binutils-2.25 binutils-2.25 > binutils-2.25.pets)
-+[ -d ../../binutils-2.25 ] && cp --backup=t ../binutils-2.25.pets 
../binutils-2.25.patch
-+
-+# etags $(find . -name '*.h' -o -name '*.c')
-+
-+
-+
-+set -e
-+
-+#  --build=i386-unknown-linux\
-+
-+AR="$AR"\
-+  RANLIB="$RANLIB"\
-+  CPP="$CPP"\
-+  CXX="false"\
-+  CXXCPP="$CXXCPP"\
-+  CC_FOR_BUILD="$CC"\
-+  CC="$CC"\
-+  LD="$LD"\
-+  LDFLAGS="$LDFLAGS"\
-+  LIBS="$LIBS"\
-+  ./configure\
-+  --host=i386-unknown-linux\
-+  --target=i386-unknown-linux\
-+  --disable-shared\
-+  --enable-static\
-+  --enable-compressed-debug-sections=no\
-+  --disable-gold\
-+  --disable-plugins\
-+  --disable-x86-relax-relocations\
-+  --with-system-libz\
-+  --prefix=$PWD/debug
-+
-+set -x
-+make CC="$CC" LDFLAGS="$LDFLAGS" LIBS="$LIBS" CXXCPP="$CXXCPP" AR="$AR" 
RANLIB="true" ZLIB="$ZLIB"
-+make install CC="$CC" AR="$AR" RANLIB="true"
-+# mv usr/bin/ar usr/bin/.ar-real
-+# cat > usr/bin/ar <<EOF
-+# #! /bin/sh
-+
-+# set -x
-+
-+# dir=\$(dirname \$0)
-+# ar=\$dir/.ar-real
-+# command=\$1
-+# shift
-+# lib=\$1
-+# shift
-+# if [ \$command = 'r' -o \$command = 'rc' ]; then
-+#     for i in \$@; do
-+#         \$ar r \$lib \$i
-+#         ls -l \$lib
-+#     done
-+# else
-+#     \$ar \$command \$lib \$@
-+# fi
-+# EOF
-+# chmod +x usr/bin/ar
-+
 diff -purN -x config.status -x config.h -x BOOT 
../binutils-2.20.1a/gas/config/tc-i386.c binutils-2.20.1a/gas/config/tc-i386.c
 --- ../binutils-2.20.1a/gas/config/tc-i386.c   2009-09-14 13:43:27.000000000 
+0200
 +++ binutils-2.20.1a/gas/config/tc-i386.c      2018-06-23 19:39:37.546254752 
+0200