[nasm:master] out: Elf32, Elfx32, Elf64 -- Rename unmergable routines

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  855ec5aa2c4e68394234587e16b9c1191350295a
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=855ec5aa2c4e68394234587e16b9c1191350295a
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Sun, 10 Apr 2016 17:25:45 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Sun, 24 Apr 2016 20:02:41 +0300

out: Elf32, Elfx32, Elf64 -- Rename unmergable routines

Keep them separate for a while, and merge later.

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 output/outelf32.c  | 8 ++++----
 output/outelf64.c  | 8 ++++----
 output/outelfx32.c | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/output/outelf32.c b/output/outelf32.c
index 9ad4869..d1cdf23 100644
--- a/output/outelf32.c
+++ b/output/outelf32.c
@@ -660,9 +660,9 @@ static int64_t elf_add_gsym_reloc(struct elf_section *sect,
     return r->offset;
 }
 
-static void elf_out(int32_t segto, const void *data,
-                    enum out_type type, uint64_t size,
-                    int32_t segment, int32_t wrt)
+static void elf32_out(int32_t segto, const void *data,
+		      enum out_type type, uint64_t size,
+		      int32_t segment, int32_t wrt)
 {
     struct elf_section *s;
     int64_t addr;
@@ -1374,7 +1374,7 @@ const struct ofmt of_elf32 = {
     elf_stdmac,
     elf_init,
     elf_set_info,
-    elf_out,
+    elf32_out,
     elf_deflabel,
     elf_section_names,
     elf_sectalign,
diff --git a/output/outelf64.c b/output/outelf64.c
index e05a849..db3ae2a 100644
--- a/output/outelf64.c
+++ b/output/outelf64.c
@@ -660,9 +660,9 @@ static int64_t elf_add_gsym_reloc(struct elf_section *sect,
     return r->offset;
 }
 
-static void elf_out(int32_t segto, const void *data,
-                    enum out_type type, uint64_t size,
-                    int32_t segment, int32_t wrt)
+static void elf64_out(int32_t segto, const void *data,
+		      enum out_type type, uint64_t size,
+		      int32_t segment, int32_t wrt)
 {
     struct elf_section *s;
     int64_t addr;
@@ -1445,7 +1445,7 @@ const struct ofmt of_elf64 = {
     elf_stdmac,
     elf_init,
     elf_set_info,
-    elf_out,
+    elf64_out,
     elf_deflabel,
     elf_section_names,
     elf_sectalign,
diff --git a/output/outelfx32.c b/output/outelfx32.c
index eea9b7f..711a73b 100644
--- a/output/outelfx32.c
+++ b/output/outelfx32.c
@@ -660,9 +660,9 @@ static int64_t elf_add_gsym_reloc(struct elf_section *sect,
     return r->offset;
 }
 
-static void elf_out(int32_t segto, const void *data,
-                    enum out_type type, uint64_t size,
-                    int32_t segment, int32_t wrt)
+static void elfx32_out(int32_t segto, const void *data,
+		       enum out_type type, uint64_t size,
+		       int32_t segment, int32_t wrt)
 {
     struct elf_section *s;
     int64_t addr;
@@ -1406,7 +1406,7 @@ const struct ofmt of_elfx32 = {
     elf_stdmac,
     elf_init,
     elf_set_info,
-    elf_out,
+    elfx32_out,
     elf_deflabel,
     elf_section_names,
     elf_sectalign,