summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorguenther <guenther@openbsd.org>2017-01-20 10:40:30 +0000
committerguenther <guenther@openbsd.org>2017-01-20 10:40:30 +0000
commit6abcb73064a6e663b6a059f50cdbf9089968dd4f (patch)
tree78c96e2a9d9fc22aba8acb2f14bf36d69fe1873b
parentSplit error() into error() and warning() so error() can be marked __dead to (diff)
downloadwireguard-openbsd-6abcb73064a6e663b6a059f50cdbf9089968dd4f.tar.xz
wireguard-openbsd-6abcb73064a6e663b6a059f50cdbf9089968dd4f.zip
Delete ancient macros and unnecessary #includes
ok deraadt@
Diffstat
-rw-r--r--libexec/ld.so/aarch64/archdep.h7
-rw-r--r--libexec/ld.so/alpha/archdep.h7
-rw-r--r--libexec/ld.so/amd64/archdep.h8
-rw-r--r--libexec/ld.so/arm/archdep.h7
-rw-r--r--libexec/ld.so/hppa/archdep.h8
-rw-r--r--libexec/ld.so/i386/archdep.h8
-rw-r--r--libexec/ld.so/m88k/archdep.h7
-rw-r--r--libexec/ld.so/mips64/archdep.h3
-rw-r--r--libexec/ld.so/powerpc/archdep.h7
-rw-r--r--libexec/ld.so/sh/archdep.h7
-rw-r--r--libexec/ld.so/sparc64/archdep.h9
11 files changed, 11 insertions, 67 deletions
diff --git a/libexec/ld.so/aarch64/archdep.h b/libexec/ld.so/aarch64/archdep.h
index 48f763c940e..82d7e25714d 100644
--- a/libexec/ld.so/aarch64/archdep.h
+++ b/libexec/ld.so/aarch64/archdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: archdep.h,v 1.1 2017/01/11 14:11:27 patrick Exp $ */
+/* $OpenBSD: archdep.h,v 1.2 2017/01/20 10:40:30 guenther Exp $ */
/*
* Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -31,13 +31,8 @@
#define RELOC_TAG DT_RELA
-#define DL_MALLOC_ALIGN 4 /* Arch constraint or otherwise */
-
#define MACHID EM_AARCH64 /* ELF e_machine ID value checked */
-#define RELTYPE Elf64_Rela
-#define RELSIZE sizeof(Elf64_Rela)
-
#include <elf_abi.h>
#include <machine/reloc.h>
#include "syscall.h"
diff --git a/libexec/ld.so/alpha/archdep.h b/libexec/ld.so/alpha/archdep.h
index 5b6073fa1be..6bac4b9758f 100644
--- a/libexec/ld.so/alpha/archdep.h
+++ b/libexec/ld.so/alpha/archdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: archdep.h,v 1.18 2017/01/09 22:51:04 kettenis Exp $ */
+/* $OpenBSD: archdep.h,v 1.19 2017/01/20 10:40:30 guenther Exp $ */
/*
* Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -31,13 +31,8 @@
#define RELOC_TAG DT_RELA
-#define DL_MALLOC_ALIGN 8 /* Arch constraint or otherwise */
-
#define MACHID EM_ALPHA_EXP /* ELF e_machine ID value checked */
-#define RELTYPE Elf64_Rela
-#define RELSIZE sizeof(Elf64_Rela)
-
#include <elf_abi.h>
#include <machine/reloc.h>
#include "syscall.h"
diff --git a/libexec/ld.so/amd64/archdep.h b/libexec/ld.so/amd64/archdep.h
index 247bebf31c7..c7dc2197ca2 100644
--- a/libexec/ld.so/amd64/archdep.h
+++ b/libexec/ld.so/amd64/archdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: archdep.h,v 1.9 2017/01/09 22:51:04 kettenis Exp $ */
+/* $OpenBSD: archdep.h,v 1.10 2017/01/20 10:40:30 guenther Exp $ */
/*
* Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -31,14 +31,8 @@
#define RELOC_TAG DT_RELA
-#define DL_MALLOC_ALIGN 8 /* Arch constraint or otherwise */
-
#define MACHID EM_AMD64 /* ELF e_machine ID value checked */
-#define RELTYPE Elf32_Rela
-#define RELSIZE sizeof(Elf32_Rela)
-
-#include <sys/mman.h>
#include <elf_abi.h>
#include <machine/reloc.h>
#include "syscall.h"
diff --git a/libexec/ld.so/arm/archdep.h b/libexec/ld.so/arm/archdep.h
index b0df994afb1..5dbd286ddcd 100644
--- a/libexec/ld.so/arm/archdep.h
+++ b/libexec/ld.so/arm/archdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: archdep.h,v 1.9 2017/01/09 22:51:04 kettenis Exp $ */
+/* $OpenBSD: archdep.h,v 1.10 2017/01/20 10:40:30 guenther Exp $ */
/*
* Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -31,13 +31,8 @@
#define RELOC_TAG DT_REL
-#define DL_MALLOC_ALIGN 4 /* Arch constraint or otherwise */
-
#define MACHID EM_ARM /* ELF e_machine ID value checked */
-#define RELTYPE Elf32_Rela
-#define RELSIZE sizeof(Elf32_Rela)
-
#include <elf_abi.h>
#include <machine/reloc.h>
#include "syscall.h"
diff --git a/libexec/ld.so/hppa/archdep.h b/libexec/ld.so/hppa/archdep.h
index 11af4bbb767..6761f6ec995 100644
--- a/libexec/ld.so/hppa/archdep.h
+++ b/libexec/ld.so/hppa/archdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: archdep.h,v 1.12 2017/01/09 22:51:04 kettenis Exp $ */
+/* $OpenBSD: archdep.h,v 1.13 2017/01/20 10:40:30 guenther Exp $ */
/*
* Copyright (c) 2004 Michael Shalayeff
@@ -33,14 +33,8 @@
#define RELOC_TAG DT_RELA
#define HAVE_JMPREL 1
-#define DL_MALLOC_ALIGN 8 /* Arch constraint or otherwise */
-
#define MACHID EM_PARISC /* ELF e_machine ID value checked */
-#define RELTYPE Elf_Rela
-#define RELSIZE sizeof(Elf_Rela)
-
-#include <sys/mman.h>
#include <elf_abi.h>
#include <machine/reloc.h>
#include "syscall.h"
diff --git a/libexec/ld.so/i386/archdep.h b/libexec/ld.so/i386/archdep.h
index f3152a7ec9e..a5cf222b6b0 100644
--- a/libexec/ld.so/i386/archdep.h
+++ b/libexec/ld.so/i386/archdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: archdep.h,v 1.16 2017/01/09 22:51:04 kettenis Exp $ */
+/* $OpenBSD: archdep.h,v 1.17 2017/01/20 10:40:30 guenther Exp $ */
/*
* Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -31,14 +31,8 @@
#define RELOC_TAG DT_REL
-#define DL_MALLOC_ALIGN 8 /* Arch constraint or otherwise */
-
#define MACHID EM_386 /* ELF e_machine ID value checked */
-#define RELTYPE Elf32_Rela
-#define RELSIZE sizeof(Elf32_Rela)
-
-#include <sys/mman.h>
#include <elf_abi.h>
#include <machine/reloc.h>
#include "syscall.h"
diff --git a/libexec/ld.so/m88k/archdep.h b/libexec/ld.so/m88k/archdep.h
index 40ae479b97b..ed258002dd1 100644
--- a/libexec/ld.so/m88k/archdep.h
+++ b/libexec/ld.so/m88k/archdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: archdep.h,v 1.3 2017/01/09 22:51:04 kettenis Exp $ */
+/* $OpenBSD: archdep.h,v 1.4 2017/01/20 10:40:30 guenther Exp $ */
/*
* Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -31,13 +31,8 @@
#define RELOC_TAG DT_RELA
-#define DL_MALLOC_ALIGN 4 /* Arch constraint or otherwise */
-
#define MACHID EM_88K /* ELF e_machine ID value checked */
-#define RELTYPE Elf32_Rela
-#define RELSIZE sizeof(Elf32_Rela)
-
#include <elf_abi.h>
#include <machine/reloc.h>
#include "syscall.h"
diff --git a/libexec/ld.so/mips64/archdep.h b/libexec/ld.so/mips64/archdep.h
index 4ed01d1b96a..3eefd3dad89 100644
--- a/libexec/ld.so/mips64/archdep.h
+++ b/libexec/ld.so/mips64/archdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: archdep.h,v 1.11 2017/01/09 22:51:04 kettenis Exp $ */
+/* $OpenBSD: archdep.h,v 1.12 2017/01/20 10:40:30 guenther Exp $ */
/*
* Copyright (c) 1998-2002 Opsycon AB, Sweden.
@@ -36,7 +36,6 @@
#include "util.h"
#define RELOC_TAG DT_REL
-#define DL_MALLOC_ALIGN 8 /* Arch constraint or otherwise */
#define MACHID EM_MIPS /* ELF e_machine ID value checked */
diff --git a/libexec/ld.so/powerpc/archdep.h b/libexec/ld.so/powerpc/archdep.h
index 15f3699502a..88443873102 100644
--- a/libexec/ld.so/powerpc/archdep.h
+++ b/libexec/ld.so/powerpc/archdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: archdep.h,v 1.19 2017/01/09 22:51:04 kettenis Exp $ */
+/* $OpenBSD: archdep.h,v 1.20 2017/01/20 10:40:30 guenther Exp $ */
/*
* Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -31,13 +31,8 @@
#define RELOC_TAG DT_RELA
-#define DL_MALLOC_ALIGN 4 /* Arch constraint or otherwise */
-
#define MACHID EM_PPC /* ELF e_machine ID value checked */
-#define RELTYPE Elf32_Rela
-#define RELSIZE sizeof(Elf32_Rela)
-
#include <elf_abi.h>
#include <machine/reloc.h>
#include "syscall.h"
diff --git a/libexec/ld.so/sh/archdep.h b/libexec/ld.so/sh/archdep.h
index 46797555391..3366a1fb44c 100644
--- a/libexec/ld.so/sh/archdep.h
+++ b/libexec/ld.so/sh/archdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: archdep.h,v 1.7 2017/01/09 22:51:04 kettenis Exp $ */
+/* $OpenBSD: archdep.h,v 1.8 2017/01/20 10:40:30 guenther Exp $ */
/*
* Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -31,13 +31,8 @@
#define RELOC_TAG DT_RELA
-#define DL_MALLOC_ALIGN 4 /* Arch constraint or otherwise */
-
#define MACHID EM_SH /* ELF e_machine ID value checked */
-#define RELTYPE Elf32_Rela
-#define RELSIZE sizeof(Elf32_Rela)
-
#include <elf_abi.h>
#include <machine/reloc.h>
#include "syscall.h"
diff --git a/libexec/ld.so/sparc64/archdep.h b/libexec/ld.so/sparc64/archdep.h
index c3afd159f11..47ffa8932cd 100644
--- a/libexec/ld.so/sparc64/archdep.h
+++ b/libexec/ld.so/sparc64/archdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: archdep.h,v 1.22 2017/01/09 22:51:04 kettenis Exp $ */
+/* $OpenBSD: archdep.h,v 1.23 2017/01/20 10:40:30 guenther Exp $ */
/*
* Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -31,17 +31,10 @@
#define RELOC_TAG DT_RELA
-#define DL_MALLOC_ALIGN 8 /* Arch constraint or otherwise */
-
#define MACHID EM_SPARCV9 /* ELF e_machine ID value checked */
-#define RELTYPE Elf64_Rela
-#define RELSIZE sizeof(Elf64_Rela)
-
#include <elf_abi.h>
-#include <machine/exec.h>
#include <machine/reloc.h>
-#include <sys/syscall.h>
#include "syscall.h"
#include "util.h"
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.