Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(77)

Unified Diff: bfd/gen-aout.c

Issue 124383005: GDB 7.6.50 (Closed) Base URL: http://git.chromium.org/native_client/nacl-gdb.git@upstream
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « bfd/format.c ('k') | bfd/hash.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: bfd/gen-aout.c
diff --git a/bfd/gen-aout.c b/bfd/gen-aout.c
index 45331e0c813abf9c3d95c4ba501f296d375b9974..5e791ec15aa4cc839568f3f7358e148ce0f52371 100644
--- a/bfd/gen-aout.c
+++ b/bfd/gen-aout.c
@@ -1,6 +1,5 @@
/* Generate parameters for an a.out system.
- Copyright 1990, 1991, 1992, 1993, 1994, 1995, 2001, 2002, 2005, 2007
- Free Software Foundation, Inc.
+ Copyright 1990-2013 Free Software Foundation, Inc.
This file is part of BFD, the Binary File Descriptor library.
@@ -27,58 +26,69 @@
#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);
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";
@@ -92,19 +102,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 \"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");
+ 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;
}
« no previous file with comments | « bfd/format.c ('k') | bfd/hash.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698