summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Guenther <guenther@cvs.openbsd.org>2014-01-19 10:25:46 +0000
committerPhilip Guenther <guenther@cvs.openbsd.org>2014-01-19 10:25:46 +0000
commit452ccd02f59392747b927a11be229d66586d8b77 (patch)
tree7cdb3940730480869eb23436ceafaa490c9b9fea
parent6485194896a4ca5e8ebb5cdab32f72050531de57 (diff)
Only i386 needs mquery; delete the static inlines from amd64 and hppa
-rw-r--r--libexec/ld.so/amd64/archdep.h10
-rw-r--r--libexec/ld.so/hppa/archdep.h10
2 files changed, 2 insertions, 18 deletions
diff --git a/libexec/ld.so/amd64/archdep.h b/libexec/ld.so/amd64/archdep.h
index 364123f0476..aba43d8be83 100644
--- a/libexec/ld.so/amd64/archdep.h
+++ b/libexec/ld.so/amd64/archdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: archdep.h,v 1.4 2010/01/02 12:16:35 kettenis Exp $ */
+/* $OpenBSD: archdep.h,v 1.5 2014/01/19 10:25:45 guenther Exp $ */
/*
* Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -50,14 +50,6 @@ _dl_mmap(void *addr, unsigned int len, unsigned int prot,
flags, fd, 0, offset));
}
-static inline void *
-_dl_mquery(void *addr, unsigned int len, unsigned int prot,
- unsigned int flags, int fd, off_t offset)
-{
- return((void *)_dl__syscall((quad_t)SYS_mquery, addr, len, prot,
- flags, fd, 0, offset));
-}
-
static inline void
RELOC_REL(Elf64_Rel *r, const Elf64_Sym *s, Elf64_Addr *p, unsigned long v)
diff --git a/libexec/ld.so/hppa/archdep.h b/libexec/ld.so/hppa/archdep.h
index fba6a235d2c..b298f599757 100644
--- a/libexec/ld.so/hppa/archdep.h
+++ b/libexec/ld.so/hppa/archdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: archdep.h,v 1.8 2013/12/24 10:53:37 kettenis Exp $ */
+/* $OpenBSD: archdep.h,v 1.9 2014/01/19 10:25:45 guenther Exp $ */
/*
* Copyright (c) 2004 Michael Shalayeff
@@ -51,14 +51,6 @@ _dl_mmap(void *addr, unsigned int len, unsigned int prot,
flags, fd, 0, offset));
}
-static inline void *
-_dl_mquery(void *addr, unsigned int len, unsigned int prot,
- unsigned int flags, int fd, off_t offset)
-{
- return((void *)_dl__syscall((quad_t)SYS_mquery, addr, len, prot,
- flags, fd, 0, offset));
-}
-
static inline void
RELOC_REL(Elf_Rel *r, const Elf_Sym *s, Elf_Addr *p, unsigned long v)