[PATCH v3 1/4] audit(userspace): Substitute ARMEB with ARM
AKASHI Takahiro
takahiro.akashi at linaro.org
Mon Feb 3 06:57:58 UTC 2014
On ARM, endianness doesn't make any differences on auditing.
See:
http://permalink.gmane.org/gmane.linux.ports.arm.kernel/165266
Signed-off-by: AKASHI Takahiro <takahiro.akashi at linaro.org>
---
config.h.in | 2 +-
configure | 18 +++++++++---------
configure.ac | 4 ++--
lib/Makefile.am | 4 ++--
lib/Makefile.in | 18 +++++++++---------
lib/libaudit.c | 4 ++--
lib/libaudit.h | 2 +-
lib/lookup_table.c | 14 +++++++-------
lib/machinetab.h | 12 ++++++------
lib/test/lookup_test.c | 8 ++++----
swig/audit.py | 2 +-
tools/ausyscall/ausyscall.c | 2 +-
12 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/config.h.in b/config.h.in
index fcfbec3..ae9abdf 100644
--- a/config.h.in
+++ b/config.h.in
@@ -162,7 +162,7 @@
#undef WITH_APPARMOR
/* Define if you want to enable Arm eabi processor support. */
-#undef WITH_ARMEB
+#undef WITH_ARM
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
diff --git a/configure b/configure
index 42c9efb..84f45c0 100755
--- a/configure
+++ b/configure
@@ -642,8 +642,8 @@ HAVE_PRELUDE_FALSE
HAVE_PRELUDE_TRUE
USE_AARCH64_FALSE
USE_AARCH64_TRUE
-USE_ARMEB_FALSE
-USE_ARMEB_TRUE
+USE_ARM_FALSE
+USE_ARM_TRUE
USE_ALPHA_FALSE
USE_ALPHA_TRUE
DEBUG_FALSE
@@ -13614,15 +13614,15 @@ fi
if test x$use_armeb != xno ; then
-$as_echo "#define WITH_ARMEB 1" >>confdefs.h
+$as_echo "#define WITH_ARM 1" >>confdefs.h
fi
if test x$use_armeb = xyes; then
- USE_ARMEB_TRUE=
- USE_ARMEB_FALSE='#'
+ USE_ARM_TRUE=
+ USE_ARM_FALSE='#'
else
- USE_ARMEB_TRUE='#'
- USE_ARMEB_FALSE=
+ USE_ARM_TRUE='#'
+ USE_ARM_FALSE=
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_armeb" >&5
@@ -14258,8 +14258,8 @@ if test -z "${USE_ALPHA_TRUE}" && test -z "${USE_ALPHA_FALSE}"; then
as_fn_error $? "conditional \"USE_ALPHA\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${USE_ARMEB_TRUE}" && test -z "${USE_ARMEB_FALSE}"; then
- as_fn_error $? "conditional \"USE_ARMEB\" was never defined.
+if test -z "${USE_ARM_TRUE}" && test -z "${USE_ARM_FALSE}"; then
+ as_fn_error $? "conditional \"USE_ARM\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${USE_AARCH64_TRUE}" && test -z "${USE_AARCH64_FALSE}"; then
diff --git a/configure.ac b/configure.ac
index c4f1fb6..52691cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -196,9 +196,9 @@ AS_HELP_STRING([--with-armeb],[enable Arm eabi processor support]),
use_armeb=$withval,
use_armeb=no)
if test x$use_armeb != xno ; then
- AC_DEFINE(WITH_ARMEB,1,[Define if you want to enable Arm eabi processor support.])
+ AC_DEFINE(WITH_ARM,1,[Define if you want to enable Arm eabi processor support.])
fi
-AM_CONDITIONAL(USE_ARMEB, test x$use_armeb = xyes)
+AM_CONDITIONAL(USE_ARM, test x$use_armeb = xyes)
AC_MSG_RESULT($use_armeb)
AC_MSG_CHECKING(whether to include aarch64 processor support)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 91d483b..162d41b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -49,7 +49,7 @@ BUILT_SOURCES = actiontabs.h errtabs.h fieldtabs.h flagtabs.h \
if USE_ALPHA
BUILT_SOURCES += alpha_tables.h gen_alpha_tables_h
endif
-if USE_ARMEB
+if USE_ARM
BUILT_SOURCES += armeb_tables.h gen_armeb_tables_h
endif
if USE_AARCH64
@@ -68,7 +68,7 @@ alpha_tables.h: gen_alpha_tables_h Makefile
$(PYTHON) gen_tables.py --lowercase --i2s --s2i alpha_syscall gen_alpha_tables_h $@
endif
-if USE_ARMEB
+if USE_ARM
gen_armeb_tables_h: gen_tables.c gen_tables.h armeb_table.h
$(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) -DTABLE_H=\"armeb_table.h\" -E -o $@ gen_tables.c
armeb_tables.h: gen_armeb_tables_h Makefile
diff --git a/lib/Makefile.in b/lib/Makefile.in
index d63e2ef..4075b6f 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -104,7 +104,7 @@ build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
@USE_ALPHA_TRUE at am__append_1 = alpha_tables.h
- at USE_ARMEB_TRUE@am__append_2 = armeb_tables.h
+ at USE_ARM_TRUE@am__append_2 = armeb_tables.h
@USE_AARCH64_TRUE at am__append_3 = aarch64_tables.h
noinst_PROGRAMS = gen_actiontabs_h$(EXEEXT) gen_errtabs_h$(EXEEXT) \
gen_fieldtabs_h$(EXEEXT) gen_flagtabs_h$(EXEEXT) \
@@ -115,7 +115,7 @@ noinst_PROGRAMS = gen_actiontabs_h$(EXEEXT) gen_errtabs_h$(EXEEXT) \
gen_s390x_tables_h$(EXEEXT) gen_x86_64_tables_h$(EXEEXT) \
$(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3)
@USE_ALPHA_TRUE at am__append_4 = gen_alpha_tables_h
- at USE_ARMEB_TRUE@am__append_5 = gen_armeb_tables_h
+ at USE_ARM_TRUE@am__append_5 = gen_armeb_tables_h
@USE_AARCH64_TRUE at am__append_6 = gen_aarch64_tables_h
subdir = lib
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
@@ -175,7 +175,7 @@ libaudit_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libaudit_la_LDFLAGS) $(LDFLAGS) -o $@
@USE_ALPHA_TRUE at am__EXEEXT_1 = gen_alpha_tables_h$(EXEEXT)
- at USE_ARMEB_TRUE@am__EXEEXT_2 = gen_armeb_tables_h$(EXEEXT)
+ at USE_ARM_TRUE@am__EXEEXT_2 = gen_armeb_tables_h$(EXEEXT)
@USE_AARCH64_TRUE at am__EXEEXT_3 = gen_aarch64_tables_h$(EXEEXT)
PROGRAMS = $(noinst_PROGRAMS)
am__gen_aarch64_tables_h_SOURCES_DIST = gen_tables.c gen_tables.h \
@@ -207,8 +207,8 @@ gen_alpha_tables_h_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(LDFLAGS) -o $@
am__gen_armeb_tables_h_SOURCES_DIST = gen_tables.c gen_tables.h \
armeb_table.h
- at USE_ARMEB_TRUE@am_gen_armeb_tables_h_OBJECTS = \
- at USE_ARMEB_TRUE@ gen_armeb_tables_h-gen_tables.$(OBJEXT)
+ at USE_ARM_TRUE@am_gen_armeb_tables_h_OBJECTS = \
+ at USE_ARM_TRUE@ gen_armeb_tables_h-gen_tables.$(OBJEXT)
gen_armeb_tables_h_OBJECTS = $(am_gen_armeb_tables_h_OBJECTS)
gen_armeb_tables_h_LDADD = $(LDADD)
gen_armeb_tables_h_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -591,8 +591,8 @@ gen_actiontabs_h_SOURCES = gen_tables.c gen_tables.h actiontab.h
gen_actiontabs_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="actiontab.h"'
@USE_ALPHA_TRUE at gen_alpha_tables_h_SOURCES = gen_tables.c gen_tables.h alpha_table.h
@USE_ALPHA_TRUE at gen_alpha_tables_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="alpha_table.h"'
- at USE_ARMEB_TRUE@gen_armeb_tables_h_SOURCES = gen_tables.c gen_tables.h armeb_table.h
- at USE_ARMEB_TRUE@gen_armeb_tables_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="armeb_table.h"'
+ at USE_ARM_TRUE@gen_armeb_tables_h_SOURCES = gen_tables.c gen_tables.h armeb_table.h
+ at USE_ARM_TRUE@gen_armeb_tables_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="armeb_table.h"'
@USE_AARCH64_TRUE at gen_aarch64_tables_h_SOURCES = gen_tables.c gen_tables.h aarch64_table.h
@USE_AARCH64_TRUE at gen_aarch64_tables_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="aarch64_table.h"'
gen_errtabs_h_SOURCES = gen_tables.c gen_tables.h errtab.h
@@ -1379,8 +1379,8 @@ actiontabs.h: gen_actiontabs_h Makefile
./gen_actiontabs_h --lowercase --i2s --s2i action > $@
@USE_ALPHA_TRUE at alpha_tables.h: gen_alpha_tables_h Makefile
@USE_ALPHA_TRUE@ ./gen_alpha_tables_h --lowercase --i2s --s2i alpha_syscall > $@
- at USE_ARMEB_TRUE@armeb_tables.h: gen_armeb_tables_h Makefile
- at USE_ARMEB_TRUE@ ./gen_armeb_tables_h --lowercase --i2s --s2i armeb_syscall > $@
+ at USE_ARM_TRUE@armeb_tables.h: gen_armeb_tables_h Makefile
+ at USE_ARM_TRUE@ ./gen_armeb_tables_h --lowercase --i2s --s2i armeb_syscall > $@
@USE_AARCH64_TRUE at aarch64_tables.h: gen_aarch64_tables_h Makefile
@USE_AARCH64_TRUE@ ./gen_aarch64_tables_h --lowercase --i2s --s2i aarch64_syscall > $@
errtabs.h: gen_errtabs_h Makefile
diff --git a/lib/libaudit.c b/lib/libaudit.c
index f7b6bef..7dacd36 100644
--- a/lib/libaudit.c
+++ b/lib/libaudit.c
@@ -1328,8 +1328,8 @@ int audit_rule_fieldpair_data(struct audit_rule_data **rulep, const char *pair,
if (bits == __AUDIT_ARCH_64BIT)
return -6;
break;
-#ifdef WITH_ARMEB
- case MACH_ARMEB:
+#ifdef WITH_ARM
+ case MACH_ARM:
if (bits == __AUDIT_ARCH_64BIT)
return -6;
break;
diff --git a/lib/libaudit.h b/lib/libaudit.h
index 338b2df..a155a89 100644
--- a/lib/libaudit.h
+++ b/lib/libaudit.h
@@ -416,7 +416,7 @@ typedef enum {
MACH_S390X,
MACH_S390,
MACH_ALPHA,
- MACH_ARMEB,
+ MACH_ARM,
MACH_AARCH64
} machine_t;
diff --git a/lib/lookup_table.c b/lib/lookup_table.c
index 4f4c0ae..77c754a 100644
--- a/lib/lookup_table.c
+++ b/lib/lookup_table.c
@@ -38,7 +38,7 @@
#ifdef WITH_ALPHA
#include "alpha_tables.h"
#endif
-#ifdef WITH_ARMEB
+#ifdef WITH_ARM
#include "armeb_tables.h"
#endif
#ifdef WITH_AARCH64
@@ -76,8 +76,8 @@ static const struct int_transtab elftab[] = {
#ifdef WITH_ALPHA
{ MACH_ALPHA, AUDIT_ARCH_ALPHA },
#endif
-#ifdef WITH_ARMEB
- { MACH_ARMEB, AUDIT_ARCH_ARMEB },
+#ifdef WITH_ARM
+ { MACH_ARM, AUDIT_ARCH_ARM },
#endif
#ifdef WITH_AARCH64
{ MACH_AARCH64, AUDIT_ARCH_AARCH64},
@@ -137,8 +137,8 @@ int audit_name_to_syscall(const char *sc, int machine)
found = alpha_syscall_s2i(sc, &res);
break;
#endif
-#ifdef WITH_ARMEB
- case MACH_ARMEB:
+#ifdef WITH_ARM
+ case MACH_ARM:
found = armeb_syscall_s2i(sc, &res);
break;
#endif
@@ -179,8 +179,8 @@ const char *audit_syscall_to_name(int sc, int machine)
case MACH_ALPHA:
return alpha_syscall_i2s(sc);
#endif
-#ifdef WITH_ARMEB
- case MACH_ARMEB:
+#ifdef WITH_ARM
+ case MACH_ARM:
return armeb_syscall_i2s(sc);
#endif
#ifdef WITH_AARCH64
diff --git a/lib/machinetab.h b/lib/machinetab.h
index 48eaf50..f1358ae 100644
--- a/lib/machinetab.h
+++ b/lib/machinetab.h
@@ -33,12 +33,12 @@ _S(MACH_S390, "s390" )
#ifdef WITH_ALPHA
_S(MACH_ALPHA, "alpha" )
#endif
-#ifdef WITH_ARMEB
-_S(MACH_ARMEB, "armeb" )
-_S(MACH_ARMEB, "armv5tejl")
-_S(MACH_ARMEB, "armv5tel")
-_S(MACH_ARMEB, "armv6l")
-_S(MACH_ARMEB, "armv7l")
+#ifdef WITH_ARM
+_S(MACH_ARM, "armeb" )
+_S(MACH_ARM, "armv5tejl")
+_S(MACH_ARM, "armv5tel")
+_S(MACH_ARM, "armv6l")
+_S(MACH_ARM, "armv7l")
#endif
#ifdef WITH_AARCH64
_S(MACH_AARCH64, "aarch64" )
diff --git a/lib/test/lookup_test.c b/lib/test/lookup_test.c
index 2b028c5..21893da 100644
--- a/lib/test/lookup_test.c
+++ b/lib/test/lookup_test.c
@@ -137,7 +137,7 @@ test_alpha_table(void)
}
#endif
-#ifdef WITH_ARMEB
+#ifdef WITH_ARM
static void
test_armeb_table(void)
{
@@ -146,8 +146,8 @@ test_armeb_table(void)
};
printf("Testing armeb_table...\n");
-#define I2S(I) audit_syscall_to_name((I), MACH_ARMEB)
-#define S2I(S) audit_name_to_syscall((S), MACH_ARMEB)
+#define I2S(I) audit_syscall_to_name((I), MACH_ARM)
+#define S2I(S) audit_name_to_syscall((S), MACH_ARM)
TEST_I2S(0);
TEST_S2I(-1);
#undef I2S
@@ -406,7 +406,7 @@ main(void)
#ifdef WITH_ALPHA
test_alpha_table();
#endif
-#ifdef WITH_ARMEB
+#ifdef WITH_ARM
test_armeb_table();
#endif
#ifdef WITH_AARCH64
diff --git a/swig/audit.py b/swig/audit.py
index 1feae68..a7612cf 100644
--- a/swig/audit.py
+++ b/swig/audit.py
@@ -695,7 +695,7 @@ MACH_PPC = _audit.MACH_PPC
MACH_S390X = _audit.MACH_S390X
MACH_S390 = _audit.MACH_S390
MACH_ALPHA = _audit.MACH_ALPHA
-MACH_ARMEB = _audit.MACH_ARMEB
+MACH_ARM = _audit.MACH_ARM
MACH_AARCH64 = _audit.MACH_AARCH64
FAIL_IGNORE = _audit.FAIL_IGNORE
FAIL_LOG = _audit.FAIL_LOG
diff --git a/tools/ausyscall/ausyscall.c b/tools/ausyscall/ausyscall.c
index 8d2a4b3..914900e 100644
--- a/tools/ausyscall/ausyscall.c
+++ b/tools/ausyscall/ausyscall.c
@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
stderr);
exit(1);
#endif
-#ifndef WITH_ARMEB
+#ifndef WITH_ARM
} else if (strcmp("armeb", argv[i]) == 0) {
fputs("Arm eabi processor support is not enabled\n",
stderr);
--
1.7.9.5
More information about the Linux-audit
mailing list