diff options
| author | Lukas Larsson <[email protected]> | 2017-07-03 16:30:52 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-07-03 16:30:52 +0200 |
| commit | f3c1cdd43c4f45bd0333b2ddcc9d78cbcf4c6cf0 (patch) | |
| tree | b8c011d48f5270d43b816be8e361c8523b2e2fb2 | |
| parent | 32a1dca92c0f949ef6ce2c751b23aff82f9d998f (diff) | |
| parent | 42955cbdf3b4e2f378602e16cb373970d2ac5749 (diff) | |
| download | otp-f3c1cdd43c4f45bd0333b2ddcc9d78cbcf4c6cf0.tar.gz otp-f3c1cdd43c4f45bd0333b2ddcc9d78cbcf4c6cf0.tar.bz2 otp-f3c1cdd43c4f45bd0333b2ddcc9d78cbcf4c6cf0.zip | |
Merge pull request #1491 from eltex-ecss/e2k_support
Support e2k platform
OTP-14492
| -rw-r--r-- | erts/configure.in | 1 | ||||
| -rw-r--r-- | erts/emulator/beam/sys.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/erts/configure.in b/erts/configure.in index 830e3d7776..c2002f6899 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -640,6 +640,7 @@ case $chk_arch_ in armv7l) ARCH=arm;; armv7hl) ARCH=arm;; tile) ARCH=tile;; + e2k) ARCH=e2k;; *) ARCH=noarch;; esac diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h index b6c77794d2..e8615d1140 100644 --- a/erts/emulator/beam/sys.h +++ b/erts/emulator/beam/sys.h @@ -21,7 +21,7 @@ #ifndef __SYS_H__ #define __SYS_H__ -#if !defined(__GNUC__) +#if !defined(__GNUC__) || defined(__e2k__) # define ERTS_AT_LEAST_GCC_VSN__(MAJ, MIN, PL) 0 #elif !defined(__GNUC_MINOR__) # define ERTS_AT_LEAST_GCC_VSN__(MAJ, MIN, PL) \ |