mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-01-15 07:34:33 +00:00
Work around build problem with OpenJDK, which defines X86 as a
macro. Fixes PR 4427. Patch by Xerxes Rånby! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@73961 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
27a2dbbdf5
commit
bcba7f95c2
@ -447,7 +447,8 @@ AC_SUBST(TARGETS_TO_BUILD,$TARGETS_TO_BUILD)
|
||||
# If so, define LLVM_NATIVE_ARCH to that LLVM target.
|
||||
for a_target in $TARGETS_TO_BUILD; do
|
||||
if test "$a_target" = "$LLVM_NATIVE_ARCH"; then
|
||||
AC_DEFINE_UNQUOTED(LLVM_NATIVE_ARCH,$LLVM_NATIVE_ARCH,
|
||||
LLVM_NATIVE_ARCHTARGET="${LLVM_NATIVE_ARCH}Target"
|
||||
AC_DEFINE_UNQUOTED(LLVM_NATIVE_ARCH,$LLVM_NATIVE_ARCHTARGET,
|
||||
[LLVM architecture name for the native architecture, if available])
|
||||
fi
|
||||
done
|
||||
|
@ -582,4 +582,4 @@
|
||||
#cmakedefine strdup ${strdup}
|
||||
|
||||
/* Native LLVM architecture */
|
||||
#cmakedefine LLVM_NATIVE_ARCH ${LLVM_NATIVE_ARCH}
|
||||
#cmakedefine LLVM_NATIVE_ARCH ${LLVM_NATIVE_ARCH}Target
|
||||
|
@ -50,9 +50,9 @@ namespace llvm {
|
||||
inline bool InitializeNativeTarget() {
|
||||
// If we have a native target, initialize it to ensure it is linked in.
|
||||
#ifdef LLVM_NATIVE_ARCH
|
||||
#define DoInit2(TARG, MOD) llvm::Initialize ## TARG ## MOD()
|
||||
#define DoInit(T, M) DoInit2(T, M)
|
||||
DoInit(LLVM_NATIVE_ARCH, Target);
|
||||
#define DoInit2(TARG) llvm::Initialize ## TARG ()
|
||||
#define DoInit(T) DoInit2(T)
|
||||
DoInit(LLVM_NATIVE_ARCH);
|
||||
return false;
|
||||
#undef DoInit
|
||||
#undef DoInit2
|
||||
|
Loading…
x
Reference in New Issue
Block a user