Gabe Black has submitted this change and it was merged. (
https://gem5-review.googlesource.com/3001 )
Change subject: scons: Fix the compiler flag used for partial linking.
......................................................................
scons: Fix the compiler flag used for partial linking.
It seems that g++ can generally handle the -r flag for generating a
relocatable object file, but ld can't always handle the --relocatable
flag.
Change-Id: I15f32e469590a814131d4e992b392a7ad6c52b83
Reviewed-on: https://gem5-review.googlesource.com/3001
Reviewed-by: Andreas Hansson <[email protected]>
Reviewed-by: Andreas Sandberg <[email protected]>
Maintainer: Andreas Sandberg <[email protected]>
---
M SConstruct
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Andreas Sandberg: Looks good to me, approved; Looks good to me, approved
Andreas Hansson: Looks good to me, but someone else must approve
diff --git a/SConstruct b/SConstruct
index ff6de94..d252865 100755
--- a/SConstruct
+++ b/SConstruct
@@ -685,7 +685,7 @@
main['FILTER_PSHLINKFLAGS'] = lambda x: str(x).replace(' -shared', '')
main['PSHLINKFLAGS'] =
main.subst('${FILTER_PSHLINKFLAGS(SHLINKFLAGS)}')
main['PLINKFLAGS'] = main.subst('${LINKFLAGS}')
- shared_partial_flags = ['-Wl,--relocatable', '-nostdlib']
+ shared_partial_flags = ['-r', '-nostdlib']
main.Append(PSHLINKFLAGS=shared_partial_flags)
main.Append(PLINKFLAGS=shared_partial_flags)
else:
--
To view, visit https://gem5-review.googlesource.com/3001
To unsubscribe, visit https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I15f32e469590a814131d4e992b392a7ad6c52b83
Gerrit-Change-Number: 3001
Gerrit-PatchSet: 2
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Andreas Hansson <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
