include: Sync plugin-api.h with GCC

Message ID CAMe9rOq0V2R7Utd+Sj0-cNxGgQmG_WWX62NE6j+=hXOYepBBdQ@mail.gmail.com
State New
Headers show
Series
  • include: Sync plugin-api.h with GCC
Related show

Commit Message

H.J. Lu via Binutils March 24, 2020, 11:34 a.m.
On Tue, Mar 24, 2020 at 3:47 AM Martin Liška <mliska@suse.cz> wrote:
>

> On 3/23/20 4:04 PM, Martin Liška wrote:

> > On 3/20/20 3:23 PM, H.J. Lu wrote:

> >> Hi Nick,

> >>

> >> Is that OK to backport these 4 patches to 2.34 branch?

> >

> > I would like to postpone it for a while as we're discussing a problem

> > seen today:

> >

> > https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94249

> > https://gcc.gnu.org/pipermail/gcc-patches/2020-March/542497.html

>

> Ok, it's fixed now and I would like to ask H.J. to do one more sync

> of plugin-api.h:

> https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=906b3eb9df6c577d3f6e9c3ea5c9d7e4d1e90536

>


I am checking in this and will backport this patch to my 2.34
branch.

-- 
H.J.

Comments

Martin Liška March 25, 2020, 1:36 p.m. | #1
On 3/24/20 12:34 PM, H.J. Lu wrote:
> On Tue, Mar 24, 2020 at 3:47 AM Martin Liška <mliska@suse.cz> wrote:

>>

>> On 3/23/20 4:04 PM, Martin Liška wrote:

>>> On 3/20/20 3:23 PM, H.J. Lu wrote:

>>>> Hi Nick,

>>>>

>>>> Is that OK to backport these 4 patches to 2.34 branch?

>>>

>>> I would like to postpone it for a while as we're discussing a problem

>>> seen today:

>>>

>>> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94249

>>> https://gcc.gnu.org/pipermail/gcc-patches/2020-March/542497.html

>>

>> Ok, it's fixed now and I would like to ask H.J. to do one more sync

>> of plugin-api.h:

>> https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=906b3eb9df6c577d3f6e9c3ea5c9d7e4d1e90536

>>

> 

> I am checking in this and will backport this patch to my 2.34

> branch.

> 


@Nick: Can we please backport that to the official 2.34 branch?

Thanks,
Martin
Martin Liška March 25, 2020, 1:38 p.m. | #2
Adding @Nick to CC.

> @Nick: Can we please backport that to the official 2.34 branch?

> 

> Thanks,

> Martin
H.J. Lu via Binutils March 25, 2020, 1:41 p.m. | #3
Hi Martin,

> @Nick: Can we please backport that to the official 2.34 branch?


Of course, please do.  Or do you want me to do the backporting ?

Cheers
  Nick
H.J. Lu via Binutils March 25, 2020, 1:42 p.m. | #4
On Wed, Mar 25, 2020 at 6:41 AM Nick Clifton <nickc@redhat.com> wrote:
>

> Hi Martin,

>

> > @Nick: Can we please backport that to the official 2.34 branch?

>

> Of course, please do.  Or do you want me to do the backporting ?

>


I will do it.

Thanks.

-- 
H.J.
H.J. Lu via Binutils March 25, 2020, 2:10 p.m. | #5
On Wed, Mar 25, 2020 at 6:42 AM H.J. Lu <hjl.tools@gmail.com> wrote:
>

> On Wed, Mar 25, 2020 at 6:41 AM Nick Clifton <nickc@redhat.com> wrote:

> >

> > Hi Martin,

> >

> > > @Nick: Can we please backport that to the official 2.34 branch?

> >

> > Of course, please do.  Or do you want me to do the backporting ?

> >

>

> I will do it.

>


Done.  Tested with GCC 9 and GCC 10.


-- 
H.J.

Patch

From dfb68cc35803369cbd163c2ebc07fb27e81d9950 Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Tue, 24 Mar 2020 11:40:10 +0100
Subject: [PATCH] include: Sync plugin-api.h with GCC

