From: Florian Krohm <florian@eich-krohm.de>
Date: Wed, 13 May 2015 21:26:46 +0000 (+0000)
Subject: Changes for tilegx: Use VKI_AT_FDCWD not AT_FDCWD.
X-Git-Tag: svn/VALGRIND_3_11_0~395
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e197c8e00de3e246d4312463a1b4e0333bf3af08;p=thirdparty%2Fvalgrind.git

Changes for tilegx: Use VKI_AT_FDCWD not AT_FDCWD.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15227
---

diff --git a/coregrind/m_aspacemgr/aspacemgr-common.c b/coregrind/m_aspacemgr/aspacemgr-common.c
index 21f1e0e739..a235875536 100644
--- a/coregrind/m_aspacemgr/aspacemgr-common.c
+++ b/coregrind/m_aspacemgr/aspacemgr-common.c
@@ -247,7 +247,7 @@ SysRes ML_(am_open) ( const HChar* pathname, Int flags, Int mode )
    SysRes res = VG_(do_syscall4)(__NR_openat,
                                  VKI_AT_FDCWD, (UWord)pathname, flags, mode);
 #  elif defined(VGP_tilegx_linux)
-   SysRes res = VG_(do_syscall4)(__NR_openat, AT_FDCWD, (UWord)pathname,
+   SysRes res = VG_(do_syscall4)(__NR_openat, VKI_AT_FDCWD, (UWord)pathname,
                                  flags, mode);
 #  else
    SysRes res = VG_(do_syscall3)(__NR_open, (UWord)pathname, flags, mode);
@@ -273,8 +273,8 @@ Int ML_(am_readlink)(const HChar* path, HChar* buf, UInt bufsiz)
    res = VG_(do_syscall4)(__NR_readlinkat, VKI_AT_FDCWD,
                                            (UWord)path, (UWord)buf, bufsiz);
 #  elif defined(VGP_tilegx_linux)
-   res = VG_(do_syscall4)(__NR_readlinkat, AT_FDCWD, (UWord)path, (UWord)buf,
-                          bufsiz);
+   res = VG_(do_syscall4)(__NR_readlinkat, VKI_AT_FDCWD, (UWord)path,
+                          (UWord)buf, bufsiz);
 #  else
    res = VG_(do_syscall3)(__NR_readlink, (UWord)path, (UWord)buf, bufsiz);
 #  endif
diff --git a/coregrind/m_libcfile.c b/coregrind/m_libcfile.c
index 8506f5d614..ce442ec789 100644
--- a/coregrind/m_libcfile.c
+++ b/coregrind/m_libcfile.c
@@ -435,7 +435,7 @@ Int VG_(fcntl) ( Int fd, Int cmd, Addr arg )
 Int VG_(rename) ( const HChar* old_name, const HChar* new_name )
 {
 #  if defined(VGP_tilegx_linux)
-   SysRes res = VG_(do_syscall3)(__NR_renameat, AT_FDCWD,
+   SysRes res = VG_(do_syscall3)(__NR_renameat, VKI_AT_FDCWD,
                                  (UWord)old_name, (UWord)new_name);
 #  else
    SysRes res = VG_(do_syscall2)(__NR_rename, (UWord)old_name, (UWord)new_name);
diff --git a/include/vki/vki-scnums-tilegx-linux.h b/include/vki/vki-scnums-tilegx-linux.h
index 5d942157ac..3a780301a8 100644
--- a/include/vki/vki-scnums-tilegx-linux.h
+++ b/include/vki/vki-scnums-tilegx-linux.h
@@ -33,8 +33,6 @@
 #ifndef __VKI_SCNUMS_TILEGX_LINUX_H
 #define __VKI_SCNUMS_TILEGX_LINUX_H
 
-#define AT_FDCWD    -100
-
 /* From tilegx linux/include/asm-generic/unistd.h */
 
 #define __NR_io_setup 0