Skip to content

Commit c100e85

Browse files
committed
Change test lib name so it doesn't clash with managed DLL on Windows
1 parent 5d7a188 commit c100e85

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
project (PrimitiveABI)
1+
project (PrimitiveABINative)
22
include_directories(${INC_PLATFORM_DIR})
33

44
if(CLR_CMAKE_HOST_WIN32)
@@ -7,6 +7,6 @@ else()
77
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -Oz")
88
endif()
99

10-
add_library (PrimitiveABI SHARED PrimitiveABI.c)
10+
add_library (PrimitiveABINative SHARED PrimitiveABI.c)
1111

12-
install (TARGETS PrimitiveABI DESTINATION bin)
12+
install (TARGETS PrimitiveABINative DESTINATION bin)

src/tests/JIT/Directed/PrimitiveABI/PrimitiveABI.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
public static class Program
1010
{
1111
#region ExtendedUint_RiscVTests
12-
[DllImport("PrimitiveABI")]
12+
[DllImport("PrimitiveABINative")]
1313
public static extern long Echo_ExtendedUint_RiscV(int a0, uint a1);
1414

1515
[MethodImpl(MethodImplOptions.NoInlining)]
@@ -41,7 +41,7 @@ public static void Test_ExtendedUint_ByReflection_RiscV()
4141
Assert.Equal(ret, native);
4242
}
4343

44-
[DllImport("PrimitiveABI")]
44+
[DllImport("PrimitiveABINative")]
4545
public static extern long Echo_ExtendedUint_OnStack_RiscV(
4646
int a0, int a1, int a2, int a3, int a4, int a5, int a6, int a7, uint stack0);
4747

@@ -77,7 +77,7 @@ public static void Test_ExtendedUint_OnStack_ByReflection_RiscV()
7777
#endregion
7878

7979
#region Float_RiscVTests
80-
[DllImport("PrimitiveABI")]
80+
[DllImport("PrimitiveABINative")]
8181
public static extern double Echo_Float_RiscV(float fa0, float fa1);
8282

8383
[MethodImpl(MethodImplOptions.NoInlining)]
@@ -109,7 +109,7 @@ public static void Test_Float_ByReflection_RiscV()
109109
Assert.Equal(ret, native);
110110
}
111111

112-
[DllImport("PrimitiveABI")]
112+
[DllImport("PrimitiveABINative")]
113113
public static extern double Echo_Float_InIntegerReg_RiscV(
114114
float fa0, float fa1, float fa2, float fa3, float fa4, float fa5, float fa6, float fa7, float a0);
115115

@@ -143,7 +143,7 @@ public static void Test_Float_InIntegerReg_ByReflection_RiscV()
143143
Assert.Equal(ret, native);
144144
}
145145

146-
[DllImport("PrimitiveABI")]
146+
[DllImport("PrimitiveABINative")]
147147
public static extern double Echo_Float_OnStack_RiscV(
148148
float fa0, float fa1, float fa2, float fa3, float fa4, float fa5, float fa6, float fa7,
149149
int a0, int a1, int a2, int a3, int a4, int a5, int a6, int a7, float stack0);

0 commit comments

Comments
 (0)