Skip to contentSkip to conversation

Fix the 64-bit macro definition of mips architecture

PATCH New sujiaxun 3 participants 4 messages Apr 26, 2021 – Apr 27, 2021

lore
Share & tools
lore

sujiaxun

author
#0 lore raw

PATCH 1/1 Fix the 64-bit macro definition of mips architecture

The mips architecture gcc does not have a built-in __arch64__, you can also use "__BITS_PER_LONG == 64"

---
 include/lapi/msgbuf.h | 2 +-
 include/lapi/sembuf.h | 2 +-
 include/lapi/shmbuf.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
include/lapi/msgbuf.h +1 -1
index f3277270d..873902e95 100644
@@ -17,7 +17,7 @@
 #if defined(__mips__)
 #define HAVE_MSQID64_DS
 
-#if defined(__arch64__)
+#if __BITS_PER_LONG == 64
 /*
  * The msqid64_ds structure for the MIPS architecture.
  * Note extra padding because this structure is passed back and forth
include/lapi/sembuf.h +1 -1
index 4ef0483a0..66579d294 100644
@@ -24,7 +24,7 @@
  * Pad space is left for 2 miscellaneous 64-bit values on mips64,
  * but used for the upper 32 bit of the time values on mips32.
  */
-#if defined(__arch64__)
+#if __BITS_PER_LONG == 64
 struct semid64_ds {
 	struct ipc64_perm sem_perm;		/* permissions .. see ipc.h */
 	long		 sem_otime;		/* last semop time */
include/lapi/shmbuf.h +1 -1
index 28ee33620..ad71d9431 100644
@@ -27,7 +27,7 @@
  * data structure when moving to 64-bit time_t.
  */
 
-#if defined(__arch64__)
+#if __BITS_PER_LONG == 64
 struct shmid64_ds {
 	struct ipc64_perm	shm_perm;	/* operation perms */
 	size_t			shm_segsz;	/* size of segment (bytes) */

--
2.20.1

author
#1 lore raw

PATCH 1/1 Fix the 64-bit macro definition of mips architecture

Hi Viresh,

Please process the patch below.

Quoted 54 lines

The mips architecture gcc does not have a built-in __arch64__, you can also use "__BITS_PER_LONG == 64"

---
  include/lapi/msgbuf.h | 2 +-
  include/lapi/sembuf.h | 2 +-
  include/lapi/shmbuf.h | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
include/lapi/msgbuf.h +1 -1
index f3277270d..873902e95 100644
@@ -17,7 +17,7 @@
  #if defined(__mips__)
  #define HAVE_MSQID64_DS
 
-#if defined(__arch64__)
+#if __BITS_PER_LONG == 64
  /*
   * The msqid64_ds structure for the MIPS architecture.
   * Note extra padding because this structure is passed back and forth
include/lapi/sembuf.h +1 -1
index 4ef0483a0..66579d294 100644
@@ -24,7 +24,7 @@
   * Pad space is left for 2 miscellaneous 64-bit values on mips64,
   * but used for the upper 32 bit of the time values on mips32.
   */
-#if defined(__arch64__)
+#if __BITS_PER_LONG == 64
  struct semid64_ds {
  	struct ipc64_perm sem_perm;		/* permissions .. see ipc.h */
  	long		 sem_otime;		/* last semop time */
include/lapi/shmbuf.h +1 -2
index 28ee33620..ad71d9431 100644
@@ -27,7 +27,7 @@
   * data structure when moving to 64-bit time_t.
   */
 
-#if defined(__arch64__)
+#if __BITS_PER_LONG == 64
  struct shmid64_ds {
  	struct ipc64_perm	shm_perm;	/* operation perms */
  	size_t			shm_segsz;	/* size of segment (bytes) */
--

2.20.1

#2 lore raw

PATCH 1/1 Fix the 64-bit macro definition of mips architecture

Quoted 49 lines · sujiaxun

Hi Viresh,

Please process the patch below.

Quoted 44 lines

The mips architecture gcc does not have a built-in __arch64__, you can also use "__BITS_PER_LONG == 64"

---
  include/lapi/msgbuf.h | 2 +-
  include/lapi/sembuf.h | 2 +-
  include/lapi/shmbuf.h | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
include/lapi/msgbuf.h +1 -1
index f3277270d..873902e95 100644
@@ -17,7 +17,7 @@
  #if defined(__mips__)
  #define HAVE_MSQID64_DS
 
-#if defined(__arch64__)
+#if __BITS_PER_LONG == 64
  /*
   * The msqid64_ds structure for the MIPS architecture.
   * Note extra padding because this structure is passed back and forth
include/lapi/sembuf.h +1 -1
index 4ef0483a0..66579d294 100644
@@ -24,7 +24,7 @@
   * Pad space is left for 2 miscellaneous 64-bit values on mips64,
   * but used for the upper 32 bit of the time values on mips32.
   */
-#if defined(__arch64__)
+#if __BITS_PER_LONG == 64
  struct semid64_ds {
  	struct ipc64_perm sem_perm;		/* permissions .. see ipc.h */
  	long		 sem_otime;		/* last semop time */
include/lapi/shmbuf.h +0 -0
index 28ee33620..ad71d9431 100644
@@ -27,7 +27,7 @@
   * data structure when moving to 64-bit time_t.
   */
 
Quoted 5 lines

include/lapi/shmbuf.h line 33

Quoted 5 lines
include/lapi/shmbuf.h +1 -1
-#if defined(__arch64__)
+#if __BITS_PER_LONG == 64
  struct shmid64_ds {
  	struct ipc64_perm	shm_perm;	/* operation perms */
  	size_t			shm_segsz;	/* size of segment (bytes) */
Signature · 1 line
viresh
#3 lore raw

PATCH 1/1 Fix the 64-bit macro definition of mips architecture

In reply to sujiaxun

Hi,

Quoted 2 lines

The mips architecture gcc does not have a built-in __arch64__, you can also use "__BITS_PER_LONG == 64"

Thanks for the fix, merged!

Please next time mark new version of the patchset with -vN switch (e.g. in this case: git format-patch origin/master -v2).

Kind regards,
Petr