|
From: <sv...@va...> - 2006-10-04 00:49:10
|
Author: sewardj
Date: 2006-10-04 01:49:06 +0100 (Wed, 04 Oct 2006)
New Revision: 6164
Log:
Build fixes for ppc{32,64}-aix5.
Modified:
branches/AIX5/auxprogs/aix5_VKI_info.c
branches/AIX5/include/vki/vki-ppc32-aix5.h
branches/AIX5/include/vki/vki-ppc64-aix5.h
branches/AIX5/perf/ffbench.c
Modified: branches/AIX5/auxprogs/aix5_VKI_info.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/auxprogs/aix5_VKI_info.c 2006-10-04 00:10:07 UTC (rev 6=
163)
+++ branches/AIX5/auxprogs/aix5_VKI_info.c 2006-10-04 00:49:06 UTC (rev 6=
164)
@@ -43,6 +43,7 @@
printf("#define VKI_EFAULT %d\n", EFAULT);
printf("#define VKI_EMFILE %d\n", EMFILE);
printf("#define VKI_ECHILD %d\n", ECHILD);
+ printf("#define VKI_EOVERFLOW %d\n", EOVERFLOW);
printf("\n");
printf("/* ---------------- File I/O ---------------- */\n");
printf("\n");
@@ -63,6 +64,8 @@
printf("#define VKI_S_ISGID 0x%08x\n", S_ISGID);
printf("#define VKI_S_IFMT 0x%08x\n", S_IFMT);
printf("#define VKI_S_IFDIR 0x%08x\n", S_IFDIR);
+ printf("#define VKI_S_IFCHR 0x%08x\n", S_IFCHR);
+ printf("#define VKI_S_IFBLK 0x%08x\n", S_IFBLK);
printf("\n");
printf("#define VKI_F_DUPFD 0x%08x\n", F_DUPFD);
printf("#define VKI_F_SETFD 0x%08x\n", F_SETFD);
Modified: branches/AIX5/include/vki/vki-ppc32-aix5.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/include/vki/vki-ppc32-aix5.h 2006-10-04 00:10:07 UTC (r=
ev 6163)
+++ branches/AIX5/include/vki/vki-ppc32-aix5.h 2006-10-04 00:49:06 UTC (r=
ev 6164)
@@ -61,6 +61,7 @@
#define VKI_EFAULT 14
#define VKI_EMFILE 24
#define VKI_ECHILD 10
+#define VKI_EOVERFLOW 127
#define VKI_ERESTARTSYS 0 /* AIX doesn't have this */
=20
/* ---------------- File I/O ---------------- */
@@ -82,8 +83,14 @@
#define VKI_S_ISGID 0x00000400
#define VKI_S_IFMT 0x0000f000
#define VKI_S_IFDIR 0x00004000
-#define VKI_S_ISDIR(m) (((m) & VKI_S_IFMT) =3D=3D VKI_S_IFDIR)
+#define VKI_S_IFCHR 0x00002000
+#define VKI_S_IFBLK 0x00006000
=20
+/* Next 3 are from include/vki/vki-linux.h */
+#define VKI_S_ISDIR(m) (((m) & VKI_S_IFMT) =3D=3D VKI_S_IFDIR)
+#define VKI_S_ISCHR(m) (((m) & VKI_S_IFMT) =3D=3D VKI_S_IFCHR)
+#define VKI_S_ISBLK(m) (((m) & VKI_S_IFMT) =3D=3D VKI_S_IFBLK)
+
#define VKI_F_DUPFD 0x00000000
#define VKI_F_SETFD 0x00000002
#define VKI_FD_CLOEXEC 0x00000001
Modified: branches/AIX5/include/vki/vki-ppc64-aix5.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/include/vki/vki-ppc64-aix5.h 2006-10-04 00:10:07 UTC (r=
ev 6163)
+++ branches/AIX5/include/vki/vki-ppc64-aix5.h 2006-10-04 00:49:06 UTC (r=
ev 6164)
@@ -61,6 +61,7 @@
#define VKI_EFAULT 14
#define VKI_EMFILE 24
#define VKI_ECHILD 10
+#define VKI_EOVERFLOW 127
#define VKI_ERESTARTSYS 0 /* AIX doesn't have this */
=20
/* ---------------- File I/O ---------------- */
@@ -82,8 +83,14 @@
#define VKI_S_ISGID 0x00000400
#define VKI_S_IFMT 0x0000f000
#define VKI_S_IFDIR 0x00004000
-#define VKI_S_ISDIR(m) (((m) & VKI_S_IFMT) =3D=3D VKI_S_IFDIR)
+#define VKI_S_IFCHR 0x00002000
+#define VKI_S_IFBLK 0x00006000
=20
+/* Next 3 are from include/vki/vki-linux.h */
+#define VKI_S_ISDIR(m) (((m) & VKI_S_IFMT) =3D=3D VKI_S_IFDIR)
+#define VKI_S_ISCHR(m) (((m) & VKI_S_IFMT) =3D=3D VKI_S_IFCHR)
+#define VKI_S_ISBLK(m) (((m) & VKI_S_IFMT) =3D=3D VKI_S_IFBLK)
+
#define VKI_F_DUPFD 0x00000000
#define VKI_F_SETFD 0x00000002
#define VKI_FD_CLOEXEC 0x00000001
Modified: branches/AIX5/perf/ffbench.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/perf/ffbench.c 2006-10-04 00:10:07 UTC (rev 6163)
+++ branches/AIX5/perf/ffbench.c 2006-10-04 00:49:06 UTC (rev 6164)
@@ -155,16 +155,6 @@
#define max(a,b) ((a)>(b)?(a):(b))
#define min(a,b) ((a)<=3D(b)?(a):(b))
=20
-#ifndef unix
-#ifndef WIN32
-extern char *farmalloc(long s);
-#define malloc(x) farmalloc(x)
-#endif
-#define FWMODE "wb"
-#else
-#define FWMODE "w"
-#endif
-
/*
=20
Multi-dimensional fast Fourier transform
|