summaryrefslogtreecommitdiff
path: root/qmake
diff options
context:
space:
mode:
authorRolland Dudemaine <rolland@ghs.com>2011-11-15 17:28:14 +0100
committerHarald Fernengel <harald.fernengel@nokia.com>2011-11-15 17:28:14 +0100
commit96f9dd665f0bd56fc39a327481ba440c6d8450bd (patch)
tree8b8a0ca9d00aaa9e304c805719c81f329146d380 /qmake
parent70c4230cbc0ce06d54e2451d9300dd855280ae33 (diff)
downloadqt4-tools-96f9dd665f0bd56fc39a327481ba440c6d8450bd.tar.gz
Clean up generated linker file for the shared library case.
Generated linker file was not looking good, now much better. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/integrity/gbuild.cpp20
1 files changed, 11 insertions, 9 deletions
diff --git a/qmake/generators/integrity/gbuild.cpp b/qmake/generators/integrity/gbuild.cpp
index 48bd57f612..fcadec0de3 100644
--- a/qmake/generators/integrity/gbuild.cpp
+++ b/qmake/generators/integrity/gbuild.cpp
@@ -189,26 +189,28 @@ GBuildMakefileGenerator::writeMakefile(QTextStream &text)
tl << "}\n"
"-sec\n"
"{\n"
- " .picbase __INTEGRITY_LibCBaseAddress :\n"
+ " .picbase __INTEGRITY_LibCBaseAddress :\n"
" .text :\n"
- " .syscall :\n"
+ " .syscall :\n"
" .intercall :\n"
" .interfunc :\n"
- " .secinfo :\n"
- " .rodata align(16) :\n"
- " .fixaddr :\n"
- " .fixtype :\n"
+ " .secinfo :\n"
+ " .rodata align(16) :\n"
+ " .fixaddr :\n"
+ " .fixtype :\n"
" .rombeg :\n"
" .textchecksum :\n"
" // The above sections may be large. Leave a bigger gap for large pages.\n"
- " .pidbase align(__INTEGRITY_MaxPageAlign) :\n"
+ " .pidbase align(__INTEGRITY_MaxPageAlign) :\n"
" .sdabase :\n"
" .data :\n"
" .toc :\n"
" .opd :\n"
" .datachecksum :\n"
- " .bss align(__INTEGRITY_MinPageAlign) :\n"
- " .heap :\n"
+ " .sbss : \n"
+ " .bss align(__INTEGRITY_MinPageAlign) :\n"
+ " .argsection(__INTEGRITY_MaxPageAlign) :\n"
+ " .heap : \n"
"}\n";
tl.flush();
dllbase += DLLOFFSET;