diff options
| author | Ian Lance Taylor <iant@golang.org> | 2022-02-16 12:21:31 -0800 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2022-02-16 12:21:31 -0800 |
| commit | b43d6db9780462273c4d885a0111e3376c114c61 (patch) | |
| tree | 0dff7e34fe65a75ba82e4a13d69991fdaea7c5eb /gcc/go | |
| parent | 9419b14e109a2807361a9f695f5767f03dfa0cae (diff) | |
| parent | 24ca97325cab7bc454c785d55f37120fe7ea6f74 (diff) | |
| download | gcc-b43d6db9780462273c4d885a0111e3376c114c61.zip gcc-b43d6db9780462273c4d885a0111e3376c114c61.tar.gz gcc-b43d6db9780462273c4d885a0111e3376c114c61.tar.bz2 | |
Merge from trunk revision 24ca97325cab7bc454c785d55f37120fe7ea6f74.
Diffstat (limited to 'gcc/go')
| -rw-r--r-- | gcc/go/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/go/ChangeLog b/gcc/go/ChangeLog index dd94ab3..f50a60b7 100644 --- a/gcc/go/ChangeLog +++ b/gcc/go/ChangeLog @@ -1,3 +1,10 @@ +2022-02-13 Ian Lance Taylor <iant@golang.org> + + * gospec.cc: Revert 2022-02-09 change: + (RTLIB, RT_LIBRARY): Don't define. + (lang_specific_driver): Don't add -lrt if linking statically + on GNU/Linux. + 2022-02-09 Ian Lance Taylor <iant@golang.org> * gospec.cc (RTLIB, RT_LIBRARY): Define. diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 745132a..3742414 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -0af68c0552341a44f1fb12301f9eff954b9dde88 +3742e8a154bfec805054b4ebf0809f12dc7694da The first line of this file holds the git revision number of the last merge done from the gofrontend repository. |