diff options
| author | Sergei Trofimovich <slyfox@gentoo.org> | 2018-06-01 08:35:23 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2018-06-01 16:21:26 +0000 |
| commit | 9fd4ed90bcdb22fc0d71051644084b75a3e8a376 (patch) | |
| tree | e5e5ca8f307c42977a1e0313b8824ee89bf43f76 /compiler/cmm/CLabel.hs | |
| parent | 9921f5b0f04a5b7871a4852e4da368ea6a763ec3 (diff) | |
| download | haskell-9fd4ed90bcdb22fc0d71051644084b75a3e8a376.tar.gz | |
UNREG: mark SRT as writable in generated C code
Noticed section mismatch on UNREG build failure:
```
HC [stage 1] libraries/integer-gmp/dist-install/build/GHC/Integer/Type.o
error: conflicting types for 'ufu0_srt'
static StgWord ufu0_srt[]__attribute__((aligned(8)))= {
^~~~~~~~
note: previous declaration of 'ufu0_srt' was here
IRO_(ufu0_srt);
^~~~~~~~
```
`IRO_` is a 'const' qualifier.
The error is a leftover from commit 838b69032566ce6ab3918d70e8d5e098d0bcee02
"Merge FUN_STATIC closure with its SRT" where part of SRT was moved
into closure itself and made SRTs writable.
This change puts all SRTs into writable section.
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Reviewers: simonmar, bgamari
Subscribers: rwbarton, thomie, carter
Differential Revision: https://phabricator.haskell.org/D4731
Diffstat (limited to 'compiler/cmm/CLabel.hs')
| -rw-r--r-- | compiler/cmm/CLabel.hs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs index 8f614ab34f..3553283890 100644 --- a/compiler/cmm/CLabel.hs +++ b/compiler/cmm/CLabel.hs @@ -616,8 +616,6 @@ isSomeRODataLabel (IdLabel _ _ ConInfoTable) = True isSomeRODataLabel (IdLabel _ _ InfoTable) = True isSomeRODataLabel (IdLabel _ _ LocalInfoTable) = True isSomeRODataLabel (IdLabel _ _ BlockInfoTable) = True --- static reference tables defined in haskell (.hs) -isSomeRODataLabel (SRTLabel _) = True -- info table defined in cmm (.cmm) isSomeRODataLabel (CmmLabel _ _ CmmInfo) = True isSomeRODataLabel _lbl = False |