diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/c.c | 6 | ||||
| -rw-r--r-- | src/ir.c | 11 |
2 files changed, 13 insertions, 4 deletions
@@ -1125,9 +1125,9 @@ Unary: internstr fnname = decl->sym; decl->isbuiltin = 0; decl->sym = mkhiddensym(&fnname->c, "__func__", 1); - uint off = objnewdat(decl->sym, objout.code ? Stext : Srodata, 0, typesize(decl->ty), typealign(decl->ty)); - uchar *p = objout.code ? objout.textbegin + off : objout.rodata.p + off; - memcpy(p, fnname, typearrlen(decl->ty)-1); + assert(decl->ty.t == TYARRAY && typechild(decl->ty).t == TYCHAR); + uint siz = typesize(decl->ty); + (void) mkdatref(decl->sym, decl->ty, siz, 1, fnname, siz, 0, 1); } ex = mkexpr(ESYM, tk.span, decl->ty, .qual = decl->qual, .decl = decl - declsbuf.p); } @@ -159,12 +159,21 @@ mksymref(internstr s, enum symflags symflags) return newxcon(&con); } +static bool +textdataok(void) +{ + /* openbsd enforces R^X for .text */ + return target.os != OSopenbsd; +} + Ref mkdatref(internstr name, Type ctype, uint siz, uint align, const void *bytes, uint n, bool deref, bool funclocal) { IRDat dat = { .ctype = ctype, .align = align, .siz = siz, .name = name, .section = Srodata }; - if (funclocal && objout.code && align >= 4 && align <= targ_primsizes[TYPTR] && siz <= 16) + + if (funclocal && textdataok() && objout.code + && align >= 4 && align <= targ_primsizes[TYPTR] && siz <= 16) dat.section = Stext; assert(n <= siz && siz && align); |