From 4d3a162d001a93edd285fb6603a883c30ae553ba Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Thu, 17 Oct 2019 16:06:12 -0400 Subject: [PATCH] remove use of endian.h from arch reloc.h headers, clean up building on commit 97d35a552ec5b6ddf7923dd2f9a8eb973526acea, __BYTE_ORDER is now available wherever alltypes.h is included. since reloc.h is only used from src/internal/dynlink.h, it can be assumed that __BYTE_ORDER is exposed. reloc.h is not permitted to be included in other contexts, and generally, like most arch headers, lacks inclusion guards that would allow such usage. the mips64 version mistakenly included such guards; they are removed for consistency. --- arch/aarch64/reloc.h | 2 -- arch/arm/reloc.h | 2 -- arch/microblaze/reloc.h | 2 -- arch/mips/reloc.h | 2 -- arch/mips64/reloc.h | 8 -------- arch/mipsn32/reloc.h | 2 -- arch/powerpc64/reloc.h | 2 -- arch/s390x/reloc.h | 2 -- arch/sh/reloc.h | 2 -- 9 files changed, 24 deletions(-) diff --git a/arch/aarch64/reloc.h b/arch/aarch64/reloc.h index 40cf0b28..b1b68c72 100644 --- a/arch/aarch64/reloc.h +++ b/arch/aarch64/reloc.h @@ -1,5 +1,3 @@ -#include - #if __BYTE_ORDER == __BIG_ENDIAN #define ENDIAN_SUFFIX "_be" #else diff --git a/arch/arm/reloc.h b/arch/arm/reloc.h index 2c2e7f58..d091d2ad 100644 --- a/arch/arm/reloc.h +++ b/arch/arm/reloc.h @@ -1,5 +1,3 @@ -#include - #if __BYTE_ORDER == __BIG_ENDIAN #define ENDIAN_SUFFIX "eb" #else diff --git a/arch/microblaze/reloc.h b/arch/microblaze/reloc.h index 0a030c7e..6302c6ee 100644 --- a/arch/microblaze/reloc.h +++ b/arch/microblaze/reloc.h @@ -1,5 +1,3 @@ -#include - #if __BYTE_ORDER == __LITTLE_ENDIAN #define ENDIAN_SUFFIX "el" #else diff --git a/arch/mips/reloc.h b/arch/mips/reloc.h index b3d59a45..88d23639 100644 --- a/arch/mips/reloc.h +++ b/arch/mips/reloc.h @@ -1,5 +1,3 @@ -#include - #if __mips_isa_rev >= 6 #define ISA_SUFFIX "r6" #else diff --git a/arch/mips64/reloc.h b/arch/mips64/reloc.h index bbd9bd9d..7e61e225 100644 --- a/arch/mips64/reloc.h +++ b/arch/mips64/reloc.h @@ -1,9 +1,3 @@ -#ifndef __RELOC_H__ -#define __RELOC_H__ - -#define _GNU_SOURCE -#include - #if __mips_isa_rev >= 6 #define ISA_SUFFIX "r6" #else @@ -62,5 +56,3 @@ " daddu %0, %0, $ra \n" \ ".set pop \n" \ : "=r"(*(fp)) : : "memory", "ra" ) - -#endif diff --git a/arch/mipsn32/reloc.h b/arch/mipsn32/reloc.h index 728aaab2..47c6e591 100644 --- a/arch/mipsn32/reloc.h +++ b/arch/mipsn32/reloc.h @@ -1,5 +1,3 @@ -#include - #if __mips_isa_rev >= 6 #define ISA_SUFFIX "r6" #else diff --git a/arch/powerpc64/reloc.h b/arch/powerpc64/reloc.h index 5bdaeede..2f1bba05 100644 --- a/arch/powerpc64/reloc.h +++ b/arch/powerpc64/reloc.h @@ -1,5 +1,3 @@ -#include - #if __BYTE_ORDER == __LITTLE_ENDIAN #define ENDIAN_SUFFIX "le" #else diff --git a/arch/s390x/reloc.h b/arch/s390x/reloc.h index a238dc65..6e5c1fb8 100644 --- a/arch/s390x/reloc.h +++ b/arch/s390x/reloc.h @@ -1,5 +1,3 @@ -#include - #define LDSO_ARCH "s390x" #define REL_SYMBOLIC R_390_64 diff --git a/arch/sh/reloc.h b/arch/sh/reloc.h index a1f16cb1..17b1a9a9 100644 --- a/arch/sh/reloc.h +++ b/arch/sh/reloc.h @@ -1,5 +1,3 @@ -#include - #if __BYTE_ORDER == __BIG_ENDIAN #define ENDIAN_SUFFIX "eb" #else -- 2.25.1