sambuc/codezero
1
0
Fork 0
mirror of https://github.com/drasko/codezero.git synced 2026-10-14 14:47:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move the linker scripts out of the header file directory.

Browse Source
This commit is contained in:
Russel Winder
2009-08-29 18:18:25 +01:00
parent 98ca32779c
commit 1abd05764f
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
containers/SConscript
+2 -2
View File
@@ -43,13 +43,13 @@ environment['targetHelpEntries']['tasklibs'] = 'build the support libraries for
def buildTask(programName, sources, environment, previousImage, extraCppPath=None): def buildTask(programName, sources, environment, previousImage, extraCppPath=None):
e = environment.Clone() e = environment.Clone()
e.Append(LINKFLAGS=['-T' + e['posixServicesDirectory'] + '/' + programName + '/include/linker.lds']) e.Append(LINKFLAGS=['-T' + e['posixServicesDirectory'] + '/' + programName + '/linker.lds'])
e.Append(LIBPATH=['#' + e['buildDirectory'] + '/' + e['posixServicesDirectory'] + '/' + programName]) e.Append(LIBPATH=['#' + e['buildDirectory'] + '/' + e['posixServicesDirectory'] + '/' + programName])
if extraCppPath: e.Append(CPPPATH=extraCppPath) if extraCppPath: e.Append(CPPPATH=extraCppPath)
objects = e.StaticObject(sources) objects = e.StaticObject(sources)
Depends(objects, e['configFiles']) Depends(objects, e['configFiles'])
program = e.Program(programName, objects) program = e.Program(programName, objects)
environment['physicalBaseLinkerScript'] = Command('include/physical_base.lds', previousImage, 'tools/pyelf/readelf.py --first-free-page ' + previousImage[0].path + ' >> $TARGET') environment['physicalBaseLinkerScript'] = Command('physical_base.lds', previousImage, 'tools/pyelf/readelf.py --first-free-page ' + previousImage[0].path + ' >> $TARGET')
Depends(program, [environment['physicalBaseLinkerScript']]) Depends(program, [environment['physicalBaseLinkerScript']])
return program return program
containers/posix/fs0/include/linker.lds → containers/posix/fs0/linker.lds
+1 -1
View File
@@ -15,7 +15,7 @@
/* USER_AREA_START, see memlayout.h */ /* USER_AREA_START, see memlayout.h */
virtual_base = 0x10000000; virtual_base = 0x10000000;
__stack = (0x20000000 - 0x1000 - 8); /* First page before env/args page */ __stack = (0x20000000 - 0x1000 - 8); /* First page before env/args page */
INCLUDE "include/physical_base.lds" INCLUDE "physical_base.lds"
/* physical_base = 0x228000; */ /* physical_base = 0x228000; */
offset = virtual_base - physical_base; offset = virtual_base - physical_base;
containers/posix/mm0/include/linker.lds → containers/posix/mm0/linker.lds
+1 -1
View File
@@ -14,7 +14,7 @@
*/ */
/* INITTASK_AREA_START, see memlayout.h */ /* INITTASK_AREA_START, see memlayout.h */
virtual_base = 0xE0000000; virtual_base = 0xE0000000;
INCLUDE "include/physical_base.lds" INCLUDE "physical_base.lds"
/* physical_base = 0x228000; */ /* physical_base = 0x228000; */
pager_offset = virtual_base - physical_base; pager_offset = virtual_base - physical_base;
containers/posix/test0/SConscript
+1 -1
View File
@@ -75,7 +75,7 @@ def createTestExecS(target, source, env):
testTaskEnvironment = environment.Clone() testTaskEnvironment = environment.Clone()
testTaskEnvironment.Append(CPPPATH=['#' + testTaskEnvironment['posixServicesDirectory'] +'/libposix/include/posix']) testTaskEnvironment.Append(CPPPATH=['#' + testTaskEnvironment['posixServicesDirectory'] +'/libposix/include/posix'])
testExecLinkerScript = Command('#build/' + testTaskEnvironment['posixServicesDirectory'] +'/' + taskName + '/include/test_exec_linker.lds', testTaskEnvironment['physicalBaseLinkerScript'], createTestExecLinkerScript) testExecLinkerScript = Command('#build/' + testTaskEnvironment['posixServicesDirectory'] +'/' + taskName + '/test_exec_linker.lds', testTaskEnvironment['physicalBaseLinkerScript'], createTestExecLinkerScript)
testExecEnvironment = testTaskEnvironment.Clone() testExecEnvironment = testTaskEnvironment.Clone()
testExecEnvironment.Append(LINKFLAGS=['-T' + testExecLinkerScript[0].path]) testExecEnvironment.Append(LINKFLAGS=['-T' + testExecLinkerScript[0].path])
testExec = testExecEnvironment.Program('test_exec', Glob('src/test_exec/*.[cS]')) testExec = testExecEnvironment.Program('test_exec', Glob('src/test_exec/*.[cS]'))
containers/posix/test0/include/linker.lds → containers/posix/test0/linker.lds
+1 -1
View File
@@ -15,7 +15,7 @@
/* USER_AREA_START, see memlayout.h */ /* USER_AREA_START, see memlayout.h */
virtual_base = 0x10000000; virtual_base = 0x10000000;
__stack = (0x20000000 - 0x1000 - 8); /* First page before the env/args */ __stack = (0x20000000 - 0x1000 - 8); /* First page before the env/args */
INCLUDE "include/physical_base.lds" INCLUDE "physical_base.lds"
/* physical_base = 0x228000; */ /* physical_base = 0x228000; */
offset = virtual_base - physical_base; offset = virtual_base - physical_base;