[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ocfs2-commits
Subject:    [Ocfs2-commits] jlbec commits r868 - trunk/src
From:       svn-commits () oss ! oracle ! com (svn-commits () oss ! oracle ! com)
Date:       2004-04-26 15:49:13
Message-ID: 200404262049.i3QKnC4T016649 () oss ! oracle ! com
[Download RAW message or body]

Author: jlbec
Date: 2004-04-26 15:49:10 -0500 (Mon, 26 Apr 2004)
New Revision: 868

Modified:
   trunk/src/
   trunk/src/Makefile
Log:

Fix Makefile bogosity for architecture flags (-m64, etc).
Make svn ignore stamp-md5




Property changes on: trunk/src
___________________________________________________________________
Name: svn:ignore
   - cscope*

   + cscope*
stamp-md5


Modified: trunk/src/Makefile
===================================================================
--- trunk/src/Makefile	2004-04-24 01:01:28 UTC (rev 867)
+++ trunk/src/Makefile	2004-04-26 20:49:10 UTC (rev 868)
@@ -104,11 +104,11 @@
 
 ifeq ($(OCFS_PROCESSOR),ppc64)
   GLOBAL_DEFINES += -D__LP64__
-  CFLAGS += -m64 -fsigned-char -fno-builtin -msoft-float -mminimal-toc
+  MACH_CFLAGS += -m64 -fsigned-char -fno-builtin -msoft-float -mminimal-toc
   LDADD += -m elf64ppc
 endif
 ifeq ($(OCFS_PROCESSOR),x86_64)
-  CFLAGS += -m64 -mcmodel=kernel
+  MACH_CFLAGS += -m64 -mcmodel=kernel
 endif
 ifeq ($(OCFS_PROCESSOR),ia64)
 endif
@@ -189,8 +189,8 @@
 
 INCLUDES = -Iinc -I$(KERNELINC) -I$(GCCINC)
 
-CFLAGS=$(OPTS) -pipe -nostdinc -fno-strict-aliasing -fno-common \
-	-fomit-frame-pointer $(MODVERSIONS) $(WARNINGS)
+CFLAGS = $(OPTS) $(MACH_CFLAGS) -pipe -nostdinc -fno-strict-aliasing \
+	-fno-common -fomit-frame-pointer $(MODVERSIONS) $(WARNINGS)
 LDADD=-nostdlib
 
 OPTIMIZE = -O2

[prev in list] [next in list] [prev in thread] [next in thread]