From: Ulf Hermann Date: Thu, 20 Apr 2017 13:55:47 +0000 (+0200) Subject: Make __attribute__ conditional in all installed headers X-Git-Tag: elfutils-0.169~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c73a00d82bbb7196c517f61cdf14c09b2b16a668;p=thirdparty%2Felfutils.git Make __attribute__ conditional in all installed headers __attribute__ is a GNU extension. If we want to link against the libraries using a different compiler, it needs to be disabled. It was already disabled in libdw.h, and this patch extends this to the other headers. We move the defines to libelf.h as that is included in all the others. Signed-off-by: Ulf Hermann --- diff --git a/libdw/ChangeLog b/libdw/ChangeLog index 19bcc9bb1..1e282e4e3 100644 --- a/libdw/ChangeLog +++ b/libdw/ChangeLog @@ -1,3 +1,8 @@ +2017-04-20 Ulf Hermann + + * libdw.h: Remove attribute macro declarations and use + __noreturn_attribute__ as defined in libelf.h. + 2017-04-20 Ulf Hermann * dwarf_begin_elf.c: Include endian.h. diff --git a/libdw/libdw.h b/libdw/libdw.h index 473e1a258..9ae80ebb3 100644 --- a/libdw/libdw.h +++ b/libdw/libdw.h @@ -34,23 +34,6 @@ #include #include - -#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) -# define __nonnull_attribute__(...) __attribute__ ((__nonnull__ (__VA_ARGS__))) -# define __deprecated_attribute__ __attribute__ ((__deprecated__)) -#else -# define __nonnull_attribute__(args...) -# define __deprecated_attribute__ -#endif - - -#ifdef __GNUC_STDC_INLINE__ -# define __libdw_extern_inline extern __inline __attribute__ ((__gnu_inline__)) -#else -# define __libdw_extern_inline extern __inline -#endif - - /* Mode for the session. */ typedef enum { @@ -242,11 +225,7 @@ typedef struct Dwarf Dwarf; /* Out-Of-Memory handler. */ -#if __GNUC__ < 4 -typedef void (*Dwarf_OOM) (void); -#else -typedef void (*__attribute__ ((noreturn)) Dwarf_OOM) (void); -#endif +typedef void (*__noreturn_attribute__ Dwarf_OOM) (void); #ifdef __cplusplus diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog index 9de28778a..b9be1bce1 100644 --- a/libdwfl/ChangeLog +++ b/libdwfl/ChangeLog @@ -1,3 +1,7 @@ +2017-04-20 Ulf Hermann + + * libdwfl.h: Use __const_attribute__. + 2017-04-20 Ulf Hermann * elf-from-memory.c: Explicitly cast phnum to size_t. diff --git a/libdwfl/libdwfl.h b/libdwfl/libdwfl.h index aea8b9931..a0c1d3573 100644 --- a/libdwfl/libdwfl.h +++ b/libdwfl/libdwfl.h @@ -385,7 +385,7 @@ extern int dwfl_linux_proc_find_elf (Dwfl_Module *mod, void **userdata, /* Standard argument parsing for using a standard callback set. */ struct argp; -extern const struct argp *dwfl_standard_argp (void) __attribute__ ((const)); +extern const struct argp *dwfl_standard_argp (void) __const_attribute__; /*** Relocation of addresses from Dwfl ***/ diff --git a/libebl/ChangeLog b/libebl/ChangeLog index 719d08d02..506915bad 100644 --- a/libebl/ChangeLog +++ b/libebl/ChangeLog @@ -1,3 +1,7 @@ +2017-04-20 Ulf Hermann + + * libebl.h: Use __pure_attribute__. + 2017-02-15 Ulf Hermann * eblmachineflagname.c: Include system.h. diff --git a/libebl/libebl.h b/libebl/libebl.h index c8e01fe9b..87896e4ac 100644 --- a/libebl/libebl.h +++ b/libebl/libebl.h @@ -73,13 +73,13 @@ extern void ebl_closebackend (Ebl *bh); /* Information about the descriptor. */ /* Get ELF machine. */ -extern int ebl_get_elfmachine (Ebl *ebl) __attribute__ ((__pure__)); +extern int ebl_get_elfmachine (Ebl *ebl) __pure_attribute__; /* Get ELF class. */ -extern int ebl_get_elfclass (Ebl *ebl) __attribute__ ((__pure__)); +extern int ebl_get_elfclass (Ebl *ebl) __pure_attribute__; /* Get ELF data encoding. */ -extern int ebl_get_elfdata (Ebl *ebl) __attribute__ ((__pure__)); +extern int ebl_get_elfdata (Ebl *ebl) __pure_attribute__; /* Function to call the callback functions including default ELF diff --git a/libelf/ChangeLog b/libelf/ChangeLog index 4f232289a..dd82a4331 100644 --- a/libelf/ChangeLog +++ b/libelf/ChangeLog @@ -1,3 +1,8 @@ +2017-04-20 Ulf Hermann + + * libelf.h: Define macros for various function attributes and use + them. + 2017-04-20 Ulf Hermann * elf_update.c: Set ELF_F_MMAPPED flag if we mmap from elf_update. diff --git a/libelf/libelf.h b/libelf/libelf.h index c0d6389f3..547c0f508 100644 --- a/libelf/libelf.h +++ b/libelf/libelf.h @@ -64,6 +64,30 @@ #define ELFCOMPRESS_HIPROC 0x7fffffff /* End of processor-specific. */ #endif +#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) +# define __nonnull_attribute__(...) __attribute__ ((__nonnull__ (__VA_ARGS__))) +# define __deprecated_attribute__ __attribute__ ((__deprecated__)) +# define __pure_attribute__ __attribute__ ((__pure__)) +# define __const_attribute__ __attribute__ ((__const__)) +#else +# define __nonnull_attribute__(...) +# define __deprecated_attribute__ +# define __pure_attribute__ +# define __const_attribute__ +#endif + +#if __GNUC__ < 4 +#define __noreturn_attribute__ +#else +#define __noreturn_attribute__ __attribute__ ((noreturn)) +#endif + +#ifdef __GNUC_STDC_INLINE__ +# define __libdw_extern_inline extern __inline __attribute__ ((__gnu_inline__)) +#else +# define __libdw_extern_inline extern __inline +#endif + /* Known translation types. */ typedef enum { @@ -216,7 +240,7 @@ extern int elf_end (Elf *__elf); extern int64_t elf_update (Elf *__elf, Elf_Cmd __cmd); /* Determine what kind of file is associated with ELF. */ -extern Elf_Kind elf_kind (Elf *__elf) __attribute__ ((__pure__)); +extern Elf_Kind elf_kind (Elf *__elf) __pure_attribute__; /* Get the base offset for an object file. */ extern int64_t elf_getbase (Elf *__elf); @@ -282,7 +306,7 @@ extern int elf_getshdrnum (Elf *__elf, size_t *__dst); It was agreed to make the same functionality available under a different name and obsolete the old name. */ extern int elf_getshnum (Elf *__elf, size_t *__dst) - __attribute__ ((__deprecated__)); + __deprecated_attribute__; /* Get the section index of the section header string table in the ELF @@ -294,7 +318,7 @@ extern int elf_getshdrstrndx (Elf *__elf, size_t *__dst); It was agreed to make the same functionality available under a different name and obsolete the old name. */ extern int elf_getshstrndx (Elf *__elf, size_t *__dst) - __attribute__ ((__deprecated__)); + __deprecated_attribute__; /* Retrieve section header of ELFCLASS32 binary. */ @@ -429,11 +453,11 @@ extern char *elf_rawfile (Elf *__elf, size_t *__nbytes); The result is based on version VERSION of the ELF standard. */ extern size_t elf32_fsize (Elf_Type __type, size_t __count, unsigned int __version) - __attribute__ ((__const__)); + __const_attribute__; /* Similar but this time the binary calls is ELFCLASS64. */ extern size_t elf64_fsize (Elf_Type __type, size_t __count, unsigned int __version) - __attribute__ ((__const__)); + __const_attribute__; /* Convert data structure from the representation in the file represented @@ -472,11 +496,11 @@ extern void elf_fill (int __fill); /* Compute hash value. */ extern unsigned long int elf_hash (const char *__string) - __attribute__ ((__pure__)); + __pure_attribute__; /* Compute hash value using the GNU-specific hash function. */ extern unsigned long int elf_gnu_hash (const char *__string) - __attribute__ ((__pure__)); + __pure_attribute__; /* Compute simple checksum from permanent parts of the ELF file. */