diff options
| author | Fangrui Song <[email protected]> | 2019-09-16 07:44:05 -0700 |
|---|---|---|
| committer | Fangrui Song <[email protected]> | 2019-09-21 17:55:14 -0700 |
| commit | 7f044341f9f5c227d7c13c9c8ac2e9b00c8ed287 (patch) | |
| tree | 23f8f74bdf6c3a172fde8cd6d390030aede4cb82 /src/load.c | |
| parent | 8db7dfb5c41fcb52d1a571823147589ab2a03a6c (diff) | |
| download | mruby-7f044341f9f5c227d7c13c9c8ac2e9b00c8ed287.tar.gz mruby-7f044341f9f5c227d7c13c9c8ac2e9b00c8ed287.zip | |
Rename MRB_USE_ETEXT_EDATA to MRB_USE_LINK_TIME_RO_DATA_P and support lld linked programs
In lld linked programs, .rodata comes before .text, thus mrb_ro_data_p
will return false for strings in .rodata. Change the lower bound from
_etext to __ehdr_start to catch these cases. This works for ld.bfd, gold
and lld, and it does not have false positives even if .init_array does
not exist.
Remove the branch that uses _edata: strings in .data can be modified so
this is semantically incorrect. Delete the __APPLE__ branch (its
manpages say get_etext() and get_edata() are strongly discouraged).
.init_array has been adopted by most ELF platforms to supersede .ctors.
Neither _etext nor _edata is used, so rename MRB_USE_ETEXT_EDATA to
MRB_USE_EHDR_START.
Diffstat (limited to 'src/load.c')
| -rw-r--r-- | src/load.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/load.c b/src/load.c index 2aa2c576f..471ff3841 100644 --- a/src/load.c +++ b/src/load.c @@ -554,7 +554,7 @@ read_irep(mrb_state *mrb, const uint8_t *bin, size_t bufsize, uint8_t flags) mrb_irep* mrb_read_irep(mrb_state *mrb, const uint8_t *bin) { -#if defined(MRB_USE_ETEXT_EDATA) || defined(MRB_USE_CUSTOM_RO_DATA_P) +#if defined(MRB_USE_LINK_TIME_RO_DATA_P) || defined(MRB_USE_CUSTOM_RO_DATA_P) uint8_t flags = mrb_ro_data_p((char*)bin) ? FLAG_SRC_STATIC : FLAG_SRC_MALLOC; #else uint8_t flags = FLAG_SRC_STATIC; |