Skip to content

Commit 0d4f928

Browse files
author
Nat!
committed
fix CI
1 parent e5f81fc commit 0d4f928

File tree

9 files changed

+54
-11
lines changed

9 files changed

+54
-11
lines changed

.github/workflows/mulle-sde-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
- uses: actions/checkout@v4
3737

38-
- uses: mulle-sde/github-ci@v1
38+
- uses: mulle-sde/github-ci@v2
3939

4040
- uses: mulle-cc/github-ci@v5
4141

src/mulle-objc-universe-fail.c

+1
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ void _mulle_objc_vprintf_abort( char *format, va_list args)
9999
mulle_buffer_do( buffer)
100100
{
101101
mulle_buffer_vsprintf( buffer, format ? format : "???", args);
102+
mulle_buffer_add_string( buffer, "\n");
102103
__mulle_objc_puts_abort( mulle_buffer_get_string( buffer));
103104
}
104105
abort(); // compiler stupidity

test-compiler-runtime/load-categories/CMakeLists.txt

+18-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
cmake_minimum_required(VERSION 3.1)
1+
cmake_minimum_required(VERSION 3.15)
2+
3+
4+
set(CMAKE_C_COMPILER_WORKS 1)
5+
6+
project( load-categories C)
27

38
# make the order inconvenient
49
set( SOURCES
@@ -27,6 +32,18 @@ ${SOURCES}
2732
)
2833

2934

35+
# needed to do it like this, because gcc is old
36+
# and cmake prepends the flags and gcc then
37+
# has nothing to link against yet
38+
get_filename_component( C_COMPILER_NAME "${CMAKE_C_COMPILER}" NAME_WE)
39+
40+
if( "${C_COMPILER_NAME}" MATCHES "mulle-cl*")
41+
if( CMAKE_BUILD_TYPE MATCHES "^Debug|^Test")
42+
target_compile_options( "load-categories.exe" PRIVATE -fobjc-tao)
43+
message( STATUS "TAO enabled via compiler flag")
44+
endif()
45+
endif()
46+
3047
#
3148
# needed to do it like this, because gcc is old
3249
# and cmake prepends the flags and gcc then

test-compiler-runtime/load-classes/CMakeLists.txt

+19-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
cmake_minimum_required(VERSION 3.1)
1+
cmake_minimum_required(VERSION 3.15)
2+
3+
4+
set(CMAKE_C_COMPILER_WORKS 1)
5+
6+
project( load-categories C)
7+
28

