Skip to content

Commit

Permalink
Regenerate Windows LLVM configs
Browse files Browse the repository at this point in the history
Running 'python3 update.py windows' from 'third_party/llvm-7.0/scripts/'

Bug chromium:944811

Change-Id: I4cd1a51b2c50f775d3131d5c66b1d33350b8004b
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/27870
Reviewed-by: Alexis Hétu <sugoi@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
Presubmit-Ready: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
  • Loading branch information
c0d1f1ed committed Mar 26, 2019
1 parent ea0822b commit cc6473f
Show file tree
Hide file tree
Showing 6 changed files with 166 additions and 47 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,18 @@
# error Please define the macro LLVM_ASM_PARSER(TargetName)
#endif

#if defined(__aarch64__)
LLVM_ASM_PARSER(AArch64)
LLVM_ASM_PARSER(AMDGPU)
#endif
#if defined(__arm__)
LLVM_ASM_PARSER(ARM)
LLVM_ASM_PARSER(BPF)
LLVM_ASM_PARSER(Hexagon)
LLVM_ASM_PARSER(Lanai)
LLVM_ASM_PARSER(Mips)
LLVM_ASM_PARSER(PowerPC)
LLVM_ASM_PARSER(Sparc)
LLVM_ASM_PARSER(SystemZ)
#endif
#if defined(__i386__) || defined(__x86_64__)
LLVM_ASM_PARSER(X86)
#endif
#if defined(__mips__)
LLVM_ASM_PARSER(Mips)
#endif


#undef LLVM_ASM_PARSER
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,18 @@
# error Please define the macro LLVM_ASM_PRINTER(TargetName)
#endif

#if defined(__aarch64__)
LLVM_ASM_PRINTER(AArch64)
LLVM_ASM_PRINTER(AMDGPU)
#endif
#if defined(__arm__)
LLVM_ASM_PRINTER(ARM)
LLVM_ASM_PRINTER(BPF)
LLVM_ASM_PRINTER(Hexagon)
LLVM_ASM_PRINTER(Lanai)
LLVM_ASM_PRINTER(Mips)
LLVM_ASM_PRINTER(MSP430)
LLVM_ASM_PRINTER(NVPTX)
LLVM_ASM_PRINTER(PowerPC)
LLVM_ASM_PRINTER(Sparc)
LLVM_ASM_PRINTER(SystemZ)
#endif
#if defined(__i386__) || defined(__x86_64__)
LLVM_ASM_PRINTER(X86)
LLVM_ASM_PRINTER(XCore)
#endif
#if defined(__mips__)
LLVM_ASM_PRINTER(Mips)
#endif


#undef LLVM_ASM_PRINTER
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@
# error Please define the macro LLVM_DISASSEMBLER(TargetName)
#endif

#if defined(__aarch64__)
LLVM_DISASSEMBLER(AArch64)
LLVM_DISASSEMBLER(AMDGPU)
#endif
#if defined(__arm__)
LLVM_DISASSEMBLER(ARM)
LLVM_DISASSEMBLER(BPF)
LLVM_DISASSEMBLER(Hexagon)
LLVM_DISASSEMBLER(Lanai)
LLVM_DISASSEMBLER(Mips)
LLVM_DISASSEMBLER(PowerPC)
LLVM_DISASSEMBLER(Sparc)
LLVM_DISASSEMBLER(SystemZ)
#endif
#if defined(__i386__) || defined(__x86_64__)
LLVM_DISASSEMBLER(X86)
LLVM_DISASSEMBLER(XCore)
#endif
#if defined(__mips__)
LLVM_DISASSEMBLER(Mips)
#endif


#undef LLVM_DISASSEMBLER
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,18 @@
# error Please define the macro LLVM_TARGET(TargetName)
#endif

#if defined(__aarch64__)
LLVM_TARGET(AArch64)
LLVM_TARGET(AMDGPU)
#endif
#if defined(__arm__)
LLVM_TARGET(ARM)
LLVM_TARGET(BPF)
LLVM_TARGET(Hexagon)
LLVM_TARGET(Lanai)
LLVM_TARGET(Mips)
LLVM_TARGET(MSP430)
LLVM_TARGET(NVPTX)
LLVM_TARGET(PowerPC)
LLVM_TARGET(Sparc)
LLVM_TARGET(SystemZ)
#endif
#if defined(__i386__) || defined(__x86_64__)
LLVM_TARGET(X86)
LLVM_TARGET(XCore)
#endif
#if defined(__mips__)
LLVM_TARGET(Mips)
#endif


#undef LLVM_TARGET
26 changes: 20 additions & 6 deletions third_party/llvm-7.0/configs/windows/include/llvm/Config/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
#define BUG_REPORT_URL "https://bugs.llvm.org/"

/* Define to 1 to enable backtraces, and to 0 otherwise. */
#define ENABLE_BACKTRACES 1
/* #undef ENABLE_BACKTRACES */

