search

freemint / m68k-atari-mint-gcc

Fork of GNU's gcc with support for the m68k-atari-mint target
https://github.com/freemint/m68k-atari-mint-gcc/wiki
Other
27 stars 7 forks source link

GCC 7.3.0 #7

Closed mikrosk closed 6 years ago

mikrosk commented 6 years ago

I've had this on my disk for a long time. Couldn't find a problem so here it is.

There's a lot of commits but that's because of gcc-7_3_0-release tag merge. The only thing worth mentioning is @th-otto's https://github.com/freemint/m68k-atari-mint-gcc/commit/52935e2b59db5a4047d648f19e2e4ae7cb351ffa.

Thorsten has a lot of other commits in his branch but they seem to be MinGW related so I didn't include them.

@vinriviere / @th-otto if you don't have objections, please merge it (using rebase, to keep the look of the previous changes). After that I'll finally make a release in https://github.com/freemint/m68k-atari-mint-gcc/releases.

th-otto commented 6 years ago

Thorsten has a lot of other commits in his branch but they seem to be MinGW related so I didn't include >them.

Yes, i'm not happy with that either, because they pollute the branch with changes that are not related to the m68k target. But they are needed to build a gcc on mingw (any gcc actually, not only cross compilers).

vinriviere commented 6 years ago

Including a merge in a pull request is probably a bad idea, as the pull request becomes huge and unreadable... A standard merge would produce ugly history, as usual (untested). While rebase would have rewritten all the gcc-7_3_0-release commits, which is definitely not what we want (also untested, as GitHub announced conflicts). My new friend is "git merge --ff-only" which precisely did exactly what I expected (keep all merged commits as-is). I guess that "git reset --hard ..." would have done the same. Anyway. After having done "git push", GitHub has automatically detected that your Pull Request had been merged. Wow, that's cool.

Note: I created this branch to keep track of @th-otto's work posted on the EmuTOS mailing list. I have never built GCC 7 myself. But if everything here is fine, that's just perfect. And if you provide automatic binaries, that's just perfect.

mikrosk commented 6 years ago

Thanks! You are right Vincent, your method was the most suitable one. Glad that you have figured it out and it works perfectly. I'm building the binaries right now from scratch, I plan to integrate my Makefile into this (and binutils) project after I clean it up a little.