diff options
| author | Joakim Tjernlund <joakim.tjernlund@transmode.se> | 2004-10-06 06:59:57 +0000 |
|---|---|---|
| committer | Joakim Tjernlund <joakim.tjernlund@transmode.se> | 2004-10-06 06:59:57 +0000 |
| commit | e93138024a06eab6edeaa542c4660d246ef2cfce (patch) | |
| tree | be0ec2d49eea210ee478dfc2ab6ddb165cfcb5c4 /ldso | |
| parent | 2e0531ba98a9c72edfeeafb061a38571e9522c49 (diff) | |
Remove unneeded -D<somedefine>, and use instead #ifdef __somedefine__
From Peter Mazinger.
Diffstat (limited to 'ldso')
| -rw-r--r-- | ldso/ldso/Makefile | 4 | ||||
| -rw-r--r-- | ldso/ldso/dl-elf.c | 2 | ||||
| -rw-r--r-- | ldso/ldso/dl-startup.c | 2 | ||||
| -rw-r--r-- | ldso/ldso/ldso.c | 4 |
4 files changed, 4 insertions, 8 deletions
diff --git a/ldso/ldso/Makefile b/ldso/ldso/Makefile index 4196748f9..1f6476d2e 100644 --- a/ldso/ldso/Makefile +++ b/ldso/ldso/Makefile @@ -61,10 +61,6 @@ ifeq ($(strip $(SUPPORT_LD_DEBUG_EARLY)),y) XXFLAGS+=-D__SUPPORT_LD_DEBUG_EARLY__ endif -ifeq ($(strip $(FORCE_SHAREABLE_TEXT_SEGMENTS)),y) -XXFLAGS+=-DFORCE_SHAREABLE_TEXT_SEGMENTS -endif - #This stuff will not work with -fomit-frame-pointer XXFLAGS := $(XXFLAGS:-fomit-frame-pointer=) diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c index 0719680e9..7e1252df7 100644 --- a/ldso/ldso/dl-elf.c +++ b/ldso/ldso/dl-elf.c @@ -667,7 +667,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure, back again later. */ if (dynamic_info[DT_TEXTREL]) { -#ifndef FORCE_SHAREABLE_TEXT_SEGMENTS +#ifndef __FORCE_SHAREABLE_TEXT_SEGMENTS__ ppnt = (ElfW(Phdr) *)(intptr_t) & header[epnt->e_phoff]; for (i = 0; i < epnt->e_phnum; i++, ppnt++) { if (ppnt->p_type == PT_LOAD && !(ppnt->p_flags & PF_W)) diff --git a/ldso/ldso/dl-startup.c b/ldso/ldso/dl-startup.c index 4b446edac..0055435d2 100644 --- a/ldso/ldso/dl-startup.c +++ b/ldso/ldso/dl-startup.c @@ -302,7 +302,7 @@ found_got: SEND_STDERR("done scanning DYNAMIC section\n"); #endif -#ifndef FORCE_SHAREABLE_TEXT_SEGMENTS +#ifndef __FORCE_SHAREABLE_TEXT_SEGMENTS__ /* Ugly, ugly. We need to call mprotect to change the protection of the text pages so that we can do the dynamic linking. We can set the protection back again once we are done */ diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c index 52260be78..78ce5c95f 100644 --- a/ldso/ldso/ldso.c +++ b/ldso/ldso/ldso.c @@ -239,7 +239,7 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, unsigned long load_addr, app_tpnt->dynamic_info[DT_TEXTREL] = 1; dpnt++; } -#ifndef FORCE_SHAREABLE_TEXT_SEGMENTS +#ifndef __FORCE_SHAREABLE_TEXT_SEGMENTS__ /* Ugly, ugly. We need to call mprotect to change the * protection of the text pages so that we can do the * dynamic linking. We can set the protection back @@ -803,7 +803,7 @@ next_lib2: if (_dl_envp) *_dl_envp = (unsigned long) envp; -#ifndef FORCE_SHAREABLE_TEXT_SEGMENTS +#ifndef __FORCE_SHAREABLE_TEXT_SEGMENTS__ { unsigned int j; ElfW(Phdr) *myppnt; |