[PATCH 4/4] Fix CFI_PUSH/CFI_POP redefine build warning with AMD64 MPI

Jussi Kivilinna jussi.kivilinna at iki.fi
Sat Apr 27 22:03:15 CEST 2019


* mpi/amd64/func_abi.h: Move CFI macros into [__x86_64__] block.
* mpi/i386/syntax.h: Move CFI macros into [__i386__] block.
--

Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>
---
 0 files changed

diff --git a/mpi/amd64/func_abi.h b/mpi/amd64/func_abi.h
index 37d5722af..a60363e4e 100644
--- a/mpi/amd64/func_abi.h
+++ b/mpi/amd64/func_abi.h
@@ -1,5 +1,6 @@
 #include <config.h>
 
+#ifdef __x86_64__
 #ifdef HAVE_GCC_ASM_CFI_DIRECTIVES
 # define CFI_STARTPROC()            .cfi_startproc
 # define CFI_ENDPROC()              .cfi_endproc
@@ -21,6 +22,7 @@
 # define CFI_PUSH(reg)
 # define CFI_POP(reg)
 #endif
+#endif
 
 #ifdef USE_MS_ABI
  /* Store registers and move four first input arguments from MS ABI to
diff --git a/mpi/i386/syntax.h b/mpi/i386/syntax.h
index 9101585a8..dd3003199 100644
--- a/mpi/i386/syntax.h
+++ b/mpi/i386/syntax.h
@@ -28,6 +28,7 @@
 
 #include <config.h>
 
+#ifdef __i386__
 #ifdef HAVE_GCC_ASM_CFI_DIRECTIVES
 # define CFI_STARTPROC()            .cfi_startproc
 # define CFI_ENDPROC()              .cfi_endproc
@@ -49,6 +50,7 @@
 # define CFI_PUSH(reg)
 # define CFI_POP(reg)
 #endif
+#endif
 
 #undef ALIGN
 




More information about the Gcrypt-devel mailing list