From ea45e3920154630de07a6d47742c4803713b25a9 Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Feb 07 2017 05:55:19 +0000
Subject: logic: assembly source generation: use elegant static symbol names.


---

diff --git a/src/logic/mdso_asmgen_dsometa.c b/src/logic/mdso_asmgen_dsometa.c
index 6cf9186..85ba2c5 100644
--- a/src/logic/mdso_asmgen_dsometa.c
+++ b/src/logic/mdso_asmgen_dsometa.c
@@ -15,7 +15,7 @@ static const char * const asm_hdr_lines[] = {
 	"\t.file     \"__%s_dso_meta.s\"\n",
 
 	"\t.section  " MDSO_META_SECTION ",\"r\"\n",
-	"\t.globl    .__dsometa_%s\n",
+	"\t.globl    .dsometa_%s\n",
 	0
 };
 
@@ -35,7 +35,7 @@ static const char * const asm_meta_lines[] = {
 static const char * const asm_libname_fmt =
 	"\n\n"
 	"\t.section  " MDSO_STRS_SECTION ",\"r0\"\n\n"
-	"._name:\n"
+	".name:\n"
 	"\t.ascii\t\"%s\\0\"\n\n";
 
 int mdso_asmgen_dsometa(
@@ -61,13 +61,13 @@ int mdso_asmgen_dsometa(
 	if ((fputs(alignstr,fout)) < 0)
 		return MDSO_FILE_ERROR(dctx);
 
-	if ((fprintf(fout,".__dsometa_%s:\n",dctx->cctx->libname)) < 0)
+	if ((fprintf(fout,".dsometa_%s:\n",dctx->cctx->libname)) < 0)
 		return MDSO_FILE_ERROR(dctx);
 
 	if ((fprintf(fout,"\t%s\t%d\t# base\n",ptrsize,0)) < 0)
 		return MDSO_FILE_ERROR(dctx);
 
-	if ((fprintf(fout,"\t%s\t%s\t# name\n",ptrsize,"._name")) < 0)
+	if ((fprintf(fout,"\t%s\t%s\t# name\n",ptrsize,".name")) < 0)
 		return MDSO_FILE_ERROR(dctx);
 
 	if ((fprintf(fout,"\t%s\t%u\t# flags\n",".long",dctx->cctx->dsoflags)) < 0)
diff --git a/src/logic/mdso_asmgen_symentry.c b/src/logic/mdso_asmgen_symentry.c
index 7db988a..fd0ec91 100644
--- a/src/logic/mdso_asmgen_symentry.c
+++ b/src/logic/mdso_asmgen_symentry.c
@@ -13,7 +13,7 @@
 
 static const char * const asm_lines[] = {
 	"\t.section  " MDSO_STRS_SECTION ",\"r0\"\n\n",
-	".__dsostr_%s:\n",
+	".symstr:\n",
 	"\t.ascii\t\"%s\\0\"\n\n"
 	"\t.section  " MDSO_SYMS_SECTION ",\"r\"\n",
 	0
@@ -55,10 +55,10 @@ int mdso_asmgen_symentry(
 	if ((fprintf(fout,"__imp_%s%s:\n",uscore,sym)) < 0)
 		return MDSO_FILE_ERROR(dctx);
 
-	if ((fprintf(fout,"\t%s\t.__dsostr_%s\n",ptrsize,sym)) < 0)
+	if ((fprintf(fout,"\t%s\t.symstr\n",ptrsize)) < 0)
 		return MDSO_FILE_ERROR(dctx);
 
-	if ((fprintf(fout,"\t%s\t.__dsometa_%s\n",ptrsize,dctx->cctx->libname)) < 0)
+	if ((fprintf(fout,"\t%s\t.dsometa_%s\n",ptrsize,dctx->cctx->libname)) < 0)
 		return MDSO_FILE_ERROR(dctx);
 
 	return 0;