39
# make the order inconvenient
410
set( SOURCES
@@ -31,6 +37,18 @@ target_link_libraries( load-classes.exe
3137
${TEST_LIBRARIES}
3238
)
3339

40+
# needed to do it like this, because gcc is old
41+
# and cmake prepends the flags and gcc then
42+
# has nothing to link against yet
43+
get_filename_component( C_COMPILER_NAME "${CMAKE_C_COMPILER}" NAME_WE)
44+
45+
if( "${C_COMPILER_NAME}" MATCHES "mulle-cl*")
46+
if( CMAKE_BUILD_TYPE MATCHES "^Debug|^Test")
47+
target_compile_options( "load-classes.exe" PRIVATE -fobjc-tao)
48+
message( STATUS "TAO enabled via compiler flag")
49+
endif()
50+
endif()
51+
3452

3553
message( "CMAKE_C_FLAGS = ${CMAKE_C_FLAGS}")
3654
message( "CMAKE_C_FLAGS_DEBUG = ${CMAKE_C_FLAGS_DEBUG}")

test-compiler/metaabi/unwanted-promotion/CMakeLists.txt

+11-4
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,22 @@ get_filename_component( C_COMPILER_NAME "${CMAKE_C_COMPILER}" NAME_WE)
2525
if( NOT "${C_COMPILER_NAME}" MATCHES "mulle-cl*")
2626
add_definitions( -D__MULLE_OBJC_TPS__) ## tagged pointers runtime (alternative: __MULLE_OBJC_NO_TPS__)
2727
add_definitions( -D__MULLE_OBJC_FCS__) ## fast method calls (alternative: __MULLE_OBJC_NO_FMC__)
28-
if( CMAKE_BUILD_TYPE MATCHES "^Debug")
28+
message( STATUS "TPS enabled via macro")
29+
message( STATUS "FCS enabled via macro")
30+
31+
if( CMAKE_BUILD_TYPE MATCHES "^Debug|^Test")
2932
add_definitions( -D__MULLE_OBJC_TAO__) ## thread affine object (alternative: __MULLE_OBJC_NO_TAO__)
33+
message( STATUS "TAO enabled via macro")
3034
else()
3135
add_definitions( -D__MULLE_OBJC_NO_TAO__) ## thread affine object (alternative: __MULLE_OBJC_NO_TAO__)
36+
message( STATUS "TAO disabled via macro")
3237
endif()
33-
endif()
34-
35-
if( "${C_COMPILER_NAME}" MATCHES "mulle-cl*")
38+
else()
3639
target_compile_options( "unwanted-promotion.exe" PRIVATE -ObjC)
40+
if( CMAKE_BUILD_TYPE MATCHES "^Debug|^Test")
41+
target_compile_options( "unwanted-promotion.exe" PRIVATE -fobjc-tao)
42+
message( STATUS "TAO enabled via compiler flag")
43+
endif()
3744
endif()
3845

3946

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nullable is not supported in mulle-objc
1+
nullable is not supported in

test/tps/float.stdout.i686

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
00800001 (1.17549e-38) -> NO
6767
00bfffff (1.76324e-38) -> NO
6868
00ffffff (2.35099e-38) -> NO
69-
80000000 (-0) -> NO
69+
80000000 (0) -> NO
7070
80000001 (-1.4013e-45) -> NO
7171
803fffff (-5.87747e-39) -> NO
7272
807fffff (-1.17549e-38) -> NO

test/tps/float.stdout.x86_64

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
16,1=00800001 (1.17549e-38) -> TPS -> 0x400000B -> 00800001 (1.17549e-38)
6767
16,2=00bfffff (1.76324e-38) -> TPS -> 0x5FFFFFB -> 00bfffff (1.76324e-38)
6868
16,3=00ffffff (2.35099e-38) -> TPS -> 0x7FFFFFB -> 00ffffff (2.35099e-38)
69-
0,0=80000000 (-0) -> TPS -> 0x400000003 -> 80000000 (-0)
69+
0,0=80000000 (0) -> TPS -> 0x400000003 -> 80000000 (0)
7070
0,1=80000001 (-1.4013e-45) -> TPS -> 0x40000000B -> 80000001 (-1.4013e-45)
7171
0,2=803fffff (-5.87747e-39) -> TPS -> 0x401FFFFFB -> 803fffff (-5.87747e-39)
7272
0,3=807fffff (-1.17549e-38) -> TPS -> 0x403FFFFFB -> 807fffff (-1.17549e-38)

test/tps/float.stdout.x86_64.darwin

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
16,1=00800001 (1.17549e-38) -> TPS -> 0x400000B -> 00800001 (1.17549e-38)
6767
16,2=00bfffff (1.76324e-38) -> TPS -> 0x5FFFFFB -> 00bfffff (1.76324e-38)
6868
16,3=00ffffff (2.35099e-38) -> TPS -> 0x7FFFFFB -> 00ffffff (2.35099e-38)
69-
0,0=80000000 (-0) -> TPS -> 0x400000003 -> 80000000 (-0)
69+
0,0=80000000 (0) -> TPS -> 0x400000003 -> 80000000 (0)
7070
0,1=80000001 (-1.4013e-45) -> TPS -> 0x40000000B -> 80000001 (-1.4013e-45)
7171
0,2=803fffff (-5.87747e-39) -> TPS -> 0x401FFFFFB -> 803fffff (-5.87747e-39)
7272
0,3=807fffff (-1.17549e-38) -> TPS -> 0x403FFFFFB -> 807fffff (-1.17549e-38)

0 commit comments

Comments
 (0)