[llvm-commits] [llvm-gcc-4.2] r51325 - /llvm-gcc-4.2/trunk/gcc/config/freebsd-spec.h

[Chris Lattner]

On May 20, 2008, at 10:56 AM, Anton Korobeynikov wrote:
>
> URL: http://llvm.org/viewvc/llvm-project?rev=51325&view=rev
> Log:
> Fix FreeBSD specs handling. This seems to be merge problem during  
> 4.0 => 4.2 migration.

What does this fix? Should this go into 2.3?

-Chris

>
>
> Modified:
>    llvm-gcc-4.2/trunk/gcc/config/freebsd-spec.h
>
> Modified: llvm-gcc-4.2/trunk/gcc/config/freebsd-spec.h
> URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/freebsd-spec.h?rev=51325&r1=51324&r2=51325&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm-gcc-4.2/trunk/gcc/config/freebsd-spec.h (original)
> +++ llvm-gcc-4.2/trunk/gcc/config/freebsd-spec.h Tue May 20 12:56:47  
> 2008
> @@ -48,8 +48,6 @@
>    || !strcmp ((STR), "soname") || !strcmp ((STR), "defsym") 		\
>    || !strcmp ((STR), "assert") || !strcmp ((STR), "dynamic-linker"))
>
> -/* LLVM LOCAL begin */
> -#ifndef ENABLE_LLVM
> #define FBSD_TARGET_OS_CPP_BUILTINS()					\
>   do									\
>     {									\
> @@ -62,32 +60,6 @@
> 	FBSD_TARGET_CPU_CPP_BUILTINS();					\
>     }									\
>   while (0)
> -#else
> -#define FBSD_TARGET_OS_CPP_BUILTINS()					\
> -  do									\
> -    {									\
> -	if (FBSD_MAJOR == 7)						\
> -	  builtin_define ("__FreeBSD__=7");			       	\
> -	else if (FBSD_MAJOR == 6)					\
> -	  builtin_define ("__FreeBSD__=6");			       	\
> -	else if (FBSD_MAJOR == 5)	       				\
> -	  builtin_define ("__FreeBSD__=5");			       	\
> -	else if (FBSD_MAJOR == 4)			       		\
> -	  builtin_define ("__FreeBSD__=4");			       	\
> -	else if (FBSD_MAJOR == 3)	       				\
> -	  builtin_define ("__FreeBSD__=3");			       	\
> -	else								\
> -	  builtin_define ("__FreeBSD__");			       	\
> -	builtin_define_std ("unix");					\
> -	builtin_define ("__KPRINTF_ATTRIBUTE__");		       	\
> -	builtin_assert ("system=unix");					\
> -	builtin_assert ("system=bsd");					\
> -	builtin_assert ("system=FreeBSD");				\
> -	FBSD_TARGET_CPU_CPP_BUILTINS();					\
> -    }									\
> -  while (0)
> -#endif
> -/* LLVM LOCAL end */
>
> /* Define the default FreeBSD-specific per-CPU hook code.  */
> #define FBSD_TARGET_CPU_CPP_BUILTINS() do {} while (0)
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits