mirror of
https://github.com/ETLCPP/etl.git
synced 2026-05-01 03:19:10 +08:00
Fix alternate STL utility.h for ARM6
Added ARM7 profiles.
This commit is contained in:
John Wellbelove
parent
6f9c3be9b8
commit
f277020fa0
@ -38,8 +38,8 @@ SOFTWARE.
|
||||
#include "atomic/atomic_arm.h"
|
||||
#define ETL_HAS_ATOMIC 1
|
||||
#elif defined(ETL_COMPILER_ARM6)
|
||||
#include "atomic/atomic_arm.h"
|
||||
#define ETL_HAS_ATOMIC 1
|
||||
#include "atomic/atomic_arm.h"
|
||||
#define ETL_HAS_ATOMIC 1
|
||||
#elif defined(ETL_COMPILER_GCC)
|
||||
#include "atomic/atomic_gcc_sync.h"
|
||||
#define ETL_HAS_ATOMIC 1
|
||||
|
||||
48
include/etl/profiles/armv7.h
Normal file
48
include/etl/profiles/armv7.h
Normal file
@ -0,0 +1,48 @@
|
||||
///\file
|
||||
|
||||
/******************************************************************************
|
||||
The MIT License(MIT)
|
||||
|
||||
Embedded Template Library.
|
||||
https://github.com/ETLCPP/etl
|
||||
https://www.etlcpp.com
|
||||
|
||||
Copyright(c) 2018 jwellbelove
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files(the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions :
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
******************************************************************************/
|
||||
|
||||
#ifndef ETL_ARMV7_INCLUDED
|
||||
#define ETL_ARMV7_INCLUDED
|
||||
|
||||
//*****************************************************************************
|
||||
// ARM Compiler Version 7
|
||||
//*****************************************************************************
|
||||
|
||||
#define ETL_TARGET_DEVICE_ARM
|
||||
#define ETL_TARGET_OS_NONE
|
||||
#define ETL_COMPILER_CLANG
|
||||
#define ETL_CPP11_SUPPORTED 1
|
||||
#define ETL_CPP14_SUPPORTED 1
|
||||
#define ETL_CPP17_SUPPORTED 0
|
||||
#define ETL_NO_NULLPTR_SUPPORT 0
|
||||
#define ETL_NO_LARGE_CHAR_SUPPORT 0
|
||||
#define ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED 1
|
||||
|
||||
#endif
|
||||
49
include/etl/profiles/armv7_no_stl.h
Normal file
49
include/etl/profiles/armv7_no_stl.h
Normal file
@ -0,0 +1,49 @@
|
||||
///\file
|
||||
|
||||
/******************************************************************************
|
||||
The MIT License(MIT)
|
||||
|
||||
Embedded Template Library.
|
||||
https://github.com/ETLCPP/etl
|
||||
https://www.etlcpp.com
|
||||
|
||||
Copyright(c) 2019 jwellbelove
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files(the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions :
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
******************************************************************************/
|
||||
|
||||
#ifndef ETL_ARMV7_NO_STL_INCLUDED
|
||||
#define ETL_ARMV7_NO_STL_INCLUDED
|
||||
|
||||
//*****************************************************************************
|
||||
// ARM Compiler Version 7
|
||||
//*****************************************************************************
|
||||
|
||||
#define ETL_TARGET_DEVICE_ARM
|
||||
#define ETL_TARGET_OS_NONE
|
||||
#define ETL_COMPILER_CLANG
|
||||
#define ETL_CPP11_SUPPORTED 1
|
||||
#define ETL_CPP14_SUPPORTED 1
|
||||
#define ETL_CPP17_SUPPORTED 0
|
||||
#define ETL_NO_NULLPTR_SUPPORT 0
|
||||
#define ETL_NO_LARGE_CHAR_SUPPORT 0
|
||||
#define ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED 1
|
||||
#define ETL_NO_STL
|
||||
|
||||
#endif
|
||||
@ -46,7 +46,6 @@ SOFTWARE.
|
||||
namespace std
|
||||
#endif
|
||||
{
|
||||
#if !defined(ETL_COMPILER_ARM6)
|
||||
//******************************************************************************
|
||||
template <typename T1, typename T2>
|
||||
struct pair
|
||||
@ -92,7 +91,7 @@ SOFTWARE.
|
||||
other.second = temp2;
|
||||
}
|
||||
};
|
||||
#endif
|
||||
|
||||
//******************************************************************************
|
||||
template <typename T1, typename T2>
|
||||
inline pair<T1, T2> make_pair(T1 a, T2 b)
|
||||
@ -100,7 +99,6 @@ SOFTWARE.
|
||||
return pair<T1, T2>(a, b);
|
||||
}
|
||||
|
||||
#if !defined(ETL_COMPILER_ARM6)
|
||||
//******************************************************************************
|
||||
template <typename T1, typename T2>
|
||||
inline void swap(pair<T1, T2>& a, pair<T1, T2>& b)
|
||||
@ -145,7 +143,6 @@ SOFTWARE.
|
||||
{
|
||||
return !(a < b);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if ETL_CPP11_SUPPORTED
|
||||
//******************************************************************************
|
||||
|
||||
@ -38,7 +38,7 @@ SOFTWARE.
|
||||
///\ingroup utilities
|
||||
|
||||
#define ETL_VERSION_MAJOR 14
|
||||
#define ETL_VERSION_MINOR 33
|
||||
#define ETL_VERSION_MINOR 34
|
||||
#define ETL_VERSION_PATCH 0
|
||||
|
||||
#define ETL_VERSION ETL_STRINGIFY(ETL_VERSION_MAJOR) "." ETL_STRINGIFY(ETL_VERSION_MINOR) "." ETL_STRINGIFY(ETL_VERSION_PATCH)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "Embedded Template Library",
|
||||
"version": "14.33.0",
|
||||
"version": "14.34.0",
|
||||
"authors": {
|
||||
"name": "John Wellbelove",
|
||||
"email": "<john.wellbelove@etlcpp.com>"
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
name=Embedded Template Library
|
||||
version=14.33.0
|
||||
version=14.34.0
|
||||
author= John Wellbelove <john.wellbelove@etlcpp.com>
|
||||
maintainer=John Wellbelove <john.wellbelove@etlcpp.com>
|
||||
license=MIT
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
===============================================================================
|
||||
14.34.0
|
||||
Fix alternate STL utility.h for ARM6
|
||||
Added ARM7 profiles.
|
||||
|
||||
===============================================================================
|
||||
14.33.0
|
||||
Updated unit tests to C++17
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user