RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-01-31 17:42:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: Add LLVM_NATIVE_ARCHNAME, which has the sensible value, without "Target"

Browse Source 
appended.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@110109 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2010-08-03 14:26:17 +00:00
parent 779b69d6f9
commit b1247c313d
6 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autoconf/configure.ac
View File

@ -599,6 +599,8 @@ AC_SUBST(TARGETS_TO_BUILD,$TARGETS_TO_BUILD)
for a_target in $TARGETS_TO_BUILD; do
if test "$a_target" = "$LLVM_NATIVE_ARCH"; then
LLVM_NATIVE_ARCHTARGET="${LLVM_NATIVE_ARCH}Target"
AC_DEFINE_UNQUOTED(LLVM_NATIVE_ARCHNAME,$LLVM_NATIVE_ARCH,
[Short LLVM architecture name for the native architecture, if available])
AC_DEFINE_UNQUOTED(LLVM_NATIVE_ARCH,$LLVM_NATIVE_ARCHTARGET,
[LLVM architecture name for the native architecture, if available])
fi

1
cmake/config-ix.cmake
View File

@ -207,6 +207,7 @@ else ()
endif ()
if (LLVM_NATIVE_ARCH)
set(LLVM_NATIVE_ARCHNAME ${LLVM_NATIVE_ARCH})
list(FIND LLVM_TARGETS_TO_BUILD ${LLVM_NATIVE_ARCH} NATIVE_ARCH_IDX)
if (NATIVE_ARCH_IDX EQUAL -1)
message(STATUS

7
configure vendored
View File

@ -5017,6 +5017,11 @@ for a_target in $TARGETS_TO_BUILD; do
if test "$a_target" = "$LLVM_NATIVE_ARCH"; then
LLVM_NATIVE_ARCHTARGET="${LLVM_NATIVE_ARCH}Target"
cat >>confdefs.h <<_ACEOF
#define LLVM_NATIVE_ARCHNAME $LLVM_NATIVE_ARCH
_ACEOF
cat >>confdefs.h <<_ACEOF
#define LLVM_NATIVE_ARCH $LLVM_NATIVE_ARCHTARGET
_ACEOF
@ -11391,7 +11396,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 11394 "configure"
#line 11399 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H

3
include/llvm/Config/config.h.cmake
View File

@ -625,3 +625,6 @@
/* Native LLVM architecture */
#cmakedefine LLVM_NATIVE_ARCH ${LLVM_NATIVE_ARCH}Target
/* Native LLVM architecture, short name */
#cmakedefine LLVM_NATIVE_ARCHNAME ${LLVM_NATIVE_ARCH}

3
include/llvm/Config/config.h.in
View File

@ -500,6 +500,9 @@
/* LLVM architecture name for the native architecture, if available */
#undef LLVM_NATIVE_ARCH
/* Short LLVM architecture name for the native architecture, if available */
#undef LLVM_NATIVE_ARCHNAME
/* Define if this is Unixish platform */
#undef LLVM_ON_UNIX

11
include/llvm/Target/TargetSelect.h
View File

@ -30,13 +30,6 @@ extern "C" {
#define LLVM_ASM_PRINTER(TargetName) void LLVMInitialize##TargetName##AsmPrinter();
#include "llvm/Config/AsmPrinters.def"
// FIXME: Workaround for unfortunate definition of LLVM_NATIVE_ARCH.
#define LLVM_ASM_PRINTER(TargetName) \
static inline void LLVMInitialize##TargetName##TargetAsmPrinter() { \
LLVMInitialize##TargetName##AsmPrinter(); \
}
#include "llvm/Config/AsmPrinters.def"
// Declare all of the available assembly parser initialization functions.
#define LLVM_ASM_PARSER(TargetName) void LLVMInitialize##TargetName##AsmParser();
#include "llvm/Config/AsmParsers.def"
@ -107,7 +100,7 @@ namespace llvm {
/// It is legal for a client to make multiple calls to this function.
inline bool InitializeNativeTarget() {
// If we have a native target, initialize it to ensure it is linked in.
#ifdef LLVM_NATIVE_ARCH
#ifdef LLVM_NATIVE_ARCHNAME
#define DoInit2(TARG) \
LLVMInitialize ## TARG ## Info (); \
LLVMInitialize ## TARG ()
@ -129,7 +122,7 @@ namespace llvm {
#define DoInit2(TARG) \
LLVMInitialize ## TARG ## AsmPrinter ();
#define DoInit(T) DoInit2(T)
DoInit(LLVM_NATIVE_ARCH);
DoInit(LLVM_NATIVE_ARCHNAME);
return false;
#undef DoInit
#undef DoInit2