Make some ntdll exports architecture specific, as they are not exported by arm. Use pspec for ARM, too.

svn path=/trunk/; revision=44627
This commit is contained in:
Timo Kreuzer 2009-12-16 21:41:18 +00:00
parent ddb427f402
commit 6ececd457f
3 changed files with 15 additions and 1094 deletions

View file

@ -719,9 +719,9 @@
@ stdcall RtlInt64ToUnicodeString(double long ptr) @ stdcall RtlInt64ToUnicodeString(double long ptr)
@ stdcall RtlIntegerToChar(long long long ptr) @ stdcall RtlIntegerToChar(long long long ptr)
@ stdcall RtlIntegerToUnicodeString(long long ptr) @ stdcall RtlIntegerToUnicodeString(long long ptr)
@ stdcall RtlInterlockedFlushSList(ptr) @ stdcall -arch=i386,x86_64 RtlInterlockedFlushSList(ptr)
@ stdcall RtlInterlockedPopEntrySList(ptr) @ stdcall -arch=i386,x86_64 RtlInterlockedPopEntrySList(ptr)
@ stdcall RtlInterlockedPushEntrySList(ptr ptr) @ stdcall -arch=i386,x86_64 RtlInterlockedPushEntrySList(ptr ptr)
@ stdcall RtlInterlockedPushListSList(ptr ptr ptr long) @ stdcall RtlInterlockedPushListSList(ptr ptr ptr long)
@ stdcall RtlInvertRangeList(ptr ptr) @ stdcall RtlInvertRangeList(ptr ptr)
@ stdcall RtlIpv4AddressToStringA(ptr ptr) @ stdcall RtlIpv4AddressToStringA(ptr ptr)
@ -1301,7 +1301,7 @@
@ cdecl -arch=i386 -ret64 _aullrem(double double) @ cdecl -arch=i386 -ret64 _aullrem(double double)
@ cdecl -arch=i386 _aullshr() @ cdecl -arch=i386 _aullshr()
@ cdecl -arch=i386 -norelay _chkstk() @ cdecl -arch=i386 -norelay _chkstk()
@ cdecl _fltused() @ cdecl -arch=i386,x86_64 _fltused()
@ cdecl -arch=i386 -ret64 _ftol() @ cdecl -arch=i386 -ret64 _ftol()
@ cdecl _i64toa(double ptr long) @ cdecl _i64toa(double ptr long)
@ cdecl _i64tow(double ptr long) @ cdecl _i64tow(double ptr long)
@ -1337,14 +1337,14 @@
@ cdecl _wtoi64(wstr) @ cdecl _wtoi64(wstr)
@ cdecl _wtol(wstr) @ cdecl _wtol(wstr)
@ cdecl abs(long) @ cdecl abs(long)
@ cdecl atan(double) @ cdecl -arch=i386,x86_64 atan(double)
@ cdecl atoi(str) @ cdecl atoi(str)
@ cdecl atol(str) @ cdecl atol(str)
@ cdecl bsearch(ptr ptr long long ptr) @ cdecl bsearch(ptr ptr long long ptr)
@ cdecl ceil(double) @ cdecl -arch=i386,x86_64 ceil(double)
@ cdecl cos(double) @ cdecl -arch=i386,x86_64 cos(double)
@ cdecl fabs(double) @ cdecl -arch=i386,x86_64 fabs(double)
@ cdecl floor(double) @ cdecl -arch=i386,x86_64 floor(double)
@ cdecl isalnum(long) @ cdecl isalnum(long)
@ cdecl isalpha(long) @ cdecl isalpha(long)
@ cdecl iscntrl(long) @ cdecl iscntrl(long)
@ -1363,18 +1363,18 @@
@ cdecl iswxdigit(long) @ cdecl iswxdigit(long)
@ cdecl isxdigit(long) @ cdecl isxdigit(long)
@ cdecl labs(long) @ cdecl labs(long)
@ cdecl log(double) @ cdecl -arch=i386,x86_64 log(double)
@ cdecl mbstowcs(ptr str long) @ cdecl mbstowcs(ptr str long)
@ cdecl memchr(ptr long long) @ cdecl memchr(ptr long long)
@ cdecl memcmp(ptr ptr long) @ cdecl memcmp(ptr ptr long)
@ cdecl memcpy(ptr ptr long) memmove @ cdecl memcpy(ptr ptr long) memmove
@ cdecl memmove(ptr ptr long) @ cdecl memmove(ptr ptr long)
@ cdecl memset(ptr long long) @ cdecl memset(ptr long long)
@ cdecl pow(double double) @ cdecl -arch=i386,x86_64 pow(double double)
@ cdecl qsort(ptr long long ptr) @ cdecl qsort(ptr long long ptr)
@ cdecl sin(double) @ cdecl -arch=i386,x86_64 sin(double)
@ varargs sprintf(ptr str) @ varargs sprintf(ptr str)
@ cdecl sqrt(double) @ cdecl -arch=i386,x86_64 sqrt(double)
@ varargs sscanf(str str) @ varargs sscanf(str str)
@ cdecl strcat(str str) @ cdecl strcat(str str)
@ cdecl strchr(str long) @ cdecl strchr(str long)
@ -1392,7 +1392,7 @@
@ cdecl strtol(str ptr long) @ cdecl strtol(str ptr long)
@ cdecl strtoul(str ptr long) @ cdecl strtoul(str ptr long)
@ varargs swprintf(ptr wstr) @ varargs swprintf(ptr wstr)
@ cdecl tan(double) @ cdecl -arch=i386,x86_64 tan(double)
@ cdecl tolower(long) @ cdecl tolower(long)
@ cdecl toupper(long) @ cdecl toupper(long)
@ cdecl towlower(long) @ cdecl towlower(long)

File diff suppressed because it is too large Load diff

View file

@ -6,12 +6,7 @@
</module> </module>
<module name="ntdll" type="nativedll" entrypoint="0" baseaddress="${BASEADDRESS_NTDLL}" installbase="system32" installname="ntdll.dll" iscrt="yes"> <module name="ntdll" type="nativedll" entrypoint="0" baseaddress="${BASEADDRESS_NTDLL}" installbase="system32" installname="ntdll.dll" iscrt="yes">
<bootstrap installbase="$(CDOUTPUT)/system32" /> <bootstrap installbase="$(CDOUTPUT)/system32" />
<if property="ARCH" value="arm"> <importlibrary definition="def/ntdll.pspec" />
<importlibrary definition="def/ntdll-arm.def" />
</if>
<ifnot property="ARCH" value="arm">
<importlibrary definition="def/ntdll.pspec" />
</ifnot>
<include base="ntdll">include</include> <include base="ntdll">include</include>
<include base="ntdll" root="intermediate"></include> <include base="ntdll" root="intermediate"></include>
<include base="ReactOS">include/reactos/subsys</include> <include base="ReactOS">include/reactos/subsys</include>