diff --git a/arch/arm/bits/fcntl.h b/arch/arm/bits/fcntl.h index 4518fdc5119c563e74404336a5a71e94c678ca2a..4cb1753b76733e7b74b080d39e016f5af6fdc865 100644 --- a/arch/arm/bits/fcntl.h +++ b/arch/arm/bits/fcntl.h @@ -19,8 +19,6 @@ #define O_TMPFILE 020040000 #define O_NDELAY O_NONBLOCK -#define O_ELFFILE 040 - #define F_DUPFD 0 #define F_GETFD 1 #define F_SETFD 2 diff --git a/kernel/arch/arm/bits/fcntl.h b/kernel/arch/arm/bits/fcntl.h index 86766cebab44c2f33d0eb027e0ded022015bbef4..472cd519454c1c1f48334865463fc91561189e9d 100644 --- a/kernel/arch/arm/bits/fcntl.h +++ b/kernel/arch/arm/bits/fcntl.h @@ -24,8 +24,6 @@ #define O_EXECVE 040000000 -#define O_ELFFILE 040 - #define F_DUPFD 0 #define F_GETFD 1 #define F_SETFD 2 diff --git a/ldso/dynlink.c b/ldso/dynlink.c index 37e080a213fded85dccd9bca4da530ffd2930846..e938fce0a14d6e62c317ae2ce71154c65553d97d 100644 --- a/ldso/dynlink.c +++ b/ldso/dynlink.c @@ -812,7 +812,7 @@ static int path_open(const char *name, const char *s, char *buf, size_t buf_size l = strcspn(s, ":\n"); if (l-1 >= INT_MAX) return -1; if (snprintf(buf, buf_size, "%.*s/%s", (int)l, s, name) < buf_size) { - if ((fd = open(buf, O_RDONLY | O_ELFFILE))>=0) return fd; // open(buf, O_RDONLY|O_CLOEXEC) + if ((fd = open(buf, O_RDONLY))>=0) return fd; // open(buf, O_RDONLY|O_CLOEXEC) switch (errno) { case ENOENT: case ENOTDIR: @@ -1040,7 +1040,7 @@ static struct dso *load_library(const char *name, struct dso *needed_by) } if (strchr(name, '/')) { pathname = name; - fd = open(name, O_RDONLY | O_ELFFILE); // open(name, O_RDONLY|O_CLOEXEC); + fd = open(name, O_RDONLY); // open(name, O_RDONLY|O_CLOEXEC); } else { /* Search for the name to see if it's already loaded */ for (p=head->next; p; p=p->next) {