Skip to content
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.

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

Fix issue 12965 - DMD sets ELFOSABI to ELFOSABI_LINUX on all systems #3687

Merged
merged 2 commits into from Jun 24, 2014

Conversation

jasonbking
Copy link

This will properly set the ELF OSABI field based on the target (for ELF targets).

https://issues.dlang.org/show_bug.cgi?id=12965

@dnadlinger
Copy link
Member

Added bugzilla link to the original message.

@@ -1069,7 +1081,7 @@ void Obj::term(const char *objfilename)
ELFCLASS32, // EI_CLASS
ELFDATA2LSB, // EI_DATA
EV_CURRENT, // EI_VERSION
ELFOSABI_LINUX,0, // EI_OSABI,EI_ABIVERSION
ELFOSABI,0, // EI_OSABI,EI_ABIVERSION
Copy link
Member

Choose a reason for hiding this comment

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

Please align comments.

@jasonbking
Copy link
Author

Added the requested tweaks.

WalterBright added a commit that referenced this pull request Jun 24, 2014
Fix issue 12965 - DMD sets ELFOSABI to ELFOSABI_LINUX on all systems
@WalterBright WalterBright merged commit b4b9908 into dlang:master Jun 24, 2014
@quickfur
Copy link
Member

This pull broke dmd build on my LInux/64-bit machine:

backend/elfobj.c:14:0: error: unterminated #if
 #if SCPP || MARS
 ^
posix.mak:356: recipe for target 'elfobj.o' failed
make[1]: *** [elfobj.o] Error 1
make[1]: Leaving directory '/mnt/1/usr/src/d/dmd/src'
posix.mak:8: recipe for target 'all' failed
make: *** [all] Error 2

@quickfur
Copy link
Member

Looks like it's missing an #endif at the end of the ELFOSABI block. How did this escape the autotester?!

@quickfur
Copy link
Member

Fix: pull #3691

@jasonbking
Copy link
Author

Eek! I had fixed this locally and thought I had pushed this out along with the other requested changes, but apparently did not. Sorry :(

@jasonbking jasonbking deleted the osabi branch June 24, 2014 20:29
@quickfur
Copy link
Member

No problem, I already fixed it and the fix just got merged. I'm just surprised it got past the autotester somehow.

@yebblies
Copy link
Member

No problem, I already fixed it and the fix just got merged. I'm just surprised it got past the autotester somehow.

It didn't, Walter just decided to merge it manually instead of using the autotester's auto-merge.

@quickfur
Copy link
Member

Ah, figures.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants