Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 3 Jun 2010 17:20:27 +0000 (UTC)
From:      Roman Divacky <rdivacky@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r208788 - in projects/clangbsd/lib/libc: . amd64/gen i386/gen
Message-ID:  <201006031720.o53HKRhv042678@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rdivacky
Date: Thu Jun  3 17:20:27 2010
New Revision: 208788
URL: http://svn.freebsd.org/changeset/base/208788

Log:
  revert the ldexp workaround, llvm is ok with this code now

Deleted:
  projects/clangbsd/lib/libc/amd64/gen/ldexp.S
  projects/clangbsd/lib/libc/i386/gen/ldexp.S
Modified:
  projects/clangbsd/lib/libc/Makefile
  projects/clangbsd/lib/libc/amd64/gen/Makefile.inc
  projects/clangbsd/lib/libc/i386/gen/Makefile.inc

Modified: projects/clangbsd/lib/libc/Makefile
==============================================================================
--- projects/clangbsd/lib/libc/Makefile	Thu Jun  3 16:02:11 2010	(r208787)
+++ projects/clangbsd/lib/libc/Makefile	Thu Jun  3 17:20:27 2010	(r208788)
@@ -5,6 +5,11 @@ SHLIBDIR?= /lib
 
 .include <bsd.own.mk>
 
+# XXX: LLVM PR879 in ldexp.c
+.if ${MK_CLANG_IS_CC} != "no" && ${CC} == "cc" && ${MACHINE_ARCH} == "i386"
+CC=	gcc
+.endif
+
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
 # not contain these strings, add -DSTRIP_FBSDID (see <sys/cdefs.h>) to CFLAGS

Modified: projects/clangbsd/lib/libc/amd64/gen/Makefile.inc
==============================================================================
--- projects/clangbsd/lib/libc/amd64/gen/Makefile.inc	Thu Jun  3 16:02:11 2010	(r208787)
+++ projects/clangbsd/lib/libc/amd64/gen/Makefile.inc	Thu Jun  3 17:20:27 2010	(r208788)
@@ -1,10 +1,8 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
-# XXX: the ldexp.s should be ldexp.c see
-# http://llvm.org/bugs/show_bug.cgi?id=879
 SRCS+=	_setjmp.S _set_tp.c rfork_thread.S setjmp.S sigsetjmp.S \
 	fabs.S modf.S \
-	infinity.c ldexp.S makecontext.c signalcontext.c \
+	infinity.c ldexp.c makecontext.c signalcontext.c \
 	flt_rounds.c fpgetmask.c fpsetmask.c fpgetprec.c fpsetprec.c \
 	fpgetround.c fpsetround.c fpgetsticky.c

Modified: projects/clangbsd/lib/libc/i386/gen/Makefile.inc
==============================================================================
--- projects/clangbsd/lib/libc/i386/gen/Makefile.inc	Thu Jun  3 16:02:11 2010	(r208787)
+++ projects/clangbsd/lib/libc/i386/gen/Makefile.inc	Thu Jun  3 17:20:27 2010	(r208788)
@@ -1,8 +1,6 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
-# XXX: the ldexp.s should be ldexp.c see 
-# http://llvm.org/bugs/show_bug.cgi?id=879
 SRCS+=	_ctx_start.S _setjmp.S _set_tp.c fabs.S \
-	flt_rounds.c infinity.c ldexp.S makecontext.c modf.S \
+	flt_rounds.c infinity.c ldexp.c makecontext.c modf.S \
 	rfork_thread.S setjmp.S signalcontext.c sigsetjmp.S



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006031720.o53HKRhv042678>