Rename arch-specific arch_defs.h files to arch_defs_.h

Introduce a new arch_defs.h header that includes the corresponding
arch-specific arch_defs_.h file followed by generic arch_defs_.h file.

* linux/arch_defs.h: Rename to linux/arch_defs_.h.
* linux/aarch64/arch_defs.h: Rename to linux/aarch64/arch_defs_.h.
* linux/arm/arch_defs.h: Rename to linux/arm/arch_defs_.h.
* linux/i386/arch_defs.h: Rename to linux/i386/arch_defs_.h.
* linux/m68k/arch_defs.h: Rename to linux/m68k/arch_defs_.h.
* linux/s390/arch_defs.h: Rename to linux/s390/arch_defs_.h.
* linux/s390x/arch_defs.h: Rename to linux/s390x/arch_defs_.h.
* linux/x32/arch_defs.h: Rename to linux/x32/arch_defs_.h.
* linux/x86_64/arch_defs.h: Rename to linux/x86_64/arch_defs_.h.
* arch_defs.h: New file.
* Makefile.am (strace_SOURCES): Add it.
(EXTRA_DIST): Rename linux/*/arch_defs.h to linux/*/arch_defs_.h.

diff --git a/Makefile.am b/Makefile.am
index 39ca587d135907423aea0c19faa137c186cb2e11..510a1e2bf463a87267cfbaafa5e77b42730a4c8d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -88,6 +88,7 @@ strace_SOURCES =      \
        affinity.c      \
        aio.c           \
        alpha.c         \
+       arch_defs.h     \
        basic_filters.c \
        bind.c          \
        bjm.c           \
@@ -386,7 +387,7 @@ EXTRA_DIST =                                \
        linux/32/syscallent.h           \
        linux/64/ioctls_inc.h           \
        linux/64/syscallent.h           \
-       linux/aarch64/arch_defs.h       \
+       linux/aarch64/arch_defs_.h      \
        linux/aarch64/arch_regs.c       \
        linux/aarch64/arch_regs.h       \
        linux/aarch64/arch_rt_sigframe.c\
@@ -432,11 +433,11 @@ EXTRA_DIST =                              \
        linux/arc/set_error.c           \
        linux/arc/set_scno.c            \
        linux/arc/syscallent.h          \
-       linux/arch_defs.h               \
+       linux/arch_defs_.h              \
        linux/arch_kvm.c                \
        linux/arch_regs.h               \
        linux/arch_sigreturn.c          \
-       linux/arm/arch_defs.h           \
+       linux/arm/arch_defs_.h          \
        linux/arm/arch_regs.c           \
        linux/arm/arch_regs.h           \
        linux/arm/arch_rt_sigframe.c    \
@@ -518,7 +519,7 @@ EXTRA_DIST =                                \
        linux/hppa/signalent.h          \
        linux/hppa/syscallent.h         \
        linux/i386/arch_kvm.c           \
-       linux/i386/arch_defs.h          \
+       linux/i386/arch_defs_.h         \
        linux/i386/arch_regs.c          \
        linux/i386/arch_regs.h          \
        linux/i386/arch_rt_sigframe.c   \
@@ -549,7 +550,7 @@ EXTRA_DIST =                                \
        linux/ia64/syscallent.h         \
        linux/ia64/userent.h            \
        linux/inet_diag.h               \
-       linux/m68k/arch_defs.h          \
+       linux/m68k/arch_defs_.h         \
        linux/m68k/arch_regs.c          \
        linux/m68k/arch_regs.h          \
        linux/m68k/arch_rt_sigframe.c   \
@@ -690,7 +691,7 @@ EXTRA_DIST =                                \
        linux/riscv/syscallent.h        \
        linux/riscv/syscallent1.h       \
        linux/rt_sigframe.h             \
-       linux/s390/arch_defs.h          \
+       linux/s390/arch_defs_.h         \
        linux/s390/arch_regs.c          \
        linux/s390/arch_regs.h          \
        linux/s390/arch_rt_sigframe.c   \
