Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Wim Lewis
nettle
Commits
1851417e
Commit
1851417e
authored
May 31, 2014
by
Niels Möller
Browse files
Check for COFF type directive, and use in assembly RPOLOGUE.
Fixes problem with windows dll linking.
parent
3445687d
Changes
4
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
1851417e
2014-05-31 Niels Möller <nisse@lysator.liu.se>
* configure.ac: Check for COFF type directives.
(ASM_COFF_STYLE): New substituted variable.
* config.m4.in: Set COFF_STYLE from configure.
* asm.m4 (PROLOGUE): Use COFF type directive, if enabled by
configure. Fixes problem with windows dll linking.
* asm.m4: Deleted unused offsets for struct aes_ctx.
2014-05-28 Niels Möller <nisse@lysator.liu.se>
...
...
asm.m4
View file @
1851417e
...
...
@@ -19,6 +19,13 @@ define(<PROLOGUE>,
<.globl C_NAME($1)
.type C_NAME($1),TYPE_FUNCTION
C_NAME($1):>,
COFF_STYLE, <yes>,
<.globl C_NAME($1)
.def C_NAME($1)
.scl 2
.type 32
.endef
C_NAME($1):>,
<.globl C_NAME($1)
C_NAME($1):>)>)
...
...
config.m4.in
View file @
1851417e
define(<srcdir>, <<@srcdir@>>)dnl
define(<C_NAME>, <@ASM_SYMBOL_PREFIX@><$1>)dnl
define(<ELF_STYLE>, <@ASM_ELF_STYLE@>)dnl
define(<COFF_STYLE>, <@ASM_COFF_STYLE@>)dnl
define(<TYPE_FUNCTION>, <@ASM_TYPE_FUNCTION@>)dnl
define(<TYPE_PROGBITS>, <@ASM_TYPE_PROGBITS@>)dnl
define(<ALIGN_LOG>, <@ASM_ALIGN_LOG@>)dnl
...
...
configure.ac
View file @
1851417e
...
...
@@ -487,6 +487,7 @@ AC_SUBST([CCPIC_MAYBE])
ASM_SYMBOL_PREFIX=''
ASM_ELF_STYLE='no'
ASM_COFF_STYLE='no'
# GNU as default is to use @
ASM_TYPE_FUNCTION='@function'
ASM_TYPE_PROGBITS='@progbits'
...
...
@@ -554,6 +555,23 @@ foo:
fi
fi
AC_CACHE_CHECK([for COFF-style .type directive],
[nettle_cv_asm_coff_type],
[GMP_TRY_ASSEMBLE([
.text
.globl _foo
.def _foo
.scl 2
.type 32
.endef
_foo:
],
[nettle_cv_asm_coff_type=yes],
[nettle_cv_asm_coff_type=no])])
if test "x$nettle_cv_asm_coff_type" = "xyes" ; then
ASM_COFF_STYLE=yes
fi
AC_CACHE_CHECK([if we should use a .note.GNU-stack section],
nettle_cv_asm_gnu_stack,
[ # Default
...
...
@@ -589,6 +607,7 @@ fi
AC_SUBST(ASM_SYMBOL_PREFIX)
AC_SUBST(ASM_ELF_STYLE)
AC_SUBST(ASM_COFF_STYLE)
AC_SUBST(ASM_TYPE_FUNCTION)
AC_SUBST(ASM_TYPE_PROGBITS)
AC_SUBST(ASM_MARK_NOEXEC_STACK)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment