- update to 0.98.32

Changed files:
    nasm-boguself2.patch -> 1.2
    nasm-cpp_macros.patch -> 1.2

diff --git a/nasm-boguself2.patch b/nasm-boguself2.patch
index 4341bd83724b27ff20973ad0e09505e7aae95a7c..685ba6b104e574862bfda7e5d75ee38c97a62e3d 100644 (file)
--- a/nasm-boguself2.patch
+++ b/nasm-boguself2.patch
@@ -1,6 +1,6 @@
---- nasm-0.98/outelf.c.boguself        Sun May 20 01:25:35 2001
-+++ nasm-0.98/outelf.c Sun May 20 02:01:59 2001
-@@ -548,7 +548,7 @@ static void elf_add_reloc (struct Sectio
+--- nasm-0.98.32/output/outelf.c       Fri May 17 06:51:10 2002
++++ nasm-0.98.32/output/outelf.c.org   Tue May 21 11:32:55 2002
+@@ -568,7 +568,7 @@
        r->symbol = 0;
        for (i=0; i<nsects; i++)
            if (segment == sects[i]->index)
@@ -9,7 +9,7 @@
        if (!r->symbol)
            r->symbol = GLOBAL_TEMP_BASE + raa_read(bsym, segment);
      }
-@@ -922,13 +922,13 @@ static struct SAA *elf_build_symtab (lon
+@@ -975,13 +975,13 @@
       * Now some standard symbols defining the segments, for relocation
       * purposes.
       */
@@ -21,11 +21,11 @@
        WRITELONG (p, 0);              /* size zero */
        WRITESHORT (p, 3);             /* local section-type thing */
 -      WRITESHORT (p, (i==1 ? SHN_ABS : i-1));   /* the section id */
-+      WRITESHORT (p, i);             /* the section id */
++      WRITESHORT (p, i);
        saa_wbytes (s, entry, 16L);
        *len += 16;
        (*local)++;
-@@ -986,7 +986,7 @@ static struct SAA *elf_build_reltab (lon
+@@ -1039,7 +1039,7 @@
        long sym = r->symbol;
  
        if (sym >= GLOBAL_TEMP_BASE)

diff --git a/nasm-cpp_macros.patch b/nasm-cpp_macros.patch
index 5f653e1833957a2aee0fd65d87b9cde5046bb277..c80d4418e4e6ebd1ac3344ff2860ceeb75c72f42 100644 (file)
--- a/nasm-cpp_macros.patch
+++ b/nasm-cpp_macros.patch
@@ -1,22 +1,29 @@
---- nasm-0.98.08/nasm.c~       Mon Mar  5 13:07:28 2001
-+++ nasm-0.98.08/nasm.c        Fri Nov 30 18:01:42 2001
-@@ -422,7 +422,8 @@
+--- nasm-0.98.32/nasm.c        Wed May 15 01:54:46 2002
++++ nasm-0.98.32/nasm.c.org    Tue May 21 11:53:35 2002
+@@ -427,13 +427,14 @@
            using_debug_info = TRUE;
            break;
          case 'h':
 -          printf("usage: nasm [-@ response file] [-o outfile] [-f format] "
 +          {const char *help_text =
-+                 "usage: nasm [-@ response file] [-o outfile] [-f format] "
++               "usage: nasm [-@ response file] [-o outfile] [-f format] "
                   "[-l listfile]\n"
                   "            [options...] [--] filename\n"
-                  "    or nasm -r   for version info\n\n"
-@@ -443,7 +444,8 @@
+                  "    or nasm -r   for version info (obsolete)\n"
+                  "    or nasm -v   for version info (preferred)\n\n"
+                  "    -t          Assemble in SciTech TASM compatible mode\n"
+-                 "    -g          Generate debug information in selected format.\n");
++                 "    -g          Generate debug information in selected format.\n";
+           printf("    -e          preprocess only (writes output to stdout by default)\n"
+                  "    -a          don't preprocess (assemble only)\n"
+                  "    -M          generate Makefile dependencies on stdout\n\n"
+@@ -446,7 +447,8 @@
                   "    -D<macro>[=<value>] pre-defines a macro\n"
                   "    -U<macro>   undefines a macro\n"
                   "    -w+foo      enables warnings about foo; -w-foo disables them\n"
 -                 "where foo can be:\n");
-+                 "where foo can be:\n";
-+          printf(help_text);}
++                  "where foo can be:\n");
++                             printf(help_text);}
            for (i=1; i<=ERR_WARN_MAX; i++)
-               printf("    %-16s%s (default %s)\n",
+               printf("    %-23s %s (default %s)\n",
                       suppressed_names[i], suppressed_what[i],