Skip to content

Commit fcd862e

Browse files
sdmacleasdmaclea
authored
Rename cross compilation related defines (#2256)
* Rename identifiers to be more consistent This patch was a machine generated search and replace of identifiers. The replacement was done in the order listed for the path specified. A regex was used to find the identifiers. s/(^|[^A-CE-Za-z0-9_])${find}($|[^A-Za-z0-9_]) The 'D' character was specifically allowed a s a prefix to catch add_definitions(-D${find}). The patch also reverts all managed code changes after replacement. _ARM_ -> HOST_ARM in src/coreclr _ARM64_ -> HOST_ARM64 in src/coreclr _AMD64_ -> HOST_AMD64 in src/coreclr _X86_ -> HOST_X86 in src/coreclr _HOST_UNIX_ -> HOST_UNIX in src/coreclr _HOST_AMD64_ -> HOST_AMD64 in src/coreclr _HOST_ARM64_ -> HOST_ARM64 in src/coreclr _HOST_ARM_ -> HOST_ARM in src/coreclr _HOST_X86_ -> HOST_X86 in src/coreclr DBG_TARGET_AMD64 -> TARGET_AMD64 in src/coreclr DBG_TARGET_ARM64 -> TARGET_ARM64 in src/coreclr DBG_TARGET_ARM -> TARGET_ARM in src/coreclr DBG_TARGET_X86 -> TARGET_X86 in src/coreclr _TARGET_AMD64_ -> TARGET_AMD64 in src/coreclr _TARGET_ARM_ -> TARGET_ARM in src/coreclr _TARGET_ARM64_ -> TARGET_ARM64 in src/coreclr _TARGET_X86_ -> TARGET_X86 in src/coreclr _TARGET_ARMARCH_ -> TARGET_ARMARCH in src/coreclr _TARGET_XARCH_ -> TARGET_XARCH in src/coreclr _HOST_64BIT_ -> HOST_64BIT in src/coreclr BIT64 -> HOST_64BIT in src/coreclr _TARGET_64BIT_ -> TARGET_64BIT in src/coreclr DBG_TARGET_64BIT -> TARGET_64BIT in src/coreclr HOST_IS_WINDOWS_OS -> HOST_WINDOWS in src/coreclr PLATFORM_UNIX -> HOST_UNIX in src/coreclr/*.cmake PLATFORM_WINDOWS -> HOST_WINDOWS in src/coreclr/*.cmake _TARGET_MAC64 -> TARGET_OSX in src/coreclr FEATURE_PAL -> TARGET_UNIX in src/coreclr _TARGET_UNIX_ -> TARGET_UNIX in src/coreclr _TARGET_WINDOWS_ -> TARGET_WINDOWS in src/coreclr PLATFORM_UNIX -> TARGET_UNIX in src/coreclr PLATFORM_WINDOWS -> TARGET_WINDOWS in src/coreclr * Miscellaneous manual fixes to fix compilation Remove unused defines Remove BIT32 Remove DBG_TARGET_AMD64_UNIX Remove DBG_TARGET_ARM64_UNIX Remove DBG_TARGET_ARM_UNIX Remove DBG_TARGET_32BIT Fixes for HOST_<arch> rename Move TARGET_<Arch> and TARGET_<bit> Move from clrdefinitions.cmake to configurecompiler.cmake so it is used globally. More jit.h * Whitespace by clang-format
1 parent 7aff91c commit fcd862e

File tree

675 files changed

+8221
-8290
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

675 files changed

+8221
-8290
lines changed

‎src/coreclr/clrdefinitions.cmake

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,43 +16,19 @@ add_compile_definitions($<$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>:CROSS_CO
1616
add_compile_definitions($<$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>:FEATURE_NATIVE_IMAGE_GENERATION>)
1717
add_compile_definitions($<$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>:SELF_NO_HOST>)
1818

19-
if (CLR_CMAKE_TARGET_ARCH_AMD64)
20-
if (CLR_CMAKE_TARGET_UNIX)
21-
add_definitions(-DDBG_TARGET_AMD64_UNIX)
22-
endif()
23-
add_definitions(-D_TARGET_AMD64_)
24-
add_definitions(-D_TARGET_64BIT_)
25-
add_definitions(-DDBG_TARGET_64BIT)
26-
add_definitions(-DDBG_TARGET_AMD64)
27-
elseif (CLR_CMAKE_TARGET_ARCH_ARM64)
19+
if (CLR_CMAKE_TARGET_ARCH_ARM64)
2820
if (CLR_CMAKE_TARGET_UNIX)
29-
add_definitions(-DDBG_TARGET_ARM64_UNIX)
3021
add_definitions(-DFEATURE_EMULATE_SINGLESTEP)
3122
endif()
32-
add_definitions(-D_TARGET_ARM64_)
33-
add_definitions(-D_TARGET_64BIT_)
34-
add_definitions(-DDBG_TARGET_64BIT)
35-
add_definitions(-DDBG_TARGET_ARM64)
3623
add_definitions(-DFEATURE_MULTIREG_RETURN)
3724
elseif (CLR_CMAKE_TARGET_ARCH_ARM)
38-
if (CLR_CMAKE_TARGET_UNIX)
39-
add_definitions(-DDBG_TARGET_ARM_UNIX)
40-
elseif (WIN32 AND NOT DEFINED CLR_CROSS_COMPONENTS_BUILD)
25+
if (WIN32 AND NOT DEFINED CLR_CROSS_COMPONENTS_BUILD)
4126
# Set this to ensure we can use Arm SDK for Desktop binary linkage when doing native (Arm32) build
4227
add_definitions(-D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE)
4328
add_definitions(-D_ARM_WORKAROUND_)
44-
endif (CLR_CMAKE_TARGET_UNIX)
45-
add_definitions(-D_TARGET_ARM_)
46-
add_definitions(-DDBG_TARGET_32BIT)
47-
add_definitions(-DDBG_TARGET_ARM)
29+
endif (WIN32 AND NOT DEFINED CLR_CROSS_COMPONENTS_BUILD)
4830
add_definitions(-DFEATURE_EMULATE_SINGLESTEP)
49-
elseif (CLR_CMAKE_TARGET_ARCH_I386)
50-
add_definitions(-D_TARGET_X86_)
51-
add_definitions(-DDBG_TARGET_32BIT)
52-
add_definitions(-DDBG_TARGET_X86)
53-
else ()
54-
clr_unknown_arch()
55-
endif (CLR_CMAKE_TARGET_ARCH_AMD64)
31+
endif (CLR_CMAKE_TARGET_ARCH_ARM64)
5632

5733
if (CLR_CMAKE_TARGET_UNIX)
5834

@@ -179,7 +155,6 @@ if(FEATURE_MERGE_JIT_AND_ENGINE)
179155
endif(FEATURE_MERGE_JIT_AND_ENGINE)
180156
add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>>:FEATURE_MULTICOREJIT>)
181157
if(CLR_CMAKE_TARGET_UNIX)
182-
add_definitions(-DFEATURE_PAL)
183158
add_definitions(-DFEATURE_PAL_ANSI)
184159
endif(CLR_CMAKE_TARGET_UNIX)
185160
if(CLR_CMAKE_TARGET_LINUX AND CLR_CMAKE_HOST_LINUX)

‎src/coreclr/configurecompiler.cmake

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -190,17 +190,15 @@ endif(CLR_CMAKE_HOST_FREEBSD)
190190
# Definitions (for platform)
191191
#-----------------------------------
192192
if (CLR_CMAKE_HOST_ARCH_AMD64)
193-
add_definitions(-D_AMD64_)
194-
add_definitions(-DBIT64)
193+
add_definitions(-DHOST_AMD64)
194+
add_definitions(-DHOST_64BIT)
195195
elseif (CLR_CMAKE_HOST_ARCH_I386)
196-
add_definitions(-D_X86_)
197-
add_definitions(-DBIT32)
196+
add_definitions(-DHOST_X86)
198197
elseif (CLR_CMAKE_HOST_ARCH_ARM)
199-
add_definitions(-D_ARM_)
200-
add_definitions(-DBIT32)
198+
add_definitions(-DHOST_ARM)
201199
elseif (CLR_CMAKE_HOST_ARCH_ARM64)
202-
add_definitions(-D_ARM64_)
203-
add_definitions(-DBIT64)
200+
add_definitions(-DHOST_ARM64)
201+
add_definitions(-DHOST_64BIT)
204202
else ()
205203
clr_unknown_arch()
206204
endif ()
@@ -222,7 +220,7 @@ if (CLR_CMAKE_HOST_UNIX)
222220
endif(CLR_CMAKE_HOST_UNIX)
223221

224222
if (CLR_CMAKE_HOST_UNIX)
225-
add_definitions(-DPLATFORM_UNIX)
223+
add_definitions(-DHOST_UNIX)
226224

227225
if(CLR_CMAKE_HOST_DARWIN)
228226
message("Detected OSX x86_64")
@@ -238,7 +236,7 @@ if (CLR_CMAKE_HOST_UNIX)
238236
endif(CLR_CMAKE_HOST_UNIX)
239237

240238
if (WIN32)
241-
add_definitions(-DPLATFORM_WINDOWS)
239+
add_definitions(-DHOST_WINDOWS)
242240

243241
# Define the CRT lib references that link into Desktop imports
244242
set(STATIC_MT_CRT_LIB "libcmt$<$<OR:$<CONFIG:Debug>,$<CONFIG:Checked>>:d>.lib")
@@ -249,12 +247,18 @@ endif(WIN32)
249247
# Architecture specific files folder name
250248
if (CLR_CMAKE_TARGET_ARCH_AMD64)
251249
set(ARCH_SOURCES_DIR amd64)
250+
add_definitions(-DTARGET_AMD64)
251+
add_definitions(-DTARGET_64BIT)
252252
elseif (CLR_CMAKE_TARGET_ARCH_ARM64)
253253
set(ARCH_SOURCES_DIR arm64)
254+
add_definitions(-DTARGET_ARM64)
255+
add_definitions(-DTARGET_64BIT)
254256
elseif (CLR_CMAKE_TARGET_ARCH_ARM)
255257
set(ARCH_SOURCES_DIR arm)
258+
add_definitions(-DTARGET_ARM)
256259
elseif (CLR_CMAKE_TARGET_ARCH_I386)
257260
set(ARCH_SOURCES_DIR i386)
261+
add_definitions(-DTARGET_X86)
258262
else ()
259263
clr_unknown_arch()
260264
endif ()
@@ -348,8 +352,11 @@ if (CLR_CMAKE_HOST_UNIX)
348352
endif(CLR_CMAKE_HOST_UNIX)
349353

350354
if(CLR_CMAKE_TARGET_UNIX)
355+
add_definitions(-DTARGET_UNIX)
351356
# Contracts are disabled on UNIX.
352357
add_definitions(-DDISABLE_CONTRACTS)
358+
else(CLR_CMAKE_TARGET_UNIX)
359+
add_definitions(-DTARGET_WINDOWS)
353360
endif(CLR_CMAKE_TARGET_UNIX)
354361

355362
if(CLR_CMAKE_HOST_UNIX_ARM)

‎src/coreclr/src/ToolBox/superpmi/mcs/commandline.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,12 @@ bool CommandLine::Parse(int argc, char* argv[], /* OUT */ Options* o)
152152
for (int i = 1; i < argc; i++)
153153
{
154154
bool isASwitch = (argv[i][0] == '-');
155-
#ifndef FEATURE_PAL
155+
#ifndef TARGET_UNIX
156156
if (argv[i][0] == '/') // Also accept "/" on Windows
157157
{
158158
isASwitch = true;
159159
}
160-
#endif // !FEATURE_PAL
160+
#endif // !TARGET_UNIX
161161

162162
// Process a switch
163163
if (isASwitch)

‎src/coreclr/src/ToolBox/superpmi/mcs/mcs.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323

2424
int __cdecl main(int argc, char* argv[])
2525
{
26-
#ifdef FEATURE_PAL
26+
#ifdef TARGET_UNIX
2727
if (0 != PAL_Initialize(argc, argv))
2828
{
2929
fprintf(stderr, "Error: Fail to PAL_Initialize\n");
3030
exit(1);
3131
}
32-
#endif // FEATURE_PAL
32+
#endif // TARGET_UNIX
3333

3434
Logger::Initialize();
3535

‎src/coreclr/src/ToolBox/superpmi/mcs/verbmerge.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,10 @@ bool verbMerge::DirectoryFilterDirectories(WIN32_FIND_DATAW* findData)
119119
// 3. hidden directories
120120
// 4. "." or ".."
121121

122-
#ifndef FEATURE_PAL // FILE_ATTRIBUTE_REPARSE_POINT is not defined in the PAL
122+
#ifndef TARGET_UNIX // FILE_ATTRIBUTE_REPARSE_POINT is not defined in the PAL
123123
if ((findData->dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) != 0)
124124
return false;
125-
#endif // !FEATURE_PAL
125+
#endif // !TARGET_UNIX
126126
if ((findData->dwFileAttributes & FILE_ATTRIBUTE_SYSTEM) != 0)
127127
return false;
128128
if ((findData->dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) != 0)
@@ -204,18 +204,18 @@ int verbMerge::FilterDirectory(LPCWSTR searchPattern,
204204
// NOTE: this function only works on Windows 7 and later.
205205
WIN32_FIND_DATAW findData;
206206
HANDLE hSearch;
207-
#ifdef FEATURE_PAL
207+
#ifdef TARGET_UNIX
208208
// PAL doesn't have FindFirstFileEx(). So just use FindFirstFile(). The only reason we use
209209
// the Ex version is potentially better performance (don't populate short name; use large fetch),
210210
// not functionality.
211211
hSearch = FindFirstFileW(searchPattern, &findData);
212-
#else // !FEATURE_PAL
212+
#else // !TARGET_UNIX
213213
hSearch = FindFirstFileExW(searchPattern,
214214
FindExInfoBasic, // We don't care about the short names
215215
&findData,
216216
FindExSearchNameMatch, // standard name matching
217217
NULL, FIND_FIRST_EX_LARGE_FETCH);
218-
#endif // !FEATURE_PAL
218+
#endif // !TARGET_UNIX
219219

220220
if (hSearch == INVALID_HANDLE_VALUE)
221221
{

‎src/coreclr/src/ToolBox/superpmi/superpmi-shared/asmdumper.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ void ASMDumper::DumpToFile(HANDLE hFile, MethodContext* mc, CompileResult* cr)
4444

4545
#ifdef USE_MSVCDIS
4646

47-
#ifdef _TARGET_AMD64_
47+
#ifdef TARGET_AMD64
4848
DIS* disasm = DIS::PdisNew(DIS::distX8664);
49-
#elif _TARGET_X86_
49+
#elif TARGET_X86
5050
DIS* disasm = DIS::PdisNew(DIS::distX86);
5151
#endif
5252
size_t offset = 0;

‎src/coreclr/src/ToolBox/superpmi/superpmi-shared/callutils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ bool CallUtils::HasRetBuffArg(MethodContext* mc, CORINFO_SIG_INFO args)
224224
return false;
225225
}
226226

227-
#if defined(_TARGET_AMD64_)
227+
#if defined(TARGET_AMD64)
228228
// We don't need a return buffer if:
229229
// i) TYP_STRUCT argument that can fit into a single register and
230230
// ii) Power of two sized TYP_STRUCT on AMD64.

‎src/coreclr/src/ToolBox/superpmi/superpmi-shared/compileresult.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ CompileResult::~CompileResult()
4444
if (CallTargetTypes != nullptr)
4545
delete CallTargetTypes;
4646

47-
#ifndef FEATURE_PAL // PAL doesn't have HeapDestroy()
47+
#ifndef TARGET_UNIX // PAL doesn't have HeapDestroy()
4848
if (codeHeap != nullptr)
4949
::HeapDestroy(codeHeap);
50-
#endif // !FEATURE_PAL
50+
#endif // !TARGET_UNIX
5151
}
5252

5353
// Is the CompileResult empty? Define this as whether all the maps that store information given by the JIT are empty.
@@ -721,7 +721,7 @@ void CompileResult::applyRelocs(unsigned char* block1, ULONG blocksize1, void* o
721721

722722
switch (tmp.fRelocType)
723723
{
724-
#if defined(_TARGET_X86_)
724+
#if defined(TARGET_X86)
725725
case IMAGE_REL_BASED_HIGHLOW:
726726
{
727727
DWORDLONG fixupLocation = tmp.location;
@@ -735,17 +735,17 @@ void CompileResult::applyRelocs(unsigned char* block1, ULONG blocksize1, void* o
735735
}
736736
}
737737
break;
738-
#endif // _TARGET_X86_
738+
#endif // TARGET_X86
739739

740-
#if defined(_TARGET_X86_) || defined(_TARGET_AMD64_) || defined(_TARGET_ARM64_) || defined(_TARGET_ARM_)
740+
#if defined(TARGET_X86) || defined(TARGET_AMD64) || defined(TARGET_ARM64) || defined(TARGET_ARM)
741741
case IMAGE_REL_BASED_REL32:
742742
{
743743
DWORDLONG target = tmp.target + tmp.addlDelta;
744744
DWORDLONG fixupLocation = tmp.location + tmp.slotNum;
745745
DWORDLONG baseAddr = fixupLocation + sizeof(INT32);
746746
INT64 delta = (INT64)((BYTE*)target - baseAddr);
747747

748-
#if defined(_TARGET_AMD64_) || defined(_TARGET_ARM64_)
748+
#if defined(TARGET_AMD64) || defined(TARGET_ARM64)
749749
if (delta != (INT64)(int)delta)
750750
{
751751
// This isn't going to fit in a signed 32-bit address. Use something that will fit,
@@ -759,11 +759,11 @@ void CompileResult::applyRelocs(unsigned char* block1, ULONG blocksize1, void* o
759759

760760
delta = newdelta;
761761
}
762-
#endif // defined(_TARGET_AMD64_) || defined(_TARGET_ARM64_)
762+
#endif // defined(TARGET_AMD64) || defined(TARGET_ARM64)
763763

764764
if (delta != (INT64)(int)delta)
765765
{
766-
#if defined(_TARGET_AMD64_) || defined(_TARGET_ARM64_)
766+
#if defined(TARGET_AMD64) || defined(TARGET_ARM64)
767767
LogError("REL32 relocation overflows field! delta=0x%016llX", delta);
768768
#else
769769
LogError("REL32 relocation overflows field! delta=0x%08X", delta);
@@ -780,9 +780,9 @@ void CompileResult::applyRelocs(unsigned char* block1, ULONG blocksize1, void* o
780780
}
781781
}
782782
break;
783-
#endif // defined(_TARGET_X86_) || defined(_TARGET_AMD64_) || defined(_TARGET_ARM64_) || defined(_TARGET_ARM_)
783+
#endif // defined(TARGET_X86) || defined(TARGET_AMD64) || defined(TARGET_ARM64) || defined(TARGET_ARM)
784784

785-
#if defined(_TARGET_AMD64_) || defined(_TARGET_ARM64_)
785+
#if defined(TARGET_AMD64) || defined(TARGET_ARM64)
786786
case IMAGE_REL_BASED_DIR64:
787787
{
788788
DWORDLONG fixupLocation = tmp.location + tmp.slotNum;
@@ -797,15 +797,15 @@ void CompileResult::applyRelocs(unsigned char* block1, ULONG blocksize1, void* o
797797
}
798798
}
799799
break;
800-
#endif // defined(_TARGET_AMD64_) || defined(_TARGET_ARM64_)
800+
#endif // defined(TARGET_AMD64) || defined(TARGET_ARM64)
801801

802-
#ifdef _TARGET_ARM64_
802+
#ifdef TARGET_ARM64
803803
case IMAGE_REL_ARM64_BRANCH26: // 26 bit offset << 2 & sign ext, for B and BL
804804
case IMAGE_REL_ARM64_PAGEBASE_REL21:
805805
case IMAGE_REL_ARM64_PAGEOFFSET_12A:
806806
LogError("Unimplemented reloc type %u", tmp.fRelocType);
807807
break;
808-
#endif // _TARGET_ARM64_
808+
#endif // TARGET_ARM64
809809

810810
default:
811811
LogError("Unknown reloc type %u", tmp.fRelocType);

‎src/coreclr/src/ToolBox/superpmi/superpmi-shared/logging.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ void Logger::LogVprintf(
235235

236236
if (s_logFile != INVALID_HANDLE_VALUE)
237237
{
238-
#ifndef FEATURE_PAL // TODO: no localtime_s() or strftime() in PAL
238+
#ifndef TARGET_UNIX // TODO: no localtime_s() or strftime() in PAL
239239
tm timeInfo;
240240
errno_t err = localtime_s(&timeInfo, &timestamp);
241241
if (err != 0)
@@ -254,9 +254,9 @@ void Logger::LogVprintf(
254254
timeStrBuffSize *= 2;
255255
timeStr = (char*)realloc(timeStr, timeStrBuffSize);
256256
}
257-
#else // FEATURE_PAL
257+
#else // TARGET_UNIX
258258
const char* timeStr = "";
259-
#endif // FEATURE_PAL
259+
#endif // TARGET_UNIX
260260

261261
const char logEntryFmtStr[] = "%s - %s [%s:%d] - %s - %s\r\n";
262262
size_t logEntryBuffSize = sizeof(logEntryFmtStr) + strlen(timeStr) + strlen(function) + strlen(file) + 10 +
@@ -277,15 +277,15 @@ void Logger::LogVprintf(
277277

278278
delete[] logEntry;
279279

280-
#ifndef FEATURE_PAL
280+
#ifndef TARGET_UNIX
281281
free((void*)timeStr);
282-
#endif // !FEATURE_PAL
282+
#endif // !TARGET_UNIX
283283
}
284284
}
285285

286-
#ifndef FEATURE_PAL
286+
#ifndef TARGET_UNIX
287287
CleanUp:
288-
#endif // !FEATURE_PAL
288+
#endif // !TARGET_UNIX
289289

290290
LeaveCriticalSection(&s_critSec);
291291
delete[] fullMsg;

‎src/coreclr/src/ToolBox/superpmi/superpmi-shared/methodcontext.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3988,7 +3988,7 @@ void MethodContext::repGetEEInfo(CORINFO_EE_INFO* pEEInfoOut)
39883988
pEEInfoOut->osPageSize = (size_t)0x1000;
39893989
pEEInfoOut->maxUncheckedOffsetForNullObject = (size_t)((32 * 1024) - 1);
39903990
pEEInfoOut->targetAbi = CORINFO_DESKTOP_ABI;
3991-
#ifdef FEATURE_PAL
3991+
#ifdef TARGET_UNIX
39923992
pEEInfoOut->osType = CORINFO_UNIX;
39933993
#else
39943994
pEEInfoOut->osType = CORINFO_WINNT;
@@ -6400,7 +6400,7 @@ int MethodContext::dumpMethodMD5HashToBuffer(char* buff, int len, bool ignoreMet
64006400

64016401
int MethodContext::dumpMD5HashToBuffer(BYTE* pBuffer, int bufLen, char* hash, int hashLen)
64026402
{
6403-
#ifdef FEATURE_PAL
6403+
#ifdef TARGET_UNIX
64046404

64056405
MD5HASHDATA md5_hashdata;
64066406
MD5 md5_hasher;
@@ -6420,7 +6420,7 @@ int MethodContext::dumpMD5HashToBuffer(BYTE* pBuffer, int bufLen, char* hash, in
64206420

64216421
return MD5_HASH_BUFFER_SIZE; // if we had success we wrote MD5_HASH_BUFFER_SIZE bytes to the buffer
64226422

6423-
#else // !FEATURE_PAL
6423+
#else // !TARGET_UNIX
64246424

64256425
HCRYPTPROV hProv = NULL; // CryptoProvider
64266426
HCRYPTHASH hHash = NULL;
@@ -6467,7 +6467,7 @@ int MethodContext::dumpMD5HashToBuffer(BYTE* pBuffer, int bufLen, char* hash, in
64676467
CryptReleaseContext(hProv, 0);
64686468
return -1;
64696469

6470-
#endif // !FEATURE_PAL
6470+
#endif // !TARGET_UNIX
64716471
}
64726472

64736473
MethodContext::Environment MethodContext::cloneEnvironment()

‎src/coreclr/src/ToolBox/superpmi/superpmi-shared/runtimedetails.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
// Our little collection of enough of the CLR data to get the JIT up and working...
1313
#define FEATURE_CLRSQM
1414

15-
#if !defined(_TARGET_AMD64_) && !defined(_TARGET_X86_) && !defined(_TARGET_ARM64_) && !defined(_TARGET_ARM_)
15+
#if !defined(TARGET_AMD64) && !defined(TARGET_X86) && !defined(TARGET_ARM64) && !defined(TARGET_ARM)
1616
#if defined(_M_X64)
17-
#define _TARGET_AMD64_ 1
17+
#define TARGET_AMD64 1
1818
#elif defined(_M_IX86)
19-
#define _TARGET_X86_ 1
19+
#define TARGET_X86 1
2020
#endif
2121
#endif // _TARGET_* not previously defined
2222

0 commit comments

Comments
 (0)