From: Nicholas Nethercote Date: Mon, 16 May 2005 03:36:19 +0000 (+0000) Subject: Complete restructuring of include/ directory -- I forgot about the ARM X-Git-Tag: svn/VALGRIND_3_0_0~584 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f3248aeb34c12858e16784fc898742993f9568d;p=thirdparty%2Fvalgrind.git Complete restructuring of include/ directory -- I forgot about the ARM stuff. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3734 --- diff --git a/include/Makefile.am b/include/Makefile.am index 50dffc70ed..a2a059c2f0 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -20,8 +20,10 @@ incinc_HEADERS = \ valgrind.h \ vki-linux.h \ vki-amd64-linux.h \ + vki-arm-linux.h \ vki-x86-linux.h \ vki_posixtypes-amd64-linux.h \ + vki_posixtypes-arm-linux.h \ vki_posixtypes-x86-linux.h BUILT_SOURCES = valgrind.h diff --git a/include/arm-linux/Makefile.am b/include/arm-linux/Makefile.am deleted file mode 100644 index ccd9861f87..0000000000 --- a/include/arm-linux/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -incincdir = $(includedir)/valgrind/arm-linux - -incinc_HEADERS = \ - vki_arch.h \ - vki_arch_posixtypes.h diff --git a/include/linux/.cvsignore b/include/linux/.cvsignore deleted file mode 100644 index 3dda72986f..0000000000 --- a/include/linux/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile.in -Makefile diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am deleted file mode 100644 index 4db78372d2..0000000000 --- a/include/linux/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -incincdir = $(includedir)/valgrind/linux - -incinc_HEADERS = vki.h - diff --git a/include/arm-linux/vki_arch.h b/include/vki-arm-linux.h similarity index 99% rename from include/arm-linux/vki_arch.h rename to include/vki-arm-linux.h index c477efde10..a820a17917 100644 --- a/include/arm-linux/vki_arch.h +++ b/include/vki-arm-linux.h @@ -1,6 +1,6 @@ /*--------------------------------------------------------------------*/ -/*--- ARM/Linux-specific kernel interface. arm-linux/vki_arch.h ---*/ +/*--- ARM/Linux-specific kernel interface. vki-arm-linux.h ---*/ /*--------------------------------------------------------------------*/ /* @@ -28,8 +28,8 @@ The GNU General Public License is contained in the file COPYING. */ -#ifndef __ARM_LINUX_VKI_ARCH_H -#define __ARM_LINUX_VKI_ARCH_H +#ifndef __VKI_ARM_LINUX_H +#define __VKI_ARM_LINUX_H // ARM can be big or little endian; we're only supporting little endian. #define VKI_LITTLE_ENDIAN 1 @@ -613,7 +613,7 @@ struct vki_shminfo64 { // And that's it! //---------------------------------------------------------------------- -#endif // __ARM_LINUX_VKI_ARCH_H +#endif // __VKI_ARM_LINUX_H /*--------------------------------------------------------------------*/ /*--- end ---*/ diff --git a/include/arm-linux/vki_arch_posixtypes.h b/include/vki_posixtypes-arm-linux.h similarity index 92% rename from include/arm-linux/vki_arch_posixtypes.h rename to include/vki_posixtypes-arm-linux.h index 52181526bd..de445f8073 100644 --- a/include/arm-linux/vki_arch_posixtypes.h +++ b/include/vki_posixtypes-arm-linux.h @@ -1,7 +1,7 @@ /*--------------------------------------------------------------------*/ /*--- ARM/Linux-specific kernel interface: posix types. ---*/ -/*--- arm-linux/vki_arch_posixtypes.h ---*/ +/*--- vki_posixtypes-arm-linux.h ---*/ /*--------------------------------------------------------------------*/ /* @@ -29,8 +29,8 @@ The GNU General Public License is contained in the file COPYING. */ -#ifndef __ARM_LINUX_VKI_ARCH_POSIXTYPES_H -#define __ARM_LINUX_VKI_ARCH_POSIXTYPES_H +#ifndef __VKI_POSIXTYPES_ARM_LINUX_H +#define __VKI_POSIXTYPES_ARM_LINUX_H //---------------------------------------------------------------------- // From linux-2.6.8.1/include/asm-i386/posix_types.h @@ -61,7 +61,7 @@ typedef struct { int val[2]; } __vki_kernel_fsid_t; -#endif // __ARM_LINUX_VKI_ARCH_POSIXTYPES_H +#endif // __VKI_POSIXTYPES_ARM_LINUX_H /*--------------------------------------------------------------------*/ /*--- end ---*/