/* Define to 1 to enable crash overrides, and to 0 otherwise. */
#define ENABLE_CRASH_OVERRIDES 1
/* #undef ENABLE_CRASH_OVERRIDES */

/* Define to 1 if you have the `backtrace' function. */
/* #undef HAVE_BACKTRACE */

#define BACKTRACE_HEADER <execinfo.h>
/* #undef BACKTRACE_HEADER */

/* Define to 1 if you have the <CrashReporterClient.h> header file. */
/* #undef HAVE_CRASHREPORTERCLIENT_H */
Expand Down Expand Up @@ -245,7 +245,7 @@
/* #undef HAVE___ASHRDI3 */

/* Have host's __chkstk */
#define HAVE___CHKSTK 1
/* #undef HAVE___CHKSTK */

/* Have host's __chkstk_ms */
/* #undef HAVE___CHKSTK_MS */
Expand Down Expand Up @@ -291,7 +291,21 @@

/* Target triple LLVM will generate code for by default */
/* Doesn't use `cmakedefine` because it is allowed to be empty. */
#if defined(__x86_64__)
#define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-pc-win32"
#elif defined(__i386__)
#define LLVM_DEFAULT_TARGET_TRIPLE "i686-pc-win32"
#elif defined(__arm__)
#define LLVM_DEFAULT_TARGET_TRIPLE "armv7-pc-win32"
#elif defined(__aarch64__)
#define LLVM_DEFAULT_TARGET_TRIPLE "aarch64-pc-win32"
#elif defined(__mips__)
#define LLVM_DEFAULT_TARGET_TRIPLE "mipsel-pc-win32"
#elif defined(__mips64)
#define LLVM_DEFAULT_TARGET_TRIPLE "mips64el-pc-win32"
#else
#error "unknown architecture"
#endif

/* Define if zlib compression is available */
#define LLVM_ENABLE_ZLIB 0
Expand All @@ -318,10 +332,10 @@
#define PACKAGE_NAME "LLVM"

/* Define to the full name and version of this package. */
#define PACKAGE_STRING "LLVM 7.0.0"
#define PACKAGE_STRING "LLVM 7.0.1"

/* Define to the version of this package. */
#define PACKAGE_VERSION "7.0.0"
#define PACKAGE_VERSION "7.0.1"

/* Define to the vendor of this package. */
/* #undef PACKAGE_VENDOR */
Expand Down
112 changes: 110 additions & 2 deletions third_party/llvm-7.0/configs/windows/include/llvm/Config/llvm-config.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,38 @@
#ifndef LLVM_CONFIG_H
#define LLVM_CONFIG_H

#if !defined(__i386__) && defined(_M_IX86)
#define __i386__ 1
#endif

#if !defined(__x86_64__) && (defined(_M_AMD64) || defined (_M_X64))
#define __x86_64__ 1
#endif

#define LLVM_CONFIG_H

/* Define if LLVM_ENABLE_DUMP is enabled */
/* #undef LLVM_ENABLE_DUMP */

/* Define if we link Polly to the tools */
/* #undef LINK_POLLY_INTO_TOOLS */

/* Target triple LLVM will generate code for by default */
#if defined(__x86_64__)
#define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-pc-win32"
#elif defined(__i386__)
#define LLVM_DEFAULT_TARGET_TRIPLE "i686-pc-win32"
#elif defined(__arm__)
#define LLVM_DEFAULT_TARGET_TRIPLE "armv7-pc-win32"
#elif defined(__aarch64__)
#define LLVM_DEFAULT_TARGET_TRIPLE "aarch64-pc-win32"
#elif defined(__mips__)
#define LLVM_DEFAULT_TARGET_TRIPLE "mipsel-pc-win32"
#elif defined(__mips64)
#define LLVM_DEFAULT_TARGET_TRIPLE "mips64el-pc-win32"
#else
#error "unknown architecture"
#endif

/* Define if threads enabled */
#define LLVM_ENABLE_THREADS 0
Expand All @@ -30,28 +54,112 @@
#define LLVM_HAS_ATOMICS 1

/* Host triple LLVM will be executed on */
#if defined(__x86_64__)
#define LLVM_HOST_TRIPLE "x86_64-pc-win32"
#elif defined(__i386__)
#define LLVM_HOST_TRIPLE "i686-pc-win32"
#elif defined(__arm__)
#define LLVM_HOST_TRIPLE "armv7-pc-win32"
#elif defined(__aarch64__)
#define LLVM_HOST_TRIPLE "aarch64-pc-win32"
#elif defined(__mips__)
#define LLVM_HOST_TRIPLE "mipsel-pc-win32"
#elif defined(__mips64)
#define LLVM_HOST_TRIPLE "mips64el-pc-win32"
#else
#error "unknown architecture"
#endif

