Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 00:45:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- The CRT sync by "fireball" is incorrect and results in a broken ntos kernel. Although it may work on i386 builds, it results in a corrupted kernel anyways. On ARM, we try to hackfix around it by not including some routines that should not be in the kernel but were being imported due to the broken crt changes.

Browse source 
- We do not attemp to build world anymore. We have handwritten a new ARM rbuild file that only builds what we need for our current ARM work.
- HAL and FreeLDR do not seem to have an "installpath"... why not? Added one at least for our ARM stuff, so that "make install" can drop the binaries.
- Fixed some ARM DDK macro inconsistencies, allow more drivers to build.
- It is now possible to use "make install -k" to drop a completely working ARM build onto an image due to all these changes.

svn path=/trunk/; revision=34055
This commit is contained in:
ReactOS Portable Systems Group 2008-06-23 03:57:50 +00:00
parent 835571354c
commit 8df8940a6e
7 changed files with 157 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

149
reactos/ReactOS-arm.rbuild
View file

@ -7,11 +7,38 @@
</xi:fallback>
</xi:include>
<xi:include href="ReactOS-generic.rbuild" />
<xi:include href="baseaddress.rbuild" />
<define name="__REACTOS__" />
<define name="_ARM_" />
<define name="__arm__" />
<if property="DBG" value="1">
<define name="DBG">1</define>
<define name="_SEH_ENABLE_TRACE" />
<property name="DBG_OR_KDBG" value="true" />
</if>
<if property="KDBG" value="1">
<define name="KDBG">1</define>
<property name="DBG_OR_KDBG" value="true" />
</if>
<include>.</include>
<include>include</include>
<include root="intermediate">include</include>
<include>include/psdk</include>
<include root="intermediate">include/psdk</include>
<include>include/dxsdk</include>
<include root="intermediate">include/dxsdk</include>
<include>include/crt</include>
<include>include/crt/mingw32</include>
<include>include/ddk</include>
<include>include/GL</include>
<include>include/ndk</include>
<include>include/reactos</include>
<include root="intermediate">include/reactos</include>
<include root="intermediate">include/reactos/mc</include>
<include>include/reactos/libs</include>
<include>include/reactos/arm</include>
<property name="WINEBUILD_FLAGS" value="--kill-at"/>
@ -43,4 +70,124 @@
<linkerflag>-s</linkerflag>
<linkerflag>-lgcc</linkerflag>
<linkerflag>-static</linkerflag>
<directory name="media">
<directory name="nls">
<xi:include href="media/nls/nls.rbuild" />
</directory>
</directory>
<directory name="lib">
<directory name="drivers">
<directory name="csq">
<xi:include href="lib/drivers/csq/csq.rbuild" />
/directory>
</directory>
<directory name="debugsup">
<xi:include href="lib/debugsup/debugsup.rbuild" />
</directory>
<directory name="3rdparty">
<directory name="zlib">
<xi:include href="lib/3rdparty/zlib/zlib.rbuild" />
</directory>
</directory>
<directory name="rtl">
<xi:include href="lib/rtl/rtl.rbuild" />
</directory>
<directory name="host">
<directory name="wcsfuncs">
<xi:include href="lib/host/wcsfuncs/wcsfuncs.rbuild" />
</directory>
</directory>
<directory name="inflib">
<xi:include href="lib/inflib/inflib.rbuild" />
</directory>
<directory name="cmlib">
<xi:include href="lib/cmlib/cmlib.rbuild" />
</directory>
<directory name="pseh">
<xi:include href="lib/pseh/pseh.rbuild" />
</directory>
<directory name="rossym">
<xi:include href="lib/rossym/rossym.rbuild" />
</directory>
<directory name="sdk">
<directory name="crt">
<xi:include href="lib/sdk/crt/crt.rbuild" />
<xi:include href="lib/sdk/crt/libcntpr.rbuild" />
</directory>
<directory name="wdmguid">
<xi:include href="lib/sdk/wdmguid/wdmguid.rbuild" />
</directory>
</directory>
</directory>
<directory name="include">
<xi:include href="include/directory.rbuild" />
</directory>
<directory name="tools">
<xi:include href="tools/tools.rbuild" />
</directory>
<directory name="ntoskrnl">
<xi:include href="ntoskrnl/ntoskrnl.rbuild" />
</directory>
<directory name="hal">
<directory name="halarm">
<directory name="generic">
<xi:include href="hal/halarm/generic/generic.rbuild" />
</directory>
<directory name="up">
<xi:include href="hal/halarm/up/halup.rbuild" />
</directory>
</directory>
<directory name="hal">
<xi:include href="hal/hal/hal.rbuild" />
</directory>
</directory>
<directory name="boot">
<xi:include href="boot/boot.rbuild" />
</directory>
<directory name="drivers">
<directory name="storage">
<directory name="scsiport">
<xi:include href="drivers/storage/scsiport/scsiport.rbuild" />
</directory>
<directory name="port">
<directory name="buslogic">
<xi:include href="drivers/storage/port/buslogic/buslogic.rbuild" />
</directory>
</directory>
<directory name="ide">
<directory name="atapi">
<xi:include href="drivers/storage/ide/atapi/atapi.rbuild" />
</directory>
</directory>
<directory name="class">
<directory name="class2">
<xi:include href="drivers/storage/class/class2/class2.rbuild" />
</directory>
<directory name="disk">
<xi:include href="drivers/storage/class/disk/disk.rbuild" />
</directory>
</directory>
</directory>
<directory name="filesystems">
<directory name="fastfat">
<xi:include href="drivers/filesystems/fastfat/vfatfs.rbuild" />
</directory>
</directory>
<directory name="network">
<directory name="ndis">
<xi:include href="drivers/network/ndis/ndis.rbuild" />
</directory>
</directory>
<directory name="base">
<directory name="kdcom">
<xi:include href="drivers/base/kdcom/kdcom.rbuild" />
</directory>
<directory name="bootvid">
<xi:include href="drivers/base/bootvid/bootvid.rbuild" />
</directory>
</directory>
</directory>
</project>

6
reactos/boot/freeldr/freeldr.rbuild
View file

@ -14,10 +14,4 @@
<xi:include href="freeldr/freeldr.rbuild" />
<xi:include href="freeldr/setupldr.rbuild" />
</directory>
<directory name="fdebug">
<xi:include href="fdebug/fdebug.rbuild" />
</directory>
<directory name="install">
<xi:include href="install/installfreeldr.rbuild" />
</directory>
</group>

2
reactos/boot/freeldr/freeldr/freeldr.rbuild
View file

@ -18,7 +18,7 @@
</module>
</if>
<if property="ARCH" value="arm">
<module name="freeldr" type="bootloader">
<module name="freeldr" type="bootloader" installbase=".." installname="freeldr.sys">
<bootstrap installbase="loader" />
<library>freeldr_startup</library>
<library>freeldr_base64k</library>

2
reactos/hal/halarm/up/halup.rbuild
View file

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="halarm_up" type="kernelmodedll">
<module name="halarm_up" type="kernelmodedll" installbase="system32" installname="hal.dll">
<importlibrary definition="../../hal/hal_arm.def" />
<bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
<include base="halarm_generic">../include</include>

4
reactos/include/reactos/arm/armddk.h
View file

@ -33,11 +33,13 @@
//
// Just read it from the PCR
//
#define KeGetCurrentProcessorNumber() PCR->Number
#define KeGetCurrentProcessorNumber() (int)PCR->Number
#define KeGetCurrentIrql() PCR->CurrentIrql
#define _KeGetCurrentThread() PCR->CurrentThread
#define _KeGetPreviousMode() PCR->CurrentThread->PreviousMode
#define _KeIsExecutingDpc() (PCR->DpcRoutineActive != 0)
#define KeGetCurrentThread() _KeGetCurrentThread()
#define KeGetPreviousMode() _KeGetPreviousMode()
#define KeGetDcacheFillSize() PCR->DcacheFillSize
//

6
reactos/lib/sdk/crt/string/wcs.c
View file

@ -67,7 +67,6 @@ wchar_t* CDECL _wcsdup( const wchar_t* str )
}
return ret;
}
#endif
/*********************************************************************
* _wcsicoll (MSVCRT.@)
*/
@ -76,7 +75,7 @@ INT CDECL _wcsicoll( const wchar_t* str1, const wchar_t* str2 )
/* FIXME: handle collates */
return strcmpiW( str1, str2 );
}
#endif
/*********************************************************************
* _wcsnset (MSVCRT.@)
*/
@ -102,7 +101,7 @@ wchar_t* CDECL _wcsrev( wchar_t* str )
}
return ret;
}
#ifndef _LIBCNT_
/*********************************************************************
* _wcsset (MSVCRT.@)
*/
@ -185,7 +184,6 @@ double CDECL wcstod(const wchar_t* lpszStr, wchar_t** end)
return ret;
}
#ifndef _LIBCNT_
typedef struct pf_output_t
{
int used;

2
reactos/ntoskrnl/include/internal/ntoskrnl.h
View file

@ -17,8 +17,10 @@
#ifdef _NTOSKRNL_
#ifndef _ARM_
#define KeGetCurrentThread _KeGetCurrentThread
#define KeGetPreviousMode _KeGetPreviousMode
#endif
#undef PsGetCurrentProcess
#define PsGetCurrentProcess _PsGetCurrentProcess