diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2014-10-20 16:03:50 -0700 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2014-10-20 16:28:42 -0700 |
| commit | d5d6fb340410727345a7b5a47bcf83e7847ea4a3 (patch) | |
| tree | 88b880020f9a51b694d9bf23e546db3a7b8377e6 /compiler/cmm | |
| parent | a3860fc4e253ecb4854e86aed78c56e72f318840 (diff) | |
| download | haskell-d5d6fb340410727345a7b5a47bcf83e7847ea4a3.tar.gz | |
Revert "Place static closures in their own section."
This reverts commit b23ba2a7d612c6b466521399b33fe9aacf5c4f75.
Conflicts:
compiler/cmm/PprCmmDecl.hs
compiler/nativeGen/PPC/Ppr.hs
compiler/nativeGen/SPARC/Ppr.hs
compiler/nativeGen/X86/Ppr.hs
Diffstat (limited to 'compiler/cmm')
| -rw-r--r-- | compiler/cmm/Cmm.hs | 1 | ||||
| -rw-r--r-- | compiler/cmm/CmmParse.y | 2 | ||||
| -rw-r--r-- | compiler/cmm/PprCmmDecl.hs | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/compiler/cmm/Cmm.hs b/compiler/cmm/Cmm.hs index 98c5b59f23..9e9bae93c6 100644 --- a/compiler/cmm/Cmm.hs +++ b/compiler/cmm/Cmm.hs @@ -170,7 +170,6 @@ data Section | RelocatableReadOnlyData | UninitialisedData | ReadOnlyData16 -- .rodata.cst16 on x86_64, 16-byte aligned - | StaticClosures | OtherSection String data CmmStatic diff --git a/compiler/cmm/CmmParse.y b/compiler/cmm/CmmParse.y index db6cc49927..803333001c 100644 --- a/compiler/cmm/CmmParse.y +++ b/compiler/cmm/CmmParse.y @@ -1105,7 +1105,7 @@ staticClosure :: PackageKey -> FastString -> FastString -> [CmmLit] -> CmmParse staticClosure pkg cl_label info payload = do dflags <- getDynFlags let lits = mkStaticClosure dflags (mkCmmInfoLabel pkg info) dontCareCCS payload [] [] [] - code $ emitStaticClosure (mkCmmDataLabel pkg cl_label) lits + code $ emitDataLits (mkCmmDataLabel pkg cl_label) lits foreignCall :: String diff --git a/compiler/cmm/PprCmmDecl.hs b/compiler/cmm/PprCmmDecl.hs index c9bbc8b8f7..87cda6a9ad 100644 --- a/compiler/cmm/PprCmmDecl.hs +++ b/compiler/cmm/PprCmmDecl.hs @@ -162,7 +162,6 @@ pprSection s = case s of RelocatableReadOnlyData -> section <+> doubleQuotes (text "relreadonly") UninitialisedData -> section <+> doubleQuotes (text "uninitialised") - StaticClosures -> section <+> doubleQuotes (text "staticclosures") OtherSection s' -> section <+> doubleQuotes (text s') where section = ptext (sLit "section") |