Skip to content

Linker-script processing fixes #1888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kroening merged 6 commits into from
Mar 3, 2018
Merged

Linker-script processing fixes #1888

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1f753d8
fixup! goto-gcc removes CPROVER macros for native gcc
tautschnig Sep 7, 2017
631ea60
Make linker-script processing failures non-fatal
tautschnig Sep 7, 2017
60487f7
Distribute ls_parse.py with goto-cc
tautschnig Sep 7, 2017
1612f74
Do not modify object_files list while processing it
tautschnig Sep 8, 2017
e999552
Linker-script processing: mind temporaries
tautschnig Feb 27, 2018
b371e28
Linker-scripts: support linker symbols with struct type
tautschnig Feb 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/goto-cc/gcc_mode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,7 @@ int gcc_modet::run_gcc(const compilet &compiler)
for(const auto &a : cmdline.parsed_argv)
new_argv.push_back(a.arg);

if(compiler.wrote_object_files())
if(!act_as_ld && compiler.wrote_object_files())
Copy link
Collaborator

@martin-cs martin-cs Mar 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is not clear to me where this is set / why this would work but in this part of the code I am willing to take your word for it.

Copy link
Collaborator Author

@tautschnig tautschnig Mar 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

act_as_ld is a class member set upon construction, with its value dependent on the name of the executable that is running this code ("goto-ld" -> true, "goto-cc" -> false). When acting as a linker, we shouldn't be adding preprocessor command-line options.

Copy link
Collaborator

@martin-cs martin-cs Mar 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK; fair.

{
// Undefine all __CPROVER macros for the system compiler
std::map<irep_idt, std::size_t> arities;
Expand Down