From 4595756a373d110f07e360daf2ac793b8918a807 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Tue, 28 Dec 2010 12:42:05 +0000 Subject: [PATCH] [CMAKE] Fix stdcall entry points for x86 svn path=/branches/cmake-bringup/; revision=50189 --- gcc.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gcc.cmake b/gcc.cmake index 92b9bf238c0..67a91b90dee 100644 --- a/gcc.cmake +++ b/gcc.cmake @@ -105,10 +105,11 @@ macro(set_entrypoint MODULE ENTRYPOINT) if(${ENTRYPOINT} STREQUAL "0") add_linkerflag(${MODULE} "-Wl,-entry,0") elseif(ARCH MATCHES i386) + set(_entrysymbol _${ENTRYPOINT}) if (${ARGC} GREATER 2) - set(ENTRYPOINT ${ENTRYPOINT}@${ARGV2}) + set(_entrysymbol ${_entrysymbol}@${ARGV2}) endif() - add_linkerflag(${MODULE} "-Wl,-entry,_${ENTRYPOINT}") + add_linkerflag(${MODULE} "-Wl,-entry,${_entrysymbol}") else() add_linkerflag(${MODULE} "-Wl,-entry,${ENTRYPOINT}") endif()