From 52448afff137f57acb2911af527608533edea5e1 Mon Sep 17 00:00:00 2001 From: brad Date: Tue, 28 Oct 2014 17:52:05 +0000 Subject: [PATCH] Remove the .quad assembler workaround for i386 now that the external assembler has been fixed. The integrated assembler already handled this properly but the workaround didn't take that into consideration. ok daniel@ --- devel/llvm/Makefile | 4 ++-- ...b_Target_X86_MCTargetDesc_X86MCAsmInfo_cpp | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 devel/llvm/patches/patch-lib_Target_X86_MCTargetDesc_X86MCAsmInfo_cpp diff --git a/devel/llvm/Makefile b/devel/llvm/Makefile index be8721e9b82..3eb26e07467 100644 --- a/devel/llvm/Makefile +++ b/devel/llvm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.88 2014/10/11 20:23:46 brad Exp $ +# $OpenBSD: Makefile,v 1.89 2014/10/28 17:52:05 brad Exp $ # XXX: Remember to bump MODCLANG_VERSION in lang/clang/clang.port.mk when # updating this port. @@ -10,7 +10,7 @@ COMMENT = modular, fast C/C++/ObjC compiler, static analyzer and tools LLVM_V = 3.5 DISTNAME = llvm-${LLVM_V}.20140228 -REVISION = 16 +REVISION = 17 CATEGORIES = devel MASTER_SITES = http://comstyle.com/source/ EXTRACT_SUFX = .tar.xz diff --git a/devel/llvm/patches/patch-lib_Target_X86_MCTargetDesc_X86MCAsmInfo_cpp b/devel/llvm/patches/patch-lib_Target_X86_MCTargetDesc_X86MCAsmInfo_cpp new file mode 100644 index 00000000000..f330400f4b7 --- /dev/null +++ b/devel/llvm/patches/patch-lib_Target_X86_MCTargetDesc_X86MCAsmInfo_cpp @@ -0,0 +1,19 @@ +$OpenBSD: patch-lib_Target_X86_MCTargetDesc_X86MCAsmInfo_cpp,v 1.1 2014/10/28 17:52:05 brad Exp $ + +Revert workaround for buggy GNU assembler with OpenBSD. + +--- lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp.orig Fri Oct 17 03:18:59 2014 ++++ lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp Fri Oct 17 03:38:34 2014 +@@ -111,12 +111,6 @@ X86ELFMCAsmInfo::X86ELFMCAsmInfo(const Triple &T) { + // Exceptions handling + ExceptionsType = ExceptionHandling::DwarfCFI; + +- // OpenBSD and Bitrig have buggy support for .quad in 32-bit mode, just split +- // into two .words. +- if ((T.getOS() == Triple::OpenBSD || T.getOS() == Triple::Bitrig) && +- T.getArch() == Triple::x86) +- Data64bitsDirective = 0; +- + // Always enable the integrated assembler by default. + // Clang also enabled it when the OS is Solaris but that is redundant here. + UseIntegratedAssembler = true;