Skip to content

Commit

Permalink
arm-none-eabi
Browse files Browse the repository at this point in the history
  • Loading branch information
briansmith committed Aug 10, 2015
1 parent ff4a939 commit ffa6e0c
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 3 deletions.
20 changes: 20 additions & 0 deletions Configurations/10-main.conf 100644 → 100755
Expand Up @@ -21,6 +21,26 @@
thread_cflag => "(unknown)",
},

### arm-none-eabi Configurations
"arm-none-eabi" => {
inherit_from => [ "gcc" ],
cflags => "-Wall -DOPENSSL_SYS_NONE",
debug_cflags => "-O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG",
release_cflags => "-O3",
lflags => "-ldl",

bn_ops => "BN_LLONG",

cpuid_obj => "", # TODO?: "armcap.o armv4cpuid.o",
bn_obj => "", # TODO: "bn_asm.o armv4-mont.o armv4-gf2m.o"
ec_obj => "", # TODO: "ecp_nistz256.o ecp_nistz256-armv4.o"
aes_obj => "aes_cbc.o aes-armv4.o bsaes-armv7.o aesv8-armx.o",
sha1_obj => "sha256-armv4.o sha512-armv4.o",
modes_obj => "", # TODO: "ghash-armv4.o ghashv8-armx.o"

perlasm_scheme => "void",
},

#### VOS Configurations
"vos-gcc" => {
cc => "gcc",
Expand Down
6 changes: 5 additions & 1 deletion Configure
Expand Up @@ -1674,8 +1674,12 @@ while (<IN>)
}
}
$sdirs = 0 unless /\\$/;
s/fips // if (/^DIRS=/ && !$fips);
s/apps // if (/^DIRS=/ && $disabled{"apps"});
s/demos // if (/^DIRS=/ && $disabled{"demos"});
s/engines // if (/^DIRS=/ && $disabled{"engine"});
s/fips // if (/^DIRS=/ && !$fips);
s/ssl // if (/^DIRS=/ && $disabled{"tls1"});
s/test // if (/^DIRS=/ && $disabled{"test"});
s/ccgost// if (/^ENGDIRS=/ && $disabled{"gost"});
s/^VERSION=.*/VERSION=$version/;
s/^MAJOR=.*/MAJOR=$major/;
Expand Down
22 changes: 22 additions & 0 deletions configure-arm-none-eabi.sh
@@ -0,0 +1,22 @@
#!/bin/sh
CC=gcc ./Configure --prefix=build \
--cross-compile-prefix=arm-none-eabi- \
no-apps \
no-bio \
no-comp \
no-demos \
no-des \
no-dgram \
no-engine \
no-rand \
no-sock \
no-syslog \
no-test \
no-threads \
no-tls1 \
no-ui \
no-x509 \
arm-none-eabi \
-mcpu=cortex-m3 \
-march=armv7-m \
-mthumb
3 changes: 2 additions & 1 deletion crypto/pkcs7/bio_pk7.c 100644 → 100755
Expand Up @@ -57,7 +57,8 @@
#include <openssl/pkcs7.h>
#include <openssl/bio.h>

#if !defined(OPENSSL_SYS_NETWARE) && !defined(OPENSSL_SYS_VXWORKS)
#if !defined(OPENSSL_SYS_NETWARE) && !defined(OPENSSL_SYS_VXWORKS) && \
!defined(OPENSSL_SYS_NONE)
# include <memory.h>
#endif
#include <stdio.h>
Expand Down
2 changes: 1 addition & 1 deletion e_os.h 100644 → 100755
Expand Up @@ -510,7 +510,7 @@ struct servent *PASCAL getservbyname(const char *, const char *);
# define SHUTDOWN(fd) { shutdown((fd),0); closesocket(fd); }
# define SHUTDOWN2(fd) { shutdown((fd),2); closesocket(fd); }

# else
# elsif !defined(OPENSSL_NO_SOCK)

# ifndef NO_SYS_PARAM_H
# include <sys/param.h>
Expand Down
6 changes: 6 additions & 0 deletions include/openssl/e_os2.h 100644 → 100755
Expand Up @@ -70,6 +70,12 @@ extern "C" {

# define OPENSSL_SYS_UNIX

/* ---------------------- No Operating System (e.g. arm-none-eabi --------- */

# if defined(OPENSSL_SYS_NONE)
# undef OPENSSL_SYS_UNIX
# endif

/* ---------------------- NetWare ----------------------------------------- */
# if defined(NETWARE) && !defined(OPENSSL_SYS_NETWARE)
# undef OPENSSL_SYS_UNIX
Expand Down

0 comments on commit ffa6e0c

Please sign in to comment.