mailing list of musl libc
 help / color / mirror / code / Atom feed
* ppc fix
@ 2015-04-18 22:10 Justin Cormack
  2015-04-18 22:28 ` Rich Felker
  0 siblings, 1 reply; 2+ messages in thread
From: Justin Cormack @ 2015-04-18 22:10 UTC (permalink / raw)
  To: musl

[-- Attachment #1: Type: text/plain, Size: 3545 bytes --]

Starting to look at powerppc64, can you apply the following patch to
fix the detection macro, it is __PPC64__ not __PPC64. Attached as well
in case MTA mangles it.

Justin


diff --git a/arch/powerpc/bits/syscall.h b/arch/powerpc/bits/syscall.h
index acd825a..a3c2c90 100644
--- a/arch/powerpc/bits/syscall.h
+++ b/arch/powerpc/bits/syscall.h
@@ -194,7 +194,7 @@
 #define __NR_vfork                  189
 #define __NR_ugetrlimit             190
 #define __NR_readahead              191
-#if !defined(__PPC64) || defined(__ABI32)
+#if !defined(__PPC64__) || defined(__ABI32)
 #define __NR_mmap2                  192
 #define __NR_truncate64             193
 #define __NR_ftruncate64            194
@@ -208,7 +208,7 @@
 #define __NR_multiplexer            201
 #define __NR_getdents64             202
 #define __NR_pivot_root             203
-#if !defined(__PPC64) || defined(__ABI32)
+#if !defined(__PPC64__) || defined(__ABI32)
 #define __NR_fcntl64                204
 #endif
 #define __NR_madvise                205
@@ -231,7 +231,7 @@
 #define __NR_sched_setaffinity      222
 #define __NR_sched_getaffinity      223
 #define __NR_tuxcall                225
-#if !defined(__PPC64) || defined(__ABI32)
+#if !defined(__PPC64__) || defined(__ABI32)
 #define __NR_sendfile64             226
 #endif
 #define __NR_io_setup               227
@@ -261,7 +261,7 @@
 #define __NR_utimes                 251
 #define __NR_statfs64               252
 #define __NR_fstatfs64              253
-#if !defined(__PPC64) || defined(__ABI32)
+#if !defined(__PPC64__) || defined(__ABI32)
 #define __NR_fadvise64_64           254
 #endif
 #define __NR_rtas              255
@@ -299,7 +299,7 @@
 #define __NR_mknodat           288
 #define __NR_fchownat          289
 #define __NR_futimesat         290
-#if defined(__PPC64) && !defined(__ABI32)
+#if defined(__PPC64__) && !defined(__ABI32)
 #define __NR_newfstatat                291
 #else
 #define __NR_fstatat64         291
@@ -576,7 +576,7 @@
 #define SYS_vfork                  189
 #define SYS_ugetrlimit             190
 #define SYS_readahead              191
-#if !defined(__PPC64) || defined(__ABI32)
+#if !defined(__PPC64__) || defined(__ABI32)
 #define SYS_mmap2                  192
 #define SYS_truncate64             193
 #define SYS_ftruncate64            194
@@ -590,7 +590,7 @@
 #define SYS_multiplexer            201
 #define SYS_getdents64             202
 #define SYS_pivot_root             203
-#if !defined(__PPC64) || defined(__ABI32)
+#if !defined(__PPC64__) || defined(__ABI32)
 #define SYS_fcntl64                204
 #endif
 #define SYS_madvise                205
@@ -613,7 +613,7 @@
 #define SYS_sched_setaffinity      222
 #define SYS_sched_getaffinity      223
 #define SYS_tuxcall                225
-#if !defined(__PPC64) || defined(__ABI32)
+#if !defined(__PPC64__) || defined(__ABI32)
 #define SYS_sendfile64             226
 #endif
 #define SYS_io_setup               227
@@ -643,7 +643,7 @@
 #define SYS_utimes                 251
 #define SYS_statfs64               252
 #define SYS_fstatfs64              253
-#if !defined(__PPC64) || defined(__ABI32)
+#if !defined(__PPC64__) || defined(__ABI32)
 #define SYS_fadvise64_64           254
 #endif
 #define SYS_rtas               255
@@ -681,7 +681,7 @@
 #define SYS_mknodat            288
 #define SYS_fchownat           289
 #define SYS_futimesat          290
-#if defined(__PPC64) && !defined(__ABI32)
+#if defined(__PPC64__) && !defined(__ABI32)
 #define SYS_newfstatat         291
 #else
 #define SYS_fstatat64          291

[-- Attachment #2: ppcdiff --]
[-- Type: application/octet-stream, Size: 3259 bytes --]

diff --git a/arch/powerpc/bits/syscall.h b/arch/powerpc/bits/syscall.h
index acd825a..a3c2c90 100644
--- a/arch/powerpc/bits/syscall.h
+++ b/arch/powerpc/bits/syscall.h
@@ -194,7 +194,7 @@
 #define __NR_vfork                  189
 #define __NR_ugetrlimit             190
 #define __NR_readahead              191
-#if !defined(__PPC64) || defined(__ABI32)
+#if !defined(__PPC64__) || defined(__ABI32)
 #define __NR_mmap2                  192
 #define __NR_truncate64             193
 #define __NR_ftruncate64            194
@@ -208,7 +208,7 @@
 #define __NR_multiplexer            201
 #define __NR_getdents64             202
 #define __NR_pivot_root             203
-#if !defined(__PPC64) || defined(__ABI32)
+#if !defined(__PPC64__) || defined(__ABI32)
 #define __NR_fcntl64                204
 #endif
 #define __NR_madvise                205
@@ -231,7 +231,7 @@
 #define __NR_sched_setaffinity      222
 #define __NR_sched_getaffinity      223
 #define __NR_tuxcall                225
-#if !defined(__PPC64) || defined(__ABI32)
+#if !defined(__PPC64__) || defined(__ABI32)
 #define __NR_sendfile64             226
 #endif
 #define __NR_io_setup               227
@@ -261,7 +261,7 @@
 #define __NR_utimes                 251
 #define __NR_statfs64               252
 #define __NR_fstatfs64              253
-#if !defined(__PPC64) || defined(__ABI32)
+#if !defined(__PPC64__) || defined(__ABI32)
 #define __NR_fadvise64_64           254
 #endif
 #define __NR_rtas		255
@@ -299,7 +299,7 @@
 #define __NR_mknodat		288
 #define __NR_fchownat		289
 #define __NR_futimesat		290
-#if defined(__PPC64) && !defined(__ABI32)
+#if defined(__PPC64__) && !defined(__ABI32)
 #define __NR_newfstatat		291
 #else
 #define __NR_fstatat64		291
@@ -576,7 +576,7 @@
 #define SYS_vfork                  189
 #define SYS_ugetrlimit             190
 #define SYS_readahead              191
-#if !defined(__PPC64) || defined(__ABI32)
+#if !defined(__PPC64__) || defined(__ABI32)
 #define SYS_mmap2                  192
 #define SYS_truncate64             193
 #define SYS_ftruncate64            194
@@ -590,7 +590,7 @@
 #define SYS_multiplexer            201
 #define SYS_getdents64             202
 #define SYS_pivot_root             203
-#if !defined(__PPC64) || defined(__ABI32)
+#if !defined(__PPC64__) || defined(__ABI32)
 #define SYS_fcntl64                204
 #endif
 #define SYS_madvise                205
@@ -613,7 +613,7 @@
 #define SYS_sched_setaffinity      222
 #define SYS_sched_getaffinity      223
 #define SYS_tuxcall                225
-#if !defined(__PPC64) || defined(__ABI32)
+#if !defined(__PPC64__) || defined(__ABI32)
 #define SYS_sendfile64             226
 #endif
 #define SYS_io_setup               227
@@ -643,7 +643,7 @@
 #define SYS_utimes                 251
 #define SYS_statfs64               252
 #define SYS_fstatfs64              253
-#if !defined(__PPC64) || defined(__ABI32)
+#if !defined(__PPC64__) || defined(__ABI32)
 #define SYS_fadvise64_64           254
 #endif
 #define SYS_rtas		255
@@ -681,7 +681,7 @@
 #define SYS_mknodat		288
 #define SYS_fchownat		289
 #define SYS_futimesat		290
-#if defined(__PPC64) && !defined(__ABI32)
+#if defined(__PPC64__) && !defined(__ABI32)
 #define SYS_newfstatat		291
 #else
 #define SYS_fstatat64		291

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: ppc fix
  2015-04-18 22:10 ppc fix Justin Cormack
@ 2015-04-18 22:28 ` Rich Felker
  0 siblings, 0 replies; 2+ messages in thread
