Renamed the $PLATFORM/vki_unistd.h files as vki_unistd-$PLATFORM.h, to

match the headers files in include/.

As a consequence, coregrind/$PLATFORM directories are no longer needed,
hooray!





git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3814
This commit is contained in:
Nicholas Nethercote 2005-05-29 23:30:48 +00:00
parent f9923039ae
commit 5198d87cbe
11 changed files with 66 additions and 33 deletions

View File

@ -397,9 +397,6 @@ AC_OUTPUT(
coregrind/arm/Makefile
coregrind/x86/Makefile
coregrind/linux/Makefile
coregrind/amd64-linux/Makefile
coregrind/arm-linux/Makefile
coregrind/x86-linux/Makefile
addrcheck/Makefile
addrcheck/tests/Makefile
addrcheck/docs/Makefile

View File

@ -13,11 +13,11 @@ MODULES = \
## But when doing 'make dist', we are interested in every arch/OS/platform.
## That's what DIST_SUBDIRS specifies.
SUBDIRS = \
$(VG_ARCH) $(VG_OS) $(VG_PLATFORM) \
$(VG_ARCH) $(VG_OS) \
$(MODULES) .
DIST_SUBDIRS = \
$(VG_ARCH_ALL) $(VG_OS_ALL) $(VG_PLATFORM_ALL) \
$(VG_ARCH_ALL) $(VG_OS_ALL) \
$(MODULES) .
AM_CPPFLAGS += -DVG_LIBDIR="\"$(valdir)"\" \
@ -57,7 +57,11 @@ noinst_HEADERS = \
pub_core_transtab_asm.h \
ume.h \
vg_symtab2.h \
vg_symtypes.h
vg_symtypes.h \
vki_unistd.h \
vki_unistd-amd64-linux.h\
vki_unistd-arm-linux.h \
vki_unistd-x86-linux.h
EXTRA_DIST = \
valgrind.vs \

View File

@ -1,5 +0,0 @@
include $(top_srcdir)/Makefile.all.am
include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
noinst_HEADERS = \
vki_unistd.h

View File

@ -1,5 +0,0 @@
include $(top_srcdir)/Makefile.all.am
include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
noinst_HEADERS = \
vki_unistd.h

View File

@ -24,8 +24,8 @@
The GNU General Public License is contained in the file COPYING.
*/
#ifndef __AMD64_LINUX_VKI_UNISTD_H_
#define __AMD64_LINUX_VKI_UNISTD_H_
#ifndef __VKI_UNISTD_AMD64_LINUX_H
#define __VKI_UNISTD_AMD64_LINUX_H
// From linux-2.6.9/include/asm-x86_64/unistd.h
@ -326,4 +326,4 @@
#define __NR_waitid 247
#endif /* __AMD64_LINUX_VKI_UNISTD_H_ */
#endif /* __VKI_UNISTD_AMD64_LINUX_H */

View File

@ -24,8 +24,8 @@
The GNU General Public License is contained in the file COPYING.
*/
#ifndef __ARM_LINUX_VKI_UNISTD_H_
#define __ARM_LINUX_VKI_UNISTD_H_
#ifndef __VKI_UNISTD_ARM_LINUX_H
#define __VKI_UNISTD_ARM_LINUX_H
// From linux-2.6.8.1/include/asm-arm/unistd.h
@ -308,4 +308,4 @@
#define __NR_pciconfig_read (__NR_SYSCALL_BASE+272)
#define __NR_pciconfig_write (__NR_SYSCALL_BASE+273)
#endif /* __ARM_LINUX_VKI_UNISTD_H_ */
#endif /* __VKI_UNISTD_ARM_LINUX_H */

View File

@ -24,8 +24,8 @@
The GNU General Public License is contained in the file COPYING.
*/
#ifndef __X86_LINUX_VKI_UNISTD_H_
#define __X86_LINUX_VKI_UNISTD_H_
#ifndef __VKI_UNISTD_X86_LINUX_H
#define __VKI_UNISTD_X86_LINUX_H
// From linux-2.6.9/include/asm-i386/unistd.h
@ -315,4 +315,4 @@
#define __NR_sys_kexec_load 283
#define __NR_wait 284
#endif /* __X86_LINUX_VKI_UNISTD_H_ */
#endif /* __VKI_UNISTD_X86_LINUX_H */

49
coregrind/vki_unistd.h Normal file
View File

@ -0,0 +1,49 @@
/*--------------------------------------------------------------------*/
/*--- Generic header for Valgrind's kernel interface. ---*/
/*--- vki_unistd.h ---*/
/*--------------------------------------------------------------------*/
/*
This file is part of Valgrind, a dynamic binary instrumentation
framework.
Copyright (C) 2005 Nicholas Nethercote
njn@valgrind.org
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307, USA.
The GNU General Public License is contained in the file COPYING.
*/
#ifndef __VKI_UNISTD_H
#define __VKI_UNISTD_H
#if defined(VGP_x86_linux)
# include "vki_unistd-x86-linux.h"
#elif defined(VGP_amd64_linux)
# include "vki_unistd-amd64-linux.h"
#elif defined(VGP_arm_linux)
# include "vki_unistd-arm-linux.h"
#else
# error Unknown platform
#endif
#endif // __VKI_UNISTD_H
/*--------------------------------------------------------------------*/
/*--- end ---*/
/*--------------------------------------------------------------------*/

View File

@ -1,2 +0,0 @@
Makefile
Makefile.in

View File

@ -1,5 +0,0 @@
include $(top_srcdir)/Makefile.all.am
include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
noinst_HEADERS = \
vki_unistd.h

View File

@ -1,4 +1,4 @@
#include "../../../coregrind/x86-linux/vki_unistd.h"
#include "../../../coregrind/vki_unistd-x86-linux.h"
#include <assert.h>
#include <errno.h>