diff options
| author | Karel Gardas <karel.gardas@centrum.cz> | 2011-06-13 12:44:12 +0200 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2011-06-27 10:08:53 +0100 |
| commit | 32300c3218a7003231e043f2e52a85a22460d59f (patch) | |
| tree | 9b32c0be687038645ed73f9f12b7e00e39aa0ffd /compiler/utils/Platform.hs | |
| parent | 5a0b3770789058ea6a24da592944ed85b9a4aebd (diff) | |
| download | haskell-32300c3218a7003231e043f2e52a85a22460d59f.tar.gz | |
Fix to use %note instead of @note as an ELF section note on ARM architecture
It looks like where x86 assembly is using '@' character,
ARM assembly requires '%' character. This makes a problem in the patch
814edf44433801e37318ce79082ac6991dbc87dd 'Force re-linking if
the options have changed (#4451)' which makes linking assembly
file uncompilable on ARM. This patch fixes this.
Diffstat (limited to 'compiler/utils/Platform.hs')
| -rw-r--r-- | compiler/utils/Platform.hs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/utils/Platform.hs b/compiler/utils/Platform.hs index f3749ca09c..40e4a015df 100644 --- a/compiler/utils/Platform.hs +++ b/compiler/utils/Platform.hs @@ -39,6 +39,7 @@ data Arch | ArchPPC | ArchPPC_64 | ArchSPARC + | ArchARM deriving (Show, Eq) @@ -63,6 +64,7 @@ target32Bit p = case platformArch p of ArchPPC -> True ArchPPC_64 -> False ArchSPARC -> True + ArchARM -> True -- | This predicates tells us whether the OS supports ELF-like shared libraries. @@ -95,6 +97,8 @@ defaultTargetArch = ArchPPC defaultTargetArch = ArchPPC_64 #elif sparc_TARGET_ARCH defaultTargetArch = ArchSPARC +#elif arm_TARGET_ARCH +defaultTargetArch = ArchARM #else defaultTargetArch = ArchUnknown #endif |