X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fgen-aout.c;h=cf0a3e943bc3f1b98445ddf947302a4ccf6199e8;hb=0ed18fa177858d67fec42babbca3fef4ae1d939f;hp=1bba14adb5bc3578843892adaa164aaabaf00390;hpb=2ee563b53258d390d7446e90a67f465d504ae44c;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/gen-aout.c b/bfd/gen-aout.c
index 1bba14adb5..cf0a3e943b 100644
--- a/bfd/gen-aout.c
+++ b/bfd/gen-aout.c
@@ -1,85 +1,97 @@
 /* Generate parameters for an a.out system.
-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 2001
-   Free Software Foundation, Inc.
+   Copyright (C) 1990-2020 Free Software Foundation, Inc.
 
-This file is part of BFD, the Binary File Descriptor library.
+   This file is part of BFD, the Binary File Descriptor library.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
 
 #include "/usr/include/a.out.h"
 #include <stdio.h>
 
+#ifndef _
+#define _(X) X
+#endif
+
 int
-main (argc, argv)
-     int argc; char** argv;
+main (int argc, char** argv)
 {
   struct exec my_exec;
   int page_size;
-  char *target = "unknown", *arch = "unknown";
-  FILE *file = fopen("gen-aout", "r");
+  char * target;
+  char * arch = "unknown";
+  FILE * file;
 
-  if (file == NULL) {
-      fprintf(stderr, "Cannot open gen-aout!\n");
+  target = argv[1];
+  if (target == NULL)
+    {
+      fprintf (stderr, "Usage: gen-aout target_name\n");
+      exit (1);
+    }
+
+  file = fopen ("gen-aout", "r");
+  if (file == NULL)
+    {
+      fprintf (stderr, "Cannot open gen-aout!\n");
       return -1;
-  }
-  if (fread(&my_exec, sizeof(struct exec), 1, file) != 1) {
+    }
+
+  if (fread (&my_exec, sizeof (struct exec), 1, file) != 1)
+    {
       fprintf(stderr, "Cannot read gen-aout!\n");
       return -1;
-  }
+    }
 
-  target = argv[1];
-  if (target == NULL) {
-      fprintf(stderr, "Usage: gen-aout target_name\n");
-      exit (1);
-  }
+  fclose (file);
 
 #ifdef N_TXTOFF
-  page_size = N_TXTOFF(my_exec);
+  page_size = N_TXTOFF (&my_exec);
   if (page_size == 0)
-    printf("#define N_HEADER_IN_TEXT(x) 1\n");
+    printf ("#define N_HEADER_IN_TEXT(x) 1\n");
   else
-    printf("#define N_HEADER_IN_TEXT(x) 0\n");
+    printf ("#define N_HEADER_IN_TEXT(x) 0\n");
 #endif
 
   printf("#define BYTES_IN_WORD %d\n", sizeof (int));
-  if (my_exec.a_entry == 0) {
-      printf("#define ENTRY_CAN_BE_ZERO\n");
-      printf("#define N_SHARED_LIB(x) 0 /* Avoids warning */\n");
-  }
-  else {
-      printf("/*#define ENTRY_CAN_BE_ZERO*/\n");
-      printf("/*#define N_SHARED_LIB(x) 0*/\n");
-  }
+  if (my_exec.a_entry == 0)
+    {
+      printf ("#define ENTRY_CAN_BE_ZERO\n");
+      printf ("#define N_SHARED_LIB(x) 0 /* Avoids warning */\n");
+    }
+  else
+    {
+      printf ("/*#define ENTRY_CAN_BE_ZERO*/\n");
+      printf ("/*#define N_SHARED_LIB(x) 0*/\n");
+    }
 
-  printf("#define TEXT_START_ADDR %d\n", my_exec.a_entry);
+  printf ("#define TEXT_START_ADDR %d\n", my_exec.a_entry);
 
 #ifdef PAGSIZ
   if (page_size == 0)
     page_size = PAGSIZ;
 #endif
+
   if (page_size != 0)
-    printf("#define TARGET_PAGE_SIZE %d\n", page_size);
+    printf ("#define TARGET_PAGE_SIZE %d\n", page_size);
   else
-    printf("/* #define TARGET_PAGE_SIZE ??? */\n");
-  printf("#define SEGMENT_SIZE TARGET_PAGE_SIZE\n");
+    printf ("/* #define TARGET_PAGE_SIZE ??? */\n");
+
+  printf ("#define SEGMENT_SIZE TARGET_PAGE_SIZE\n");
 
 #ifdef vax
   arch = "vax";
-#endif
-#ifdef m68k
-  arch = "m68k";
 #endif
   if (arch[0] == '1')
     {
@@ -87,19 +99,19 @@ main (argc, argv)
       fprintf (stderr, _("         fix DEFAULT_ARCH in the output file yourself\n"));
       arch = "unknown";
     }
-  printf("#define DEFAULT_ARCH bfd_arch_%s\n\n", arch);
-
-  printf("/* Do not \"beautify\" the CONCAT* macro args.  Traditional C will not");
-  printf("   remove whitespace added here, and thus will fail to concatenate");
-  printf("   the tokens.  */");
-  printf("\n#define MY(OP) CONCAT2 (%s_,OP)\n\n", target);
-  printf("#define TARGETNAME \"a.out-%s\"\n\n", target);
-
-  printf("#include \"bfd.h\"\n");
-  printf("#include \"sysdep.h\"\n");
-  printf("#include \"libbfd.h\"\n");
-  printf("#include \"libaout.h\"\n");
-  printf("\n#include \"aout-target.h\"\n");
+  printf ("#define DEFAULT_ARCH bfd_arch_%s\n\n", arch);
+
+  printf ("/* Do not \"beautify\" the CONCAT* macro args.  Traditional C will not");
+  printf ("   remove whitespace added here, and thus will fail to concatenate");
+  printf ("   the tokens.  */");
+  printf ("\n#define MY(OP) CONCAT2 (%s_,OP)\n\n", target);
+  printf ("#define TARGETNAME \"a.out-%s\"\n\n", target);
+
+  printf ("#include \"sysdep.h\"\n");
+  printf ("#include \"bfd.h\"\n");
+  printf ("#include \"libbfd.h\"\n");
+  printf ("#include \"libaout.h\"\n");
+  printf ("\n#include \"aout-target.h\"\n");
 
   return 0;
 }