[commit: ghc] master: rts/Linker.c: Rename ONLY_USED_x86_64_HOST_ARCH macro (afa6e83)

git at git.haskell.org git at git.haskell.org
Mon Jun 27 09:55:39 UTC 2016


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/afa6e8309e8e7a069abcf7879791d53cdf22f00a/ghc

>---------------------------------------------------------------

commit afa6e8309e8e7a069abcf7879791d53cdf22f00a
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Mon Jun 27 19:37:06 2016 +1000

    rts/Linker.c: Rename ONLY_USED_x86_64_HOST_ARCH macro
    
    Summary:
    Rename it to `USED_IF_x86_64_HOST_ARCH` to make it more like the existing
    `USED_IF` macros as suggested by Simon Marlow.
    
    Test Plan: Build on x86_64 windows
    
    Reviewers: Phyx, bgamari, simonmar, austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D2365


>---------------------------------------------------------------

afa6e8309e8e7a069abcf7879791d53cdf22f00a
 rts/Linker.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rts/Linker.c b/rts/Linker.c
index af87713..f7ac748 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -329,9 +329,9 @@ static void *lookupSymbolInDLLs ( unsigned char *lbl );
 #endif
 
 #if defined(x86_64_HOST_ARCH)
-#define ONLY_USED_x86_64_HOST_ARCH(x) (x)
+#define USED_IF_x86_64_HOST_ARCH    /* Nothing */
 #else
-#define ONLY_USED_x86_64_HOST_ARCH(x) (x) GNUC3_ATTRIBUTE(__unused__)
+#define USED_IF_x86_64_HOST_ARCH    STG_UNUSED
 #endif
 
 static char *allocateImageAndTrampolines (
@@ -3073,9 +3073,9 @@ static int verifyCOFFHeader ( COFF_header *hdr, pathchar *filename);
 static char *
 allocateImageAndTrampolines (
    pathchar* arch_name, char* member_name,
-   FILE* ONLY_USED_x86_64_HOST_ARCH (f),
+   FILE* f USED_IF_x86_64_HOST_ARCH,
    int size,
-   int  ONLY_USED_x86_64_HOST_ARCH (isThin))
+   int isThin USED_IF_x86_64_HOST_ARCH)
 {
    char* image;
 #if defined(x86_64_HOST_ARCH)



More information about the ghc-commits mailing list