espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-06-05 12:42:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make weak symbol usage more portable:

Browse Source 
- Enable support for Green Hills Software compiler
- Define weak implementations only once except on Windows
This commit is contained in:
John Lindgren
2017-10-09 11:38:08 -04:00
parent a7e8797e0c
commit df78aade4b
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
auto/generate_test_runner.rb
View File

@ -158,7 +158,9 @@ class UnityTestRunnerGenerator
create_runtest(output, mocks) create_runtest(output, mocks)
output.puts("\n/*=======Automagically Detected Files To Include=====*/") output.puts("\n/*=======Automagically Detected Files To Include=====*/")
output.puts("#include \"#{@options[:framework]}.h\"") output.puts("#include \"#{@options[:framework]}.h\"")
output.puts('#ifdef __WIN32__')
output.puts("#include \"#{@options[:framework]}_setup.h\"") output.puts("#include \"#{@options[:framework]}_setup.h\"")
output.puts('#endif')
output.puts('#include "cmock.h"') unless mocks.empty? output.puts('#include "cmock.h"') unless mocks.empty?
output.puts('#include <setjmp.h>') output.puts('#include <setjmp.h>')
output.puts('#include <stdio.h>') output.puts('#include <stdio.h>')

2
src/unity_internals.h
View File

@ -301,7 +301,7 @@ extern void UNITY_OMIT_OUTPUT_FLUSH_HEADER_DECLARATION;
* Language Features Available * Language Features Available
*-------------------------------------------------------*/ *-------------------------------------------------------*/
#if !defined(UNITY_WEAK_ATTRIBUTE) && !defined(UNITY_WEAK_PRAGMA) #if !defined(UNITY_WEAK_ATTRIBUTE) && !defined(UNITY_WEAK_PRAGMA)
# ifdef __GNUC__ /* includes clang */ # if defined(__GNUC__) || defined(__ghs__) /* __GNUC__ includes clang */
# if !(defined(__WIN32__) && defined(__clang__)) && !defined(__TMS470__) # if !(defined(__WIN32__) && defined(__clang__)) && !defined(__TMS470__)
# define UNITY_WEAK_ATTRIBUTE __attribute__((weak)) # define UNITY_WEAK_ATTRIBUTE __attribute__((weak))
# endif # endif