Wed Jul 17 00:58:51 PDT 2013

4 files changed, 0 insertions, 700 deletions

diff --git a/community/avr-binutils/PKGBUILD b/community/avr-binutils/PKGBUILD
deleted file mode 100644
index 2898a3e65..000000000
--- a/community/avr-binutils/PKGBUILD
+++ /dev/null
@@ -1,89 +0,0 @@
-# $Id: PKGBUILD 88220 2013-04-14 18:16:45Z schuay $
-# Maintainer: schuay <jakob.gruber@gmail.com>
-# Contributor: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: Corrado Primier <bardo@aur.archlinux.org>
-# Contributor: danst0 <danst0@west.de>
-
-# Build order: avr-binutils -> avr-gcc -> avr-libc
-
-pkgname=avr-binutils
-pkgver=2.23.2
-pkgrel=1
-pkgdesc="A set of programs to assemble and manipulate binary and object files for the AVR architecture"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/binutils/"
-license=('GPL')
-depends=('glibc>=2.17' 'zlib' 'binutils')
-provides=("binutils-avr=$pkgver")
-replaces=('binutils-avr')
-options=('!libtool' '!distcc' '!ccache')
-install=avr-binutils.install
-source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig}
-        binutils-2.23.2-texinfo-5.0.patch
-        avr-size.patch)
-
-_builddir=binutils-build
-
-build() {
-    cd ${srcdir}/binutils-${pkgver}
-
-    # See https://bugs.archlinux.org/task/32504
-    patch -Np0 < ${srcdir}/avr-size.patch
-
-    # http://sourceware.org/git/?p=binutils.git;a=patch;h=e02bf935
-    # http://sourceware.org/git/?p=binutils.git;a=patch;h=935f8542
-    patch -p1 -i ${srcdir}/binutils-2.23.2-texinfo-5.0.patch
-
-    # https://bugs.archlinux.org/task/34629
-    sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
-
-    config_guess=$(./config.guess)
-
-    cd ${srcdir}
-    rm -rf ${_builddir}
-    mkdir ${_builddir} && cd ${_builddir}
-
-    ${srcdir}/binutils-${pkgver}/configure \
-        --prefix=/usr \
-        --with-lib-path=/usr/lib:/usr/local/lib \
-        --with-bugurl=https://bugs.archlinux.org/ \
-        --enable-ld=default \
-        --enable-gold \
-        --enable-plugins \
-        --enable-threads \
-        --with-pic \
-        --enable-shared \
-        --disable-werror \
-        --disable-multilib \
-        --build=${config_guess} \
-        --target=avr \
-        $CONFIGFLAG
-
-    # This checks the host environment and makes sure all the necessary tools are available to compile Binutils.
-    make configure-host
-
-    make tooldir=/usr
-}
-
-package() {
-    cd ${srcdir}/${_builddir}
-
-    make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install
-
-    rm ${pkgdir}/usr/lib/libiberty.a
-
-    for bin in ar as nm objcopy objdump ranlib strip ; do
-        rm -f ${pkgdir}/usr/bin/${bin}
-    done
-
-    for info in as bfd binutils configure gprof ld standards; do
-        mv ${pkgdir}/usr/share/info/${info}.info ${pkgdir}/usr/share/info/avr-${info}.info
-    done
-
-    rm -rf ${pkgdir}/usr/share/locale
-}
-
-md5sums=('4f8fa651e35ef262edc01d60fb45702e'
-         'SKIP'
-         '34e439ce23213a91e2af872dfbb5094c'
-         '573769ec1107d1bfed78680edd7ae63f')
diff --git a/community/avr-binutils/avr-binutils.install b/community/avr-binutils/avr-binutils.install
deleted file mode 100644
index eb066ae3a..000000000
--- a/community/avr-binutils/avr-binutils.install
+++ /dev/null
@@ -1,17 +0,0 @@
-infodir=usr/share/info
-filelist=(avr-as.info avr-bfd.info avr-binutils.info avr-configure.info avr-gprof.info avr-ld.info avr-standards.info)
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
diff --git a/community/avr-binutils/avr-size.patch b/community/avr-binutils/avr-size.patch
deleted file mode 100644
index 2e01c3d31..000000000
--- a/community/avr-binutils/avr-size.patch
+++ /dev/null
@@ -1,432 +0,0 @@
-AVR specific only
---------------------------------------------------------------------------------
---- binutils/size.c	2007-08-06 13:56:14.000000000 -0600
-+++ binutils/size.c	2007-09-13 09:13:10.281250000 -0600
-@@ -35,10 +35,31 @@
- #include "getopt.h"
- #include "bucomm.h"
- 
--#ifndef BSD_DEFAULT
--#define BSD_DEFAULT 1
-+typedef enum
-+{
-+    format_sysv = 0,
-+    format_bsd = 1,
-+    format_avr = 2,
-+} format_type_t;
-+
-+
-+/* Set the default format. */
-+#define FORMAT_DEFAULT_SYSV 0
-+#define FORMAT_DEFAULT_BSD 1
-+#define FORMAT_DEFAULT_AVR 0
-+
-+#if FORMAT_DEFAULT_SYSV
-+    #define FORMAT_DEFAULT format_sysv
-+    #define FORMAT_NAME "sysv"
-+#elif FORMAT_DEFAULT_BSD
-+    #define FORMAT_DEFAULT format_bsd
-+    #define FORMAT_NAME "berkeley"
-+#elif FORMAT_DEFAULT_AVR
-+    #define FORMAT_DEFAULT format_avr
-+    #define FORMAT_NAME "avr"
- #endif
- 
-+
- /* Program options.  */
- 
- static enum
-@@ -47,9 +68,8 @@ static enum
-   }
- radix = decimal;
- 
--/* 0 means use AT&T-style output.  */
--static int berkeley_format = BSD_DEFAULT;
- 
-+format_type_t format = FORMAT_DEFAULT;
- static int show_version = 0;
- static int show_help = 0;
- static int show_totals = 0;
-@@ -63,6 +83,157 @@ static bfd_size_type total_textsize;
- /* Program exit status.  */
- static int return_code = 0;
- 
-+
-+/* AVR Size specific stuff */
-+
-+#define AVR64 64UL
-+#define AVR128 128UL
-+#define AVR256 256UL
-+#define AVR512 512UL
-+#define AVR1K 1024UL
-+#define AVR2K 2048UL
-+#define AVR4K 4096UL
-+#define AVR8K 8192UL
-+#define AVR16K 16384UL
-+#define AVR24K 24576UL
-+#define AVR32K 32768UL
-+#define AVR40K 40960UL
-+#define AVR64K 65536UL
-+#define AVR128K 131072UL
-+#define AVR256K 262144UL
-+
-+typedef struct
-+{
-+    char *name;
-+	long flash;
-+	long ram;
-+	long eeprom;
-+} avr_device_t;
-+
-+avr_device_t avr[] =
-+{
-+	{"atmega2560",  AVR256K, AVR8K,  AVR4K},
-+	{"atmega2561",  AVR256K, AVR8K,  AVR4K},
-+
-+	{"at43usb320",  AVR128K, 608UL,    0},
-+	{"at90can128",  AVR128K, AVR4K,  AVR4K},
-+	{"at90usb1286", AVR128K, AVR8K,  AVR4K},
-+	{"at90usb1287", AVR128K, AVR8K,  AVR4K},
-+	{"atmega128",   AVR128K, AVR4K,  AVR4K},
-+	{"atmega1280",  AVR128K, AVR8K,  AVR4K},
-+	{"atmega1281",  AVR128K, AVR8K,  AVR4K},
-+	{"atmega1284P", AVR128K, AVR16K, AVR4K},
-+	{"atmega103",   AVR128K, 4000UL,   AVR4K},
-+	{"atxmega128a1",AVR128K, AVR8K,  AVR2K},
-+
-+	{"at90can64",   AVR64K,  AVR4K,  AVR2K},
-+	{"at90usb646",  AVR64K,  AVR4K,  AVR2K},
-+	{"at90usb647",  AVR64K,  AVR4K,  AVR2K},
-+	{"atmega64",    AVR64K,  AVR4K,  AVR2K},
-+	{"atmega640",   AVR64K,  AVR8K,  AVR4K},
-+	{"atmega644",   AVR64K,  AVR4K,  AVR2K},
-+	{"atmega644p",  AVR64K,  AVR4K,  AVR2K},
-+	{"atmega645",   AVR64K,  AVR4K,  AVR2K},
-+	{"atmega6450",  AVR64K,  AVR4K,  AVR2K},
-+	{"atmega649",   AVR64K,  AVR4K,  AVR2K},
-+	{"atmega6490",  AVR64K,  AVR4K,  AVR2K},
-+	{"atxmega64a1", AVR64K,  AVR4K,  AVR2K},
-+
-+	{"atmega406",   AVR40K,  AVR512, AVR2K},
-+
-+	{"at90can32",   AVR32K,  AVR2K,  AVR1K},
-+	{"at94k",       AVR32K,  AVR4K,  0},
-+	{"atmega32",    AVR32K,  AVR2K,  AVR1K},
-+	{"atmega323",   AVR32K,  AVR2K,  AVR1K},
-+	{"atmega324p",  AVR32K,  AVR2K,  AVR1K},
-+	{"atmega325",   AVR32K,  AVR2K,  AVR1K},
-+	{"atmega325p",  AVR32K,  AVR2K,  AVR1K},
-+	{"atmega3250",  AVR32K,  AVR2K,  AVR1K},
-+	{"atmega3250p", AVR32K,  AVR2K,  AVR1K},
-+	{"atmega328p",  AVR32K,  AVR2K,  AVR1K},
-+	{"atmega329",   AVR32K,  AVR2K,  AVR1K},
-+	{"atmega329p",  AVR32K,  AVR2K,  AVR1K},
-+	{"atmega3290",  AVR32K,  AVR2K,  AVR1K},
-+	{"atmega3290p", AVR32K,  AVR2K,  AVR1K},
-+	{"atmega32hvb", AVR32K,  AVR2K,  AVR1K},
-+	{"atmega32c1",  AVR32K,  AVR2K,  AVR1K},
-+	{"atmega32m1",  AVR32K,  AVR2K,  AVR1K},
-+	{"atmega32u4",  AVR32K,  2560UL, AVR1K},
-+
-+	{"at43usb355",  AVR24K,  1120,   0},
-+
-+	{"at76c711",    AVR16K,  AVR2K,  0},
-+	{"at90pwm216",  AVR16K,  AVR1K,  AVR512},
-+	{"at90pwm316",  AVR16K,  AVR1K,  AVR512},
-+	{"at90usb162",  AVR16K,  AVR512, AVR512},
-+	{"atmega16",    AVR16K,  AVR1K,  AVR512},
-+	{"atmega161",   AVR16K,  AVR1K,  AVR512},
-+	{"atmega162",   AVR16K,  AVR1K,  AVR512},
-+	{"atmega163",   AVR16K,  AVR1K,  AVR512},
-+	{"atmega164",   AVR16K,  AVR1K,  AVR512},
-+	{"atmega164p",  AVR16K,  AVR1K,  AVR512},
-+	{"atmega165",   AVR16K,  AVR1K,  AVR512},
-+	{"atmega165p",  AVR16K,  AVR1K,  AVR512},
-+	{"atmega168",   AVR16K,  AVR1K,  AVR512},
-+	{"atmega168p",  AVR16K,  AVR1K,  AVR512},
-+	{"atmega169",   AVR16K,  AVR1K,  AVR512},
-+	{"atmega169p",  AVR16K,  AVR1K,  AVR512},
-+	{"attiny167",   AVR16K,  AVR512, AVR512},
-+	{"atxmega16d4", AVR16K,  AVR2K,  AVR1K},
-+
-+	{"at90c8534",   AVR8K,   352,    AVR512},
-+	{"at90pwm1",    AVR8K,   AVR512, AVR512},
-+	{"at90pwm2",    AVR8K,   AVR512, AVR512},
-+	{"at90pwm2b",   AVR8K,   AVR512, AVR512},
-+	{"at90pwm3",    AVR8K,   AVR512, AVR512},
-+	{"at90pwm3b",   AVR8K,   AVR512, AVR512},
-+	{"at90s8515",   AVR8K,   AVR512, AVR512},
-+	{"at90s8535",   AVR8K,   AVR512, AVR512},
-+	{"at90usb82",   AVR8K,   AVR512, AVR512},
-+	{"atmega8",     AVR8K,   AVR1K,  AVR512},
-+	{"atmega8515",  AVR8K,   AVR512, AVR512},
-+	{"atmega8535",  AVR8K,   AVR512, AVR512},
-+	{"atmega88",    AVR8K,   AVR1K,  AVR512},
-+	{"atmega88p",   AVR8K,   AVR1K,  AVR512},
-+	{"attiny84",    AVR8K,   AVR512, AVR512},
-+	{"attiny85",    AVR8K,   AVR512, AVR512},
-+	{"attiny861",   AVR8K,   AVR512, AVR512},
-+	{"attiny88",    AVR8K,   AVR256, AVR64},
-+
-+	{"at90s4414",   AVR4K,   352,    AVR256},
-+	{"at90s4433",   AVR4K,   AVR128, AVR256},
-+	{"at90s4434",   AVR4K,   352,    AVR256},
-+	{"atmega48",    AVR4K,   AVR512, AVR256},
-+	{"atmega48p",   AVR4K,   AVR512, AVR256},
-+	{"attiny43u",   AVR4K,   AVR256, AVR64},
-+	{"attiny44",    AVR4K,   AVR256, AVR256},
-+	{"attiny45",    AVR4K,   AVR256, AVR256},
-+	{"attiny461",   AVR4K,   AVR256, AVR256},
-+	{"attiny48",    AVR4K,   AVR256, AVR64},
-+
-+	{"at86rf401",   AVR2K,   224,    AVR128},
-+	{"at90s2313",   AVR2K,   AVR128, AVR128},
-+	{"at90s2323",   AVR2K,   AVR128, AVR128},
-+	{"at90s2333",   AVR2K,   224,    AVR128},
-+	{"at90s2343",   AVR2K,   AVR128, AVR128},
-+	{"attiny22",    AVR2K,   224,    AVR128},
-+	{"attiny2313",  AVR2K,   AVR128, AVR128},
-+	{"attiny24",    AVR2K,   AVR128, AVR128},
-+	{"attiny25",    AVR2K,   AVR128, AVR128},
-+	{"attiny26",    AVR2K,   AVR128, AVR128},
-+	{"attiny261",   AVR2K,   AVR128, AVR128},
-+	{"attiny28",    AVR2K,   0,      0},
-+
-+	{"at90s1200",   AVR1K,   0,      AVR64},
-+	{"attiny11",    AVR1K,   0,      AVR64},
-+	{"attiny12",    AVR1K,   0,      AVR64},
-+	{"attiny13",    AVR1K,   AVR64,  AVR64},
-+	{"attiny15",    AVR1K,   0,      AVR64},
-+};
-+
-+static char *avrmcu = NULL;
-+
-+
- static char *target = NULL;
- 
- /* Forward declarations.  */
-@@ -78,7 +240,8 @@ usage (FILE *stream, int status)
-   fprintf (stream, _(" Displays the sizes of sections inside binary files\n"));
-   fprintf (stream, _(" If no input file(s) are specified, a.out is assumed\n"));
-   fprintf (stream, _(" The options are:\n\
--  -A|-B     --format={sysv|berkeley}  Select output style (default is %s)\n\
-+  -A|-B|-C  --format={sysv|berkeley|avr}  Select output style (default is %s)\n\
-+            --mcu=<avrmcu>            MCU name for AVR format only\n\
-   -o|-d|-x  --radix={8|10|16}         Display numbers in octal, decimal or hex\n\
-   -t        --totals                  Display the total sizes (Berkeley only)\n\
-             --common                  Display total size for *COM* syms\n\
-@@ -87,11 +250,7 @@ usage (FILE *stream, int status)
-   -h        --help                    Display this information\n\
-   -v        --version                 Display the program's version\n\
- \n"),
--#if BSD_DEFAULT
--  "berkeley"
--#else
--  "sysv"
--#endif
-+FORMAT_NAME
- );
-   list_supported_targets (program_name, stream);
-   if (REPORT_BUGS_TO[0] && status == 0)
-@@ -102,6 +261,7 @@ usage (FILE *stream, int status)
- #define OPTION_FORMAT (200)
- #define OPTION_RADIX (OPTION_FORMAT + 1)
- #define OPTION_TARGET (OPTION_RADIX + 1)
-+#define OPTION_MCU (OPTION_TARGET + 1) 
- 
- static struct option long_options[] =
- {
-@@ -109,6 +269,7 @@ static struct option long_options[] =
-   {"format", required_argument, 0, OPTION_FORMAT},
-   {"radix", required_argument, 0, OPTION_RADIX},
-   {"target", required_argument, 0, OPTION_TARGET},
-+  {"mcu", required_argument, 0, 203},
-   {"totals", no_argument, &show_totals, 1},
-   {"version", no_argument, &show_version, 1},
-   {"help", no_argument, &show_help, 1},
-@@ -140,7 +301,7 @@ main (int argc, char **argv)
-   bfd_init ();
-   set_default_bfd_target ();
- 
--  while ((c = getopt_long (argc, argv, "ABHhVvdfotx", long_options,
-+  while ((c = getopt_long (argc, argv, "ABCHhVvdfotx", long_options,
- 			   (int *) 0)) != EOF)
-     switch (c)
-       {
-@@ -149,11 +310,15 @@ main (int argc, char **argv)
- 	  {
- 	  case 'B':
- 	  case 'b':
--	    berkeley_format = 1;
-+	    format = format_bsd;
- 	    break;
- 	  case 'S':
- 	  case 's':
--	    berkeley_format = 0;
-+	    format = format_sysv;
-+	    break;
-+	  case 'A':
-+	  case 'a':
-+	    format = format_avr;
- 	    break;
- 	  default:
- 	    non_fatal (_("invalid argument to --format: %s"), optarg);
-@@ -161,6 +326,10 @@ main (int argc, char **argv)
- 	  }
- 	break;
- 
-+      case OPTION_MCU:
-+	avrmcu = optarg;
-+	break;
-+
-       case OPTION_TARGET:
- 	target = optarg;
- 	break;
-@@ -189,11 +358,14 @@ main (int argc, char **argv)
- 	break;
- 
-       case 'A':
--	berkeley_format = 0;
-+	format = format_sysv;
- 	break;
-       case 'B':
--	berkeley_format = 1;
-+	format = format_bsd;
- 	break;
-+      case 'C':
-+    format = format_avr;
-+    break;
-       case 'v':
-       case 'V':
- 	show_version = 1;
-@@ -239,7 +411,7 @@ main (int argc, char **argv)
-     for (; optind < argc;)
-       display_file (argv[optind++]);
- 
--  if (show_totals && berkeley_format)
-+  if (show_totals && format == format_bsd)
-     {
-       bfd_size_type total = total_textsize + total_datasize + total_bsssize;
- 
-@@ -600,13 +772,117 @@ print_sysv_format (bfd *file)
-   printf ("\n\n");
- }
- 
-+
-+static avr_device_t *
-+avr_find_device (void)
-+{
-+  unsigned int i;
-+  if (avrmcu != NULL)
-+  {
-+    for (i = 0; i < sizeof(avr) / sizeof(avr[0]); i++)
-+    {
-+      if (strcmp(avr[i].name, avrmcu) == 0)
-+      {
-+        /* Match found */
-+        return (&avr[i]);
-+      }
-+    }
-+  }
-+  return (NULL);
-+}
-+
-+
-+
-+static void
-+print_avr_format (bfd *file)
-+{
-+  char *avr_name = "Unknown";
-+  int flashmax = 0;
-+  int rammax = 0;
-+  int eeprommax = 0;
-+  asection *section; 
-+  bfd_size_type data_size = 0;
-+  bfd_size_type text_size = 0;
-+  bfd_size_type bss_size = 0;
-+  bfd_size_type bootloader_size = 0;
-+  bfd_size_type noinit_size = 0;
-+  bfd_size_type eeprom_size = 0;
-+
-+  avr_device_t *avrdevice = avr_find_device();
-+  if (avrdevice != NULL)
-+  {
-+    avr_name = avrdevice->name;
-+    flashmax = avrdevice->flash;
-+    rammax = avrdevice->ram;
-+    eeprommax = avrdevice->eeprom;
-+  }
-+
-+  if ((section = bfd_get_section_by_name (file, ".data")) != NULL)
-+    data_size = bfd_section_size (file, section);
-+  if ((section = bfd_get_section_by_name (file, ".text")) != NULL)
-+    text_size = bfd_section_size (file, section);
-+  if ((section = bfd_get_section_by_name (file, ".bss")) != NULL)
-+    bss_size = bfd_section_size (file, section);
-+  if ((section = bfd_get_section_by_name (file, ".bootloader")) != NULL)
-+    bootloader_size = bfd_section_size (file, section);
-+  if ((section = bfd_get_section_by_name (file, ".noinit")) != NULL)
-+    noinit_size = bfd_section_size (file, section);
-+  if ((section = bfd_get_section_by_name (file, ".eeprom")) != NULL)
-+    eeprom_size = bfd_section_size (file, section);
-+  
-+  bfd_size_type text = text_size + data_size + bootloader_size;
-+  bfd_size_type data = data_size + bss_size + noinit_size;
-+  bfd_size_type eeprom = eeprom_size;
-+  
-+  printf ("AVR Memory Usage\n"
-+          "----------------\n"
-+          "Device: %s\n\n", avr_name);
-+  
-+  /* Text size */
-+  printf ("Program:%8ld bytes", text);
-+  if (flashmax > 0)
-+  {
-+    printf (" (%2.1f%% Full)", ((float)text / flashmax) * 100);
-+  }
-+  printf ("\n(.text + .data + .bootloader)\n\n");
-+  
-+  /* Data size */
-+  printf ("Data:   %8ld bytes", data);
-+  if (rammax > 0)
-+  {
-+    printf (" (%2.1f%% Full)", ((float)data / rammax) * 100);
-+  }
-+  printf ("\n(.data + .bss + .noinit)\n\n");
-+  
-+  /* EEPROM size */
-+  if (eeprom > 0) 
-+  { 
-+    printf ("EEPROM: %8ld bytes", eeprom);
-+    if (eeprommax > 0)
-+    {
-+      printf (" (%2.1f%% Full)", ((float)eeprom / eeprommax) * 100);
-+    }
-+    printf ("\n(.eeprom)\n\n");
-+  }
-+}
-+
-+
- static void
- print_sizes (bfd *file)
- {
-   if (show_common)
-     calculate_common_size (file);
--  if (berkeley_format)
--    print_berkeley_format (file);
--  else
--    print_sysv_format (file);
-+  switch (format)
-+  {
-+    case format_sysv:
-+      print_sysv_format (file);
-+      break;
-+    case format_bsd:
-+      print_berkeley_format (file);
-+      break;
-+    case format_avr:
-+    default:
-+      print_avr_format (file);
-+      break;
-+  }
- }
diff --git a/community/avr-binutils/binutils-2.23.2-texinfo-5.0.patch b/community/avr-binutils/binutils-2.23.2-texinfo-5.0.patch
deleted file mode 100644
index 38dc19fb0..000000000
--- a/community/avr-binutils/binutils-2.23.2-texinfo-5.0.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-diff --git a/bfd/doc/bfd.texinfo b/bfd/doc/bfd.texinfo
-index 45ffa73..3aa3300 100644
---- a/bfd/doc/bfd.texinfo
-+++ b/bfd/doc/bfd.texinfo
-@@ -322,7 +324,7 @@ All of BFD lives in one directory.
- @printindex cp
- 
- @tex
--% I think something like @colophon should be in texinfo.  In the
-+% I think something like @@colophon should be in texinfo.  In the
- % meantime:
- \long\def\colophon{\hbox to0pt{}\vfill
- \centerline{The body of this manual is set in}
-@@ -333,7 +335,7 @@ All of BFD lives in one directory.
- \centerline{{\sl\fontname\tensl\/}}
- \centerline{are used for emphasis.}\vfill}
- \page\colophon
--% Blame: doc@cygnus.com, 28mar91.
-+% Blame: doc@@cygnus.com, 28mar91.
- @end tex
- 
- @bye
-diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
-index 56a0510..fb1802b 100644
---- a/binutils/doc/binutils.texi
-+++ b/binutils/doc/binutils.texi
-@@ -148,18 +148,18 @@ in the section entitled ``GNU Free Documentation License''.
- * objcopy::			Copy and translate object files
- * objdump::                     Display information from object files
- * ranlib::                      Generate index to archive contents
--* readelf::                     Display the contents of ELF format files
- * size::                        List section sizes and total size
- * strings::                     List printable strings from files
- * strip::                       Discard symbols
--* elfedit::                     Update the ELF header of ELF files
- * c++filt::			Filter to demangle encoded C++ symbols
- * cxxfilt: c++filt.             MS-DOS name for c++filt
- * addr2line::			Convert addresses to file and line
- * nlmconv::                     Converts object code into an NLM
--* windres::			Manipulate Windows resources
- * windmc::			Generator for Windows message resources
-+* windres::			Manipulate Windows resources
- * dlltool::			Create files needed to build and use DLLs
-+* readelf::                     Display the contents of ELF format files
-+* elfedit::                     Update the ELF header of ELF files
- * Common Options::              Command-line options for all utilities
- * Selecting the Target System:: How these utilities determine the target
- * Reporting Bugs::              Reporting Bugs
-@@ -2907,7 +2907,7 @@ the Info entries for @file{binutils}.
- @c man end
- @end ignore
- 
--@node c++filt, addr2line, elfedit, Top
-+@node c++filt, addr2line, strip, Top
- @chapter c++filt
- 
- @kindex c++filt
-@@ -4384,7 +4384,7 @@ equivalent. At least one of the @option{--output-mach},
- 
- @table @env
- 
--@itemx --input-mach=@var{machine}
-+@item --input-mach=@var{machine}
- Set the matching input ELF machine type to @var{machine}.  If
- @option{--input-mach} isn't specified, it will match any ELF
- machine types.
-@@ -4392,21 +4392,21 @@ machine types.
- The supported ELF machine types are, @var{L1OM}, @var{K1OM} and
- @var{x86-64}.
- 
--@itemx --output-mach=@var{machine}
-+@item --output-mach=@var{machine}
- Change the ELF machine type in the ELF header to @var{machine}.  The
- supported ELF machine types are the same as @option{--input-mach}.
- 
--@itemx --input-type=@var{type}
-+@item --input-type=@var{type}
- Set the matching input ELF file type to @var{type}.  If
- @option{--input-type} isn't specified, it will match any ELF file types.
- 
- The supported ELF file types are, @var{rel}, @var{exec} and @var{dyn}.
- 
--@itemx --output-type=@var{type}
-+@item --output-type=@var{type}
- Change the ELF file type in the ELF header to @var{type}.  The
- supported ELF types are the same as @option{--input-type}.
- 
--@itemx --input-osabi=@var{osabi}
-+@item --input-osabi=@var{osabi}
- Set the matching input ELF file OSABI to @var{osabi}.  If
- @option{--input-osabi} isn't specified, it will match any ELF OSABIs.
- 
-@@ -4416,7 +4416,7 @@ The supported ELF OSABIs are, @var{none}, @var{HPUX}, @var{NetBSD},
- @var{FreeBSD}, @var{TRU64}, @var{Modesto}, @var{OpenBSD}, @var{OpenVMS},
- @var{NSK}, @var{AROS} and @var{FenixOS}.
- 
--@itemx --output-osabi=@var{osabi}
-+@item --output-osabi=@var{osabi}
- Change the ELF OSABI in the ELF header to @var{osabi}.  The
- supported ELF OSABI are the same as @option{--input-osabi}.
- 
-diff --git a/ld/ld.texinfo b/ld/ld.texinfo
-index c7ae2a5..4777ad5 100644
---- a/ld/ld.texinfo
-+++ b/ld/ld.texinfo
-@@ -142,12 +144,12 @@ in the section entitled ``GNU Free Documentation License''.
- @ifset ARM
- * ARM::				ld and the ARM family
- @end ifset
--@ifset HPPA
--* HPPA ELF32::                  ld and HPPA 32-bit ELF
--@end ifset
- @ifset M68HC11
- * M68HC11/68HC12::              ld and the Motorola 68HC11 and 68HC12 families
- @end ifset
-+@ifset HPPA
-+* HPPA ELF32::                  ld and HPPA 32-bit ELF
-+@end ifset
- @ifset M68K
- * M68K::                        ld and Motorola 68K family
- @end ifset
-@@ -6012,6 +6014,9 @@ functionality are not listed.
- @ifset I960
- * i960::                        @command{ld} and the Intel 960 family
- @end ifset
-+@ifset M68HC11
-+* M68HC11/68HC12::		@code{ld} and the Motorola 68HC11 and 68HC12 families
-+@end ifset
- @ifset ARM
- * ARM::				@command{ld} and the ARM family
- @end ifset
-@@ -6027,9 +6032,6 @@ functionality are not listed.
- @ifset MSP430
- * MSP430::			@command{ld} and MSP430
- @end ifset
--@ifset M68HC11
--* M68HC11/68HC12::		@code{ld} and the Motorola 68HC11 and 68HC12 families
--@end ifset
- @ifset POWERPC
- * PowerPC ELF32::		@command{ld} and PowerPC 32-bit ELF Support
- @end ifset
-@@ -7877,7 +7879,7 @@ If you have more than one @code{SECT} statement for the same
- @printindex cp
- 
- @tex
--% I think something like @colophon should be in texinfo.  In the
-+% I think something like @@colophon should be in texinfo.  In the
- % meantime:
- \long\def\colophon{\hbox to0pt{}\vfill
- \centerline{The body of this manual is set in}
-@@ -7888,7 +7890,7 @@ If you have more than one @code{SECT} statement for the same
- \centerline{{\sl\fontname\tensl\/}}
- \centerline{are used for emphasis.}\vfill}
- \page\colophon
--% Blame: doc@cygnus.com, 28mar91.
-+% Blame: doc@@cygnus.com, 28mar91.
- @end tex
- 
- @bye
--- 
-1.7.1
-