/* LLVM architecture name for the native architecture, if available */
#if defined(__aarch64__)
#define LLVM_NATIVE_ARCH AArch64
#elif defined(__arm__)
#define LLVM_NATIVE_ARCH ARM
#elif defined(__i386__) || defined(__x86_64__)
#define LLVM_NATIVE_ARCH X86
#elif defined(__mips__)
#define LLVM_NATIVE_ARCH Mips
#else
#error "unknown architecture"
#endif

/* LLVM name for the native AsmParser init function, if available */
#if defined(__aarch64__)
#define LLVM_NATIVE_ASMPARSER LLVMInitializeAArch64AsmParser
#elif defined(__arm__)
#define LLVM_NATIVE_ASMPARSER LLVMInitializeARMAsmParser
#elif defined(__i386__) || defined(__x86_64__)
#define LLVM_NATIVE_ASMPARSER LLVMInitializeX86AsmParser
#elif defined(__mips__)
#define LLVM_NATIVE_ASMPARSER LLVMInitializeMipsAsmParser
#else
#error "unknown architecture"
#endif

/* LLVM name for the native AsmPrinter init function, if available */
#if defined(__aarch64__)
#define LLVM_NATIVE_ASMPRINTER LLVMInitializeAArch64AsmPrinter
#elif defined(__arm__)
#define LLVM_NATIVE_ASMPRINTER LLVMInitializeARMAsmPrinter
#elif defined(__i386__) || defined(__x86_64__)
#define LLVM_NATIVE_ASMPRINTER LLVMInitializeX86AsmPrinter
#elif defined(__mips__)
#define LLVM_NATIVE_ASMPRINTER LLVMInitializeMipsAsmPrinter
#else
#error "unknown architecture"
#endif

/* LLVM name for the native Disassembler init function, if available */
#if defined(__aarch64__)
#define LLVM_NATIVE_DISASSEMBLER LLVMInitializeAArch64Disassembler
#elif defined(__arm__)
#define LLVM_NATIVE_DISASSEMBLER LLVMInitializeARMDisassembler
#elif defined(__i386__) || defined(__x86_64__)
#define LLVM_NATIVE_DISASSEMBLER LLVMInitializeX86Disassembler
#elif defined(__mips__)
#define LLVM_NATIVE_DISASSEMBLER LLVMInitializeMipsDisassembler
#else
#error "unknown architecture"
#endif

/* LLVM name for the native Target init function, if available */
#if defined(__aarch64__)
#define LLVM_NATIVE_TARGET LLVMInitializeAArch64Target
#elif defined(__arm__)
#define LLVM_NATIVE_TARGET LLVMInitializeARMTarget
#elif defined(__i386__) || defined(__x86_64__)
#define LLVM_NATIVE_TARGET LLVMInitializeX86Target
#elif defined(__mips__)
#define LLVM_NATIVE_TARGET LLVMInitializeMipsTarget
#else
#error "unknown architecture"
#endif

/* LLVM name for the native TargetInfo init function, if available */
#if defined(__aarch64__)
#define LLVM_NATIVE_TARGETINFO LLVMInitializeAArch64TargetInfo
#elif defined(__arm__)
#define LLVM_NATIVE_TARGETINFO LLVMInitializeARMTargetInfo
#elif defined(__i386__) || defined(__x86_64__)
#define LLVM_NATIVE_TARGETINFO LLVMInitializeX86TargetInfo
#elif defined(__mips__)
#define LLVM_NATIVE_TARGETINFO LLVMInitializeMipsTargetInfo
#else
#error "unknown architecture"
#endif

/* LLVM name for the native target MC init function, if available */
#if defined(__aarch64__)
#define LLVM_NATIVE_TARGETMC LLVMInitializeAArch64TargetMC
#elif defined(__arm__)
#define LLVM_NATIVE_TARGETMC LLVMInitializeARMTargetMC
#elif defined(__i386__) || defined(__x86_64__)
#define LLVM_NATIVE_TARGETMC LLVMInitializeX86TargetMC
#elif defined(__mips__)
#define LLVM_NATIVE_TARGETMC LLVMInitializeMipsTargetMC
#else
#error "unknown architecture"
#endif

/* Define if this is Unixish platform */
/* #undef LLVM_ON_UNIX */
Expand All @@ -72,10 +180,10 @@
#define LLVM_VERSION_MINOR 0

/* Patch version of the LLVM API */
#define LLVM_VERSION_PATCH 0
#define LLVM_VERSION_PATCH 1

/* LLVM version string */
#define LLVM_VERSION_STRING "7.0.0"
#define LLVM_VERSION_STRING "7.0.1"

/* Whether LLVM records statistics for use with GetStatistics(),
* PrintStatistics() or PrintStatisticsJSON()
Expand Down

0 comments on commit cc6473f

Please sign in to comment.