@@ -707,7 +708,7 @@ EXTRA_DIST =                                \
        linux/s390/userent.h            \
        linux/s390/userent0.h           \
        linux/s390/userent1.h           \
-       linux/s390x/arch_defs.h         \
+       linux/s390x/arch_defs_.h                \
        linux/s390x/arch_regs.c         \
        linux/s390x/arch_regs.h         \
        linux/s390x/arch_rt_sigframe.c  \
@@ -822,7 +823,7 @@ EXTRA_DIST =                                \
        linux/unix_diag.h               \
        linux/userent.h                 \
        linux/userent0.h                \
-       linux/x32/arch_defs.h           \
+       linux/x32/arch_defs_.h          \
        linux/x32/arch_kvm.c            \
        linux/x32/arch_regs.c           \
        linux/x32/arch_regs.h           \
@@ -843,7 +844,7 @@ EXTRA_DIST =                                \
        linux/x32/syscallent.h          \
        linux/x32/syscallent1.h         \
        linux/x32/userent.h             \
-       linux/x86_64/arch_defs.h        \
+       linux/x86_64/arch_defs_.h       \
        linux/x86_64/arch_kvm.c         \
        linux/x86_64/arch_regs.c        \
        linux/x86_64/arch_regs.h        \

diff --git a/arch_defs.h b/arch_defs.h
new file mode 100644 (file)
index 0000000..8844151
--- /dev/null
+++ b/arch_defs.h
@@ -0,0 +1,8 @@
+/* Aarch-specific definitions.  */
+#ifndef STRACE_ARCH_DEFS_H
+#define STRACE_ARCH_DEFS_H
+
+#include "arch_defs_.h"
+#include "linux/arch_defs_.h"
+
+#endif /* !STRACE_ARCH_DEFS_H */

diff --git a/linux/aarch64/arch_defs.h b/linux/aarch64/arch_defs_.h
similarity index 100%
rename from linux/aarch64/arch_defs.h
rename to linux/aarch64/arch_defs_.h

diff --git a/linux/arch_defs.h b/linux/arch_defs.h
deleted file mode 100644 (file)
index d0d0f5b..0000000
--- a/linux/arch_defs.h
+++ /dev/null
@@ -1 +0,0 @@
-/* Fallback file for arch-specific definitions */

diff --git a/linux/arch_defs_.h b/linux/arch_defs_.h
new file mode 100644 (file)
index 0000000..18c9a03
--- /dev/null
+++ b/linux/arch_defs_.h
@@ -0,0 +1 @@
+/* Fallback file for arch-specific definitions.  */

diff --git a/linux/arm/arch_defs.h b/linux/arm/arch_defs_.h
similarity index 100%
rename from linux/arm/arch_defs.h
rename to linux/arm/arch_defs_.h

diff --git a/linux/i386/arch_defs.h b/linux/i386/arch_defs_.h
similarity index 100%
rename from linux/i386/arch_defs.h
rename to linux/i386/arch_defs_.h

diff --git a/linux/m68k/arch_defs.h b/linux/m68k/arch_defs_.h
similarity index 100%
rename from linux/m68k/arch_defs.h
rename to linux/m68k/arch_defs_.h

diff --git a/linux/s390/arch_defs.h b/linux/s390/arch_defs_.h
similarity index 100%
rename from linux/s390/arch_defs.h
rename to linux/s390/arch_defs_.h

diff --git a/linux/s390x/arch_defs.h b/linux/s390x/arch_defs_.h
similarity index 100%
rename from linux/s390x/arch_defs.h
rename to linux/s390x/arch_defs_.h

diff --git a/linux/x32/arch_defs.h b/linux/x32/arch_defs_.h
similarity index 100%
rename from linux/x32/arch_defs.h
rename to linux/x32/arch_defs_.h

diff --git a/linux/x86_64/arch_defs.h b/linux/x86_64/arch_defs_.h
similarity index 100%
rename from linux/x86_64/arch_defs.h
rename to linux/x86_64/arch_defs_.h