[Nasm-cvs] nasm/output outelf32.c,1.1,1.2

[Chuck C. <cc...@us...>]

Update of /cvsroot/nasm/nasm/output
In directory sc8-pr-cvs16:/tmp/cvs-serv19562/output

Modified Files:
	outelf32.c 
Log Message:

Allow ELF32 to be invoked either as -f elf or -f elf32



Index: outelf32.c
===================================================================
RCS file: /cvsroot/nasm/nasm/output/outelf32.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- outelf32.c	28 Apr 2007 06:18:49 -0000	1.1
+++ outelf32.c	29 Apr 2007 00:28:24 -0000	1.2
@@ -107,6 +107,7 @@
 static char elf_module[FILENAME_MAX];
 
 extern struct ofmt of_elf32;
+extern struct ofmt of_elf;
 
 #define SHN_ABS 0xFFF1
 #define SHN_COMMON 0xFFF2
@@ -1272,7 +1273,7 @@
 
 struct ofmt of_elf32 = {
     "ELF32 (i386) object files (e.g. Linux)",
-    "elf",
+    "elf32",
     NULL,
     elf32_debugs_arr,
     &null_debug_form,
@@ -1288,6 +1289,23 @@
     elf_cleanup
 };
 
+struct ofmt of_elf = {
+    "ELF (short name for ELF32) ",
+    "elf",
+    NULL,
+    elf32_debugs_arr,
+    &null_debug_form,
+    elf_stdmac,
+    elf_init,
+    elf_set_info,
+    elf_out,
+    elf_deflabel,
+    elf_section_names,
+    elf_segbase,
+    elf_directive,
+    elf_filename,
+    elf_cleanup
+};
 /* again, the stabs debugging stuff (code) */
 
 void stabs32_init(struct ofmt *of, void *id, FILE * fp, efunc error)