Improve endianess detection.

	PR lto/94249
	* plugin-api.h: Add more robust endianess detection.
---
 include/ChangeLog    |  5 ++++
 include/plugin-api.h | 65 ++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/include/ChangeLog b/include/ChangeLog
index 357124762e..3d26a570ca 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@ 
+2020-03-24  Martin Liska  <mliska@suse.cz>
+
+	PR lto/94249
+	* plugin-api.h: Add more robust endianess detection.
+
 2020-03-21  Martin Liska  <mliska@suse.cz>
 
 	* plugin-api.h (enum ld_plugin_symbol_type): Remove
diff --git a/include/plugin-api.h b/include/plugin-api.h
index 673f136ce6..864d2bf91a 100644
--- a/include/plugin-api.h
+++ b/include/plugin-api.h
@@ -37,6 +37,60 @@ 
 #error cannot find uint64_t type
 #endif
 
+/* Detect endianess based on __BYTE_ORDER__ macro.  */
+#if defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && \
+    defined(__ORDER_LITTLE_ENDIAN__) && defined(__ORDER_PDP_ENDIAN__)
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#define PLUGIN_LITTLE_ENDIAN 1
+#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+#define PLUGIN_BIG_ENDIAN 1
+#elif __BYTE_ORDER__ == __ORDER_PDP_ENDIAN__
+#define PLUGIN_PDP_ENDIAN 1
+#endif
+#else
+/* Older GCC releases (<4.6.0) can make detection from glibc macros.  */
+#if defined(__GLIBC__) || defined(__GNU_LIBRARY__) || defined(__ANDROID__)
+#include <endian.h>
+#ifdef _BYTE_ORDER
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define PLUGIN_LITTLE_ENDIAN 1
+#elif __BYTE_ORDER == __BIG_ENDIAN
+#define PLUGIN_BIG_ENDIAN 1
+#endif
+#endif
+#endif
+/* Include all necessary header files based on target.  */
+#if defined(__SVR4) && defined(__sun)
+#include <sys/byteorder.h>
+#endif
+#if defined(__FreeBSD__) || defined(__NetBSD__) || \
+    defined(__DragonFly__) || defined(__minix)
+#include <sys/endian.h>
+#endif
+#if defined(__OpenBSD__)
+#include <machine/endian.h>
+#endif
+/* Detect endianess based on _BYTE_ORDER.  */
+#ifdef _BYTE_ORDER
+#if _BYTE_ORDER == _LITTLE_ENDIAN
+#define PLUGIN_LITTLE_ENDIAN 1
+#elif _BYTE_ORDER == _BIG_ENDIAN
+#define PLUGIN_BIG_ENDIAN 1
+#endif
+#endif
+/* Detect based on _WIN32.  */
+#if defined(_WIN32)
+#define PLUGIN_LITTLE_ENDIAN 1
+#endif
+/* Detect based on __BIG_ENDIAN__ and __LITTLE_ENDIAN__ */
+#ifdef __LITTLE_ENDIAN__
+#define PLUGIN_LITTLE_ENDIAN 1
+#endif
+#ifdef __BIG_ENDIAN__
+#define PLUGIN_BIG_ENDIAN 1
+#endif
+#endif
+
 #ifdef __cplusplus
 extern "C"
 {
@@ -89,16 +143,23 @@  struct ld_plugin_symbol
   char *version;
   /* This is for compatibility with older ABIs.  The older ABI defined
      only 'def' field.  */
-#ifdef __BIG_ENDIAN__
+#if PLUGIN_BIG_ENDIAN == 1
   char unused;
   char section_kind;
   char symbol_type;
   char def;
-#else
+#elif PLUGIN_LITTLE_ENDIAN == 1
   char def;
   char symbol_type;
   char section_kind;
   char unused;
+#elif PLUGIN_PDP_ENDIAN == 1
+  char symbol_type;
+  char def;
+  char unused;
+  char section_kind;
+#else
+#error "Could not detect architecture endianess"
 #endif
   int visibility;
   uint64_t size;
-- 
2.25.1