projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e5d8b4d
)
Eliminate IF_ARCH_sparc
author
Ian Lynagh
<igloo@earth.li>
Tue, 31 May 2011 21:15:33 +0000
(22:15 +0100)
committer
Ian Lynagh
<igloo@earth.li>
Tue, 31 May 2011 21:15:33 +0000
(22:15 +0100)
compiler/nativeGen/NCG.h
patch
|
blob
|
history
compiler/nativeGen/PPC/Ppr.hs
patch
|
blob
|
history
compiler/nativeGen/SPARC/Ppr.hs
patch
|
blob
|
history
compiler/nativeGen/X86/Ppr.hs
patch
|
blob
|
history
diff --git
a/compiler/nativeGen/NCG.h
b/compiler/nativeGen/NCG.h
index
af0ff0e
..
81cbf61
100644
(file)
--- a/
compiler/nativeGen/NCG.h
+++ b/
compiler/nativeGen/NCG.h
@@
-26,12
+26,6
@@
# define IF_OS_linux(x,y) y
#endif
-- - - - - - - - - - - - - - - - - - - - - -
# define IF_OS_linux(x,y) y
#endif
-- - - - - - - - - - - - - - - - - - - - - -
-#if sparc_TARGET_ARCH
-# define IF_ARCH_sparc(x,y) x
-#else
-# define IF_ARCH_sparc(x,y) y
-#endif
--- - - - - - - - - - - - - - - - - - - - - -
#if darwin_TARGET_OS
# define IF_OS_darwin(x,y) x
#else
#if darwin_TARGET_OS
# define IF_OS_darwin(x,y) x
#else
diff --git
a/compiler/nativeGen/PPC/Ppr.hs
b/compiler/nativeGen/PPC/Ppr.hs
index
eac2d25
..
bd12a81
100644
(file)
--- a/
compiler/nativeGen/PPC/Ppr.hs
+++ b/
compiler/nativeGen/PPC/Ppr.hs
@@
-109,9
+109,7
@@
pprData (CmmStaticLit lit) = pprDataItem lit
pprGloblDecl :: CLabel -> Doc
pprGloblDecl lbl
| not (externallyVisibleCLabel lbl) = empty
pprGloblDecl :: CLabel -> Doc
pprGloblDecl lbl
| not (externallyVisibleCLabel lbl) = empty
- | otherwise = ptext IF_ARCH_sparc((sLit ".global "),
- (sLit ".globl ")) <>
- pprCLabel_asm lbl
+ | otherwise = ptext (sLit ".globl ") <> pprCLabel_asm lbl
pprTypeAndSizeDecl :: CLabel -> Doc
#if linux_TARGET_OS
pprTypeAndSizeDecl :: CLabel -> Doc
#if linux_TARGET_OS
diff --git
a/compiler/nativeGen/SPARC/Ppr.hs
b/compiler/nativeGen/SPARC/Ppr.hs
index
c5a3314
..
d78d1a7
100644
(file)
--- a/
compiler/nativeGen/SPARC/Ppr.hs
+++ b/
compiler/nativeGen/SPARC/Ppr.hs
@@
-101,9
+101,7
@@
pprData (CmmStaticLit lit) = pprDataItem lit
pprGloblDecl :: CLabel -> Doc
pprGloblDecl lbl
| not (externallyVisibleCLabel lbl) = empty
pprGloblDecl :: CLabel -> Doc
pprGloblDecl lbl
| not (externallyVisibleCLabel lbl) = empty
- | otherwise = ptext IF_ARCH_sparc((sLit ".global "),
- (sLit ".globl ")) <>
- pprCLabel_asm lbl
+ | otherwise = ptext (sLit ".global ") <> pprCLabel_asm lbl
pprTypeAndSizeDecl :: CLabel -> Doc
#if linux_TARGET_OS
pprTypeAndSizeDecl :: CLabel -> Doc
#if linux_TARGET_OS
diff --git
a/compiler/nativeGen/X86/Ppr.hs
b/compiler/nativeGen/X86/Ppr.hs
index
bf3e4dd
..
769057a
100644
(file)
--- a/
compiler/nativeGen/X86/Ppr.hs
+++ b/
compiler/nativeGen/X86/Ppr.hs
@@
-118,9
+118,7
@@
pprData (CmmStaticLit lit) = pprDataItem lit
pprGloblDecl :: CLabel -> Doc
pprGloblDecl lbl
| not (externallyVisibleCLabel lbl) = empty
pprGloblDecl :: CLabel -> Doc
pprGloblDecl lbl
| not (externallyVisibleCLabel lbl) = empty
- | otherwise = ptext IF_ARCH_sparc((sLit ".global "),
- (sLit ".globl ")) <>
- pprCLabel_asm lbl
+ | otherwise = ptext (sLit ".globl ") <> pprCLabel_asm lbl
pprTypeAndSizeDecl :: CLabel -> Doc
#if elf_OBJ_FORMAT
pprTypeAndSizeDecl :: CLabel -> Doc
#if elf_OBJ_FORMAT