]> granicus.if.org Git - strace/commitdiff
Use STAT64 test for the new stat64 functions
authorWichert Akkerman <wichert@deephackmode.org>
Fri, 24 Dec 1999 23:11:57 +0000 (23:11 +0000)
committerWichert Akkerman <wichert@deephackmode.org>
Fri, 24 Dec 1999 23:11:57 +0000 (23:11 +0000)
ChangeLog
file.c
util.c

index cff1870971576f09be07f83313c63d573be78ed4..b853abda4c44c223f2b5445352f2b6b4d97b437d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-12-24  Wichert Akkerman  <wakkerma@debian.org>
+
+ * file.c: protect printstat64 with STAT64 instead of linux so we can
+   compile on Linux architectures that don't have it
+
+Fri Dec 24 18:05:00 EST 1999
+
 1999-12-23  Ulrich Drepper  <drepper@cygnus.com>
 
  * file.c: Use ugly libc_stat trick also for stat64.
diff --git a/file.c b/file.c
index 149a5853c26c49119788c9187c774255189beac6..9ffb838f7b6915304b62da2adb3070a0169364ea 100644 (file)
--- a/file.c
+++ b/file.c
@@ -611,7 +611,7 @@ int addr;
        realprintstat(tcp, &statbuf);
 }
 
-#ifdef linux
+#ifdef STAT64
 static void
 printstat64(tcp, addr)
 struct tcb *tcp;
@@ -683,7 +683,9 @@ int addr;
        else
                tprintf("...}");
 }
+#endif /* STAT64 */
 
+#ifdef linux
 static void
 convertoldstat(oldbuf, newbuf)
 const struct __old_kernel_stat *oldbuf;
@@ -703,10 +705,8 @@ struct stat *newbuf;
     newbuf->st_blksize=0;      /* not supported in old_stat */
     newbuf->st_blocks=0;               /* not supported in old_stat */
 }
-#endif
 
 
-#ifdef linux
 static void
 printoldstat(tcp, addr)
 struct tcb *tcp;
diff --git a/util.c b/util.c
index 2d55f8ed771763fc5aed126f978e358841e00991..4685c5503b14f67feeab146d7c4b54d4b9ccfcf9 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1054,7 +1054,7 @@ struct tcb *tcp;
 #elif defined (POWERPC)
 #define LOOP   0x0000feeb
 #elif defined(ARM)
-#define LOOP   -1              /* almost certainly wrong, jws */
+#define LOOP   0xfeffffea
 #elif defined(MIPS)
 #define LOOP   0x1000ffff
 #elif defined(S390)