From: Rich Felker @ 2015-04-18 22:28 UTC (permalink / raw)
  To: musl

On Sat, Apr 18, 2015 at 11:10:17PM +0100, Justin Cormack wrote:
> Starting to look at powerppc64, can you apply the following patch to
> fix the detection macro, it is __PPC64__ not __PPC64. Attached as well
> in case MTA mangles it.
> 
> Justin
> 
> 
> diff --git a/arch/powerpc/bits/syscall.h b/arch/powerpc/bits/syscall.h
> index acd825a..a3c2c90 100644
> --- a/arch/powerpc/bits/syscall.h
> +++ b/arch/powerpc/bits/syscall.h
> @@ -194,7 +194,7 @@
>  #define __NR_vfork                  189
>  #define __NR_ugetrlimit             190
>  #define __NR_readahead              191
> -#if !defined(__PPC64) || defined(__ABI32)
> +#if !defined(__PPC64__) || defined(__ABI32)

This header is for the 32-bit powerpc arch; I'm not sure why these
#ifdefs ever got committed to begin with. As part of the arch/bits
deduplication effort (coming up) it may make sense to use a unified
source file for powerpc and powerpc64, but it would probably be
processed by the build system rather than having installed #ifdefs.

Rich


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-04-18 22:28 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-18 22:10 ppc fix Justin Cormack
2015-04-18 22:28 ` Rich Felker

Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/musl/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).