diff options
| author | lloyd <[email protected]> | 2008-11-09 17:24:06 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2008-11-09 17:24:06 +0000 |
| commit | 2dada64d07767d7794d0f325b2df99b090ecc758 (patch) | |
| tree | d16396c84f62372784988562a14be1d98662b96d /src/utils | |
| parent | db172f9347a15d14ea016bab2f1419eba9a9eac9 (diff) | |
Macro cleanup
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/asm_amd64/asm_macr.h | 8 | ||||
| -rw-r--r-- | src/utils/asm_ia32/asm_macr.h | 9 |
2 files changed, 6 insertions, 11 deletions
diff --git a/src/utils/asm_amd64/asm_macr.h b/src/utils/asm_amd64/asm_macr.h index 3cdd42dc6..6f819591f 100644 --- a/src/utils/asm_amd64/asm_macr.h +++ b/src/utils/asm_amd64/asm_macr.h @@ -6,10 +6,6 @@ #ifndef BOTAN_AMD64_ASM_MACROS_H__ #define BOTAN_AMD64_ASM_MACROS_H__ -#ifdef __ELF__ -.section .note.GNU-stack,"",%progbits -#endif - /************************************************* * General/Global Macros * *************************************************/ @@ -20,6 +16,10 @@ .text; \ ALIGN; +#if defined(__ELF__) +.section .note.GNU-stack,"",%progbits +#endif + /************************************************* * Function Definitions * *************************************************/ diff --git a/src/utils/asm_ia32/asm_macr.h b/src/utils/asm_ia32/asm_macr.h index 6d5dbb59d..58f9be19a 100644 --- a/src/utils/asm_ia32/asm_macr.h +++ b/src/utils/asm_ia32/asm_macr.h @@ -6,10 +6,6 @@ #ifndef BOTAN_IA32_ASM_MACROS_H__ #define BOTAN_IA32_ASM_MACROS_H__ -#ifdef __ELF__ -.section .note.GNU-stack,"",%progbits -#endif - /************************************************* * General/Global Macros * *************************************************/ @@ -18,9 +14,9 @@ #define START_LISTING(FILENAME) \ .file #FILENAME; \ .text; \ - .p2align 4,,15; + ALIGN; -#ifdef __ELF__ +#if defined(__ELF__) .section .note.GNU-stack,"",%progbits #endif @@ -28,7 +24,6 @@ * Function Definitions * *************************************************/ #define START_FUNCTION(func_name) \ - .align 8; \ ALIGN; \ .global func_name; \ .type func_name,@function; \ |