diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-03-05 10:53:20 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-03-05 11:34:01 +0100 |
| commit | 77510c72dc2c49c2ade13caada77efb18a1adeb8 (patch) | |
| tree | c49b284fadea0dc599f8488e31a214a6607d6dc7 | |
| parent | capture: Fix warnings (diff) | |
| download | rtems-77510c72dc2c49c2ade13caada77efb18a1adeb8.tar.bz2 | |
libmd: Disable SHA modules for m32c
Close #2219.
| -rw-r--r-- | c/src/lib/libbsp/m32c/m32cbsp/make/custom/m32csim-testsuite.tcfg | 3 | ||||
| -rw-r--r-- | cpukit/configure.ac | 10 | ||||
| -rw-r--r-- | cpukit/libmd/Makefile.am | 2 | ||||
| -rw-r--r-- | cpukit/libmd/preinstall.am | 1 |
4 files changed, 16 insertions, 0 deletions
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/make/custom/m32csim-testsuite.tcfg b/c/src/lib/libbsp/m32c/m32cbsp/make/custom/m32csim-testsuite.tcfg index ae317d7cbd..6df129069a 100644 --- a/c/src/lib/libbsp/m32c/m32cbsp/make/custom/m32csim-testsuite.tcfg +++ b/c/src/lib/libbsp/m32c/m32cbsp/make/custom/m32csim-testsuite.tcfg @@ -4,6 +4,8 @@ include: testdata/require-tick-isr.tcfg +crypt01 +fileio flashdisk01 fsdosfsname01 jffs2_fserror @@ -13,5 +15,6 @@ jffs2_fspermission jffs2_fsrdwr jffs2_fssymlink jffs2_fstime +sha sptls01 utf8proc01 diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 27ffd81c58..5067315a50 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -385,6 +385,16 @@ esac AM_CONDITIONAL(LIBDL,[test x"$HAVE_LIBDL" = x"yes"]) AC_MSG_RESULT([$HAVE_LIBDL]) +AC_MSG_CHECKING([whether CPU supports SHA]) +case $RTEMS_CPU in + m32c) + HAVE_SHA=no ;; + *) + HAVE_SHA=yes ;; +esac +AM_CONDITIONAL(SHA,[test x"$HAVE_SHA" = x"yes"]) +AC_MSG_RESULT([$HAVE_SHA]) + RTEMS_AMPOLISH3 # Explicitly list all Makefiles here diff --git a/cpukit/libmd/Makefile.am b/cpukit/libmd/Makefile.am index 95b12da1f1..2d3f2e1ad2 100644 --- a/cpukit/libmd/Makefile.am +++ b/cpukit/libmd/Makefile.am @@ -11,8 +11,10 @@ noinst_LIBRARIES = libmd.a libmd_a_SOURCES = libmd_a_SOURCES += md4.c libmd_a_SOURCES += md5.c +if SHA libmd_a_SOURCES += sha256c.c libmd_a_SOURCES += sha512c.c +endif libmd_a_CPPFLAGS = $(AM_CPPFLAGS) endif diff --git a/cpukit/libmd/preinstall.am b/cpukit/libmd/preinstall.am index 9edfb3d75f..f4462f4193 100644 --- a/cpukit/libmd/preinstall.am +++ b/cpukit/libmd/preinstall.am @@ -34,4 +34,5 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/sha256.h $(PROJECT_INCLUDE)/sha512.h: sha512.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sha512.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/sha512.h + endif |