summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoakim Tjernlund <joakim.tjernlund@transmode.se>2004-10-05 12:06:40 +0000
committerJoakim Tjernlund <joakim.tjernlund@transmode.se>2004-10-05 12:06:40 +0000
commit9dca9ff973287f22534e8b611c6d1da0cd5e073b (patch)
treecce740392eaf847b2153b382c5c9d675cb75a38f
parent162e21b2a2eac4636195265f968cf2c7c19e5226 (diff)
Peter S. Mazinger writes:
Hello! The attached patches remove unneeded -D<somedefine>, and uses instead #ifdef __somedefine__
-rw-r--r--utils/Makefile4
-rw-r--r--utils/ldd.c2
2 files changed, 2 insertions, 4 deletions
diff --git a/utils/Makefile b/utils/Makefile
index 14b78762b..55591c244 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -29,10 +29,8 @@ else
TARGET_ICONV =
endif
+# do we really need to reset XXFLAGS?
XXFLAGS=
-ifeq ($(strip $(LDSO_LDD_SUPPORT)),y)
-XXFLAGS+= -D__LDSO_LDD_SUPPORT
-endif
ifeq ($(strip $(HAVE_SHARED)),y)
all: $(TARGETS) $(TARGET_ICONV)
diff --git a/utils/ldd.c b/utils/ldd.c
index 55433b601..cc50109fc 100644
--- a/utils/ldd.c
+++ b/utils/ldd.c
@@ -662,7 +662,7 @@ foo:
interpreter_already_found=0;
interp = find_elf_interpreter(ehdr);
-#ifdef __LDSO_LDD_SUPPORT
+#ifdef __LDSO_LDD_SUPPORT__
if (interp && (ehdr->e_type == ET_EXEC || ehdr->e_type == ET_DYN) && ehdr->e_ident[EI_CLASS] == ELFCLASSM &&
ehdr->e_ident[EI_DATA] == ELFDATAM
&& ehdr->e_ident[EI_VERSION] == EV_CURRENT && MATCH_MACHINE(ehdr->e_machine))