[llvm-branch-commits] [llvm-gcc-branch] r103977 - /llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/i386/i386.h

[Bill Wendling]

Author: void
Date: Mon May 17 16:08:20 2010
New Revision: 103977

URL: http://llvm.org/viewvc/llvm-project?rev=103977&view=rev
Log:
$ svn merge -c 103976 https://llvm.org/svn/llvm-project/llvm-gcc-4.2/trunk
--- Merging r103976 into '.':
U    gcc/config/i386/i386.h


Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/i386/i386.h

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/i386/i386.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/i386/i386.h?rev=103977&r1=103976&r2=103977&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/i386/i386.h (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/i386/i386.h Mon May 17 16:08:20 2010
@@ -3931,33 +3931,31 @@
   ((REG_NAME) + (*(REG_NAME) == '%' ? 1 : 0))
 
 /* Propagate code model setting to backend */
-/*
-  FIXME: (See <rdar://problem/7946145>) This option was mis-compiling a library.
-
-    if (TARGET_OMIT_LEAF_FRAME_POINTER)
-      argvec.push_back("--disable-non-leaf-fp-elim");
-*/
-#define LLVM_SET_MACHINE_OPTIONS(argvec)	   \
-  switch (ix86_cmodel) {			   \
-  default:                                         \
-    sorry ("code model %<%s%> not supported yet", ix86_cmodel_string);  \
-    break;                                         \
-  case CM_SMALL:				   \
-  case CM_SMALL_PIC:				   \
-    argvec.push_back("--code-model=small");	   \
-    break;					   \
-  case CM_KERNEL:				   \
-    argvec.push_back("--code-model=kernel");	   \
-    break;					   \
-  case CM_MEDIUM:				   \
-  case CM_MEDIUM_PIC:				   \
-    argvec.push_back("--code-model=medium");	   \
-    break;					   \
-  case CM_32:					   \
-    argvec.push_back("--code-model=default");	   \
-    break;					   \
-  }
-
+#define LLVM_SET_MACHINE_OPTIONS(argvec)                \
+  do {                                                  \
+    switch (ix86_cmodel) {                              \
+    default:                                            \
+      sorry ("code model %<%s%> not supported yet",     \
+             ix86_cmodel_string);                       \
+      break;                                            \
+    case CM_SMALL:                                      \
+    case CM_SMALL_PIC:                                  \
+      argvec.push_back("--code-model=small");           \
+      break;                                            \
+    case CM_KERNEL:                                     \
+      argvec.push_back("--code-model=kernel");          \
+      break;                                            \
+    case CM_MEDIUM:                                     \
+    case CM_MEDIUM_PIC:                                 \
+      argvec.push_back("--code-model=medium");          \
+      break;                                            \
+    case CM_32:                                         \
+      argvec.push_back("--code-model=default");         \
+      break;                                            \
+    }                                                   \
+    if (TARGET_OMIT_LEAF_FRAME_POINTER)                 \
+      argvec.push_back("--disable-non-leaf-fp-elim");   \
+  } while (0)
 #endif /* ENABLE_LLVM */
 /* LLVM LOCAL end */