diff options
| author | lloyd <[email protected]> | 2008-08-27 15:30:09 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2008-08-27 15:30:09 +0000 |
| commit | abe4d72b970a6f111cd69f24fc647aa891150c81 (patch) | |
| tree | 866bddd5897e0151dc2d5465debd9259e0d3308c | |
| parent | 999e3f574b058ad4c19007eb9b2768709bcb62e7 (diff) | |
Make the header guard macros for the x86 and x86-64 asm_macr.h header
unique.
Add a note for the GNU linker specifying we are using a non-executable
stack (requested by both Gentoo and SuSE)
| -rw-r--r-- | modules/alg_amd64/asm_macr.h | 10 | ||||
| -rw-r--r-- | modules/alg_ia32/asm_macr.h | 10 |
2 files changed, 14 insertions, 6 deletions
diff --git a/modules/alg_amd64/asm_macr.h b/modules/alg_amd64/asm_macr.h index 4ac98bd03..89e5bd028 100644 --- a/modules/alg_amd64/asm_macr.h +++ b/modules/alg_amd64/asm_macr.h @@ -1,10 +1,14 @@ /************************************************* * Assembly Macros Header File * -* (C) 1999-2007 Jack Lloyd * +* (C) 1999-2008 Jack Lloyd * *************************************************/ -#ifndef BOTAN_EXT_ASM_MACROS_H__ -#define BOTAN_EXT_ASM_MACROS_H__ +#ifndef BOTAN_EXT_AMD64_ASM_MACROS_H__ +#define BOTAN_EXT_AMD64_ASM_MACROS_H__ + +#ifdef __ELF__ +.section .note.GNU-stack,"",%progbits +#endif /************************************************* * General/Global Macros * diff --git a/modules/alg_ia32/asm_macr.h b/modules/alg_ia32/asm_macr.h index cc4a1b2cc..392b05d5b 100644 --- a/modules/alg_ia32/asm_macr.h +++ b/modules/alg_ia32/asm_macr.h @@ -1,10 +1,14 @@ /************************************************* * Assembly Macros Header File * -* (C) 1999-2007 Jack Lloyd * +* (C) 1999-2008 Jack Lloyd * *************************************************/ -#ifndef BOTAN_EXT_ASM_MACROS_H__ -#define BOTAN_EXT_ASM_MACROS_H__ +#ifndef BOTAN_EXT_IA32_ASM_MACROS_H__ +#define BOTAN_EXT_IA32_ASM_MACROS_H__ + +#ifdef __ELF__ +.section .note.GNU-stack,"",%progbits +#endif /************************************************* * General/Global Macros * |