d0p1/tcc-stupidos
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Parse assembler .hidden directive

Browse source 
This makes TCCs assembler understand the '.hidden symbol' directive
(and emits a STV_HIDDEN ELF symbol then).
This commit is contained in:
Michael Matz 2014-04-14 03:33:50 +02:00
parent fbda78aefe
commit a9fda392a0
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libtcc.c
View file

@ -508,6 +508,9 @@ ST_FUNC void put_extern_sym2(Sym *sym, Section *section,
if (sym->type.t & VT_IMPORT) if (sym->type.t & VT_IMPORT)
other |= 4; other |= 4;
} }
#else
if (! (sym->type.t & VT_STATIC))
other = (sym->type.t & VT_VIS_MASK) >> VT_VIS_SHIFT;
#endif #endif
if (tcc_state->leading_underscore && can_add_underscore) { if (tcc_state->leading_underscore && can_add_underscore) {
buf1[0] = '_'; buf1[0] = '_';

12
tccasm.c
View file

@ -483,6 +483,7 @@ static void asm_parse_directive(TCCState *s1)
case TOK_ASM_globl: case TOK_ASM_globl:
case TOK_ASM_global: case TOK_ASM_global:
case TOK_ASM_weak: case TOK_ASM_weak:
case TOK_ASM_hidden:
tok1 = tok; tok1 = tok;
do { do {
Sym *sym; Sym *sym;
@ -493,9 +494,12 @@ static void asm_parse_directive(TCCState *s1)
sym = label_push(&s1->asm_labels, tok, 0); sym = label_push(&s1->asm_labels, tok, 0);
sym->type.t = VT_VOID; sym->type.t = VT_VOID;
} }
sym->type.t &= ~VT_STATIC; if (tok1 != TOK_ASM_hidden)
sym->type.t &= ~VT_STATIC;
if (tok1 == TOK_ASM_weak) if (tok1 == TOK_ASM_weak)
sym->type.t |= VT_WEAK; sym->type.t |= VT_WEAK;
else if (tok1 == TOK_ASM_hidden)
sym->type.t |= STV_HIDDEN << VT_VIS_SHIFT;
next(); next();
} while (tok == ','); } while (tok == ',');
break; break;
@ -588,12 +592,12 @@ static void asm_parse_directive(TCCState *s1)
tcc_error("label not found: %s", get_tok_str(tok, NULL)); tcc_error("label not found: %s", get_tok_str(tok, NULL));
} }
next();
skip(',');
/* XXX .size name,label2-label1 */ /* XXX .size name,label2-label1 */
if (s1->warn_unsupported) if (s1->warn_unsupported)
tcc_warning("ignoring .size %s,*", get_tok_str(tok, NULL)); tcc_warning("ignoring .size %s,*", get_tok_str(tok, NULL));
next();
skip(',');
while (tok != '\n' && tok != CH_EOF) { while (tok != '\n' && tok != CH_EOF) {
next(); next();
} }
@ -622,7 +626,7 @@ static void asm_parse_directive(TCCState *s1)
} }
if (!strcmp(newtype, "function") || !strcmp(newtype, "STT_FUNC")) { if (!strcmp(newtype, "function") || !strcmp(newtype, "STT_FUNC")) {
sym->type.t = VT_FUNC; sym->type.t = (sym->type.t & ~VT_BTYPE) | VT_FUNC;
} }
else if (s1->warn_unsupported) else if (s1->warn_unsupported)
tcc_warning("change type of '%s' from 0x%x to '%s' ignored", tcc_warning("change type of '%s' from 0x%x to '%s' ignored",

1
tcctok.h
View file

@ -266,6 +266,7 @@
DEF_ASM(file) DEF_ASM(file)
DEF_ASM(globl) DEF_ASM(globl)
DEF_ASM(global) DEF_ASM(global)
DEF_ASM(hidden)
DEF_ASM(ident) DEF_ASM(ident)
DEF_ASM(size) DEF_ASM(size)
DEF_ASM(type) DEF_ASM(type)