[Ocfs2-tools-commits] manish commits r316 - in trunk: fsck.ocfs2 libocfs2 mkfs.ocfs2 mounted.ocfs2

svn-commits at oss.oracle.com svn-commits at oss.oracle.com
Wed Oct 6 13:29:34 CDT 2004


Author: manish
Date: 2004-10-06 13:29:32 -0500 (Wed, 06 Oct 2004)
New Revision: 316

Modified:
   trunk/fsck.ocfs2/Makefile
   trunk/libocfs2/Makefile
   trunk/mkfs.ocfs2/Makefile
   trunk/mounted.ocfs2/Makefile
Log:
Remove unneeded legacy compiler flags


Modified: trunk/fsck.ocfs2/Makefile
===================================================================
--- trunk/fsck.ocfs2/Makefile	2004-10-06 17:00:17 UTC (rev 315)
+++ trunk/fsck.ocfs2/Makefile	2004-10-06 18:29:32 UTC (rev 316)
@@ -4,24 +4,14 @@
 
 SBIN_PROGRAMS = fsck.ocfs2
 
-
 INCLUDES = -Iinclude -I$(TOPDIR)/libocfs2/include
 LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
 
 CFLAGS := -g -Wall -Wstrict-prototypes -Wmissing-prototypes \
-           -Wmissing-declarations -fno-strict-aliasing
+           -Wmissing-declarations
 
 DEFINES = -DOCFS2_FLAT_INCLUDES
 
-ifeq ($(OCFS_PROCESSOR),x86_64)
-  CFLAGS += -m64
-endif
-ifeq ($(OCFS_PROCESSOR),ia64)
-endif
-ifeq ($(OCFS_PROCESSOR),i686)
-  DEFINES += -D__ILP32__
-endif
-
 CFILES =	fsck.c		\
 		dirblocks.c 	\
 		dirparents.c 	\

Modified: trunk/libocfs2/Makefile
===================================================================
--- trunk/libocfs2/Makefile	2004-10-06 17:00:17 UTC (rev 315)
+++ trunk/libocfs2/Makefile	2004-10-06 18:29:32 UTC (rev 316)
@@ -13,22 +13,11 @@
 
 LIBRARIES = libocfs2.a
 
-CFLAGS = $(OPTS) -fno-strict-aliasing $(WARNINGS) -fPIC
+CFLAGS = $(OPTS) $(WARNINGS) -fPIC
 CPPFLAGS += -DOCFS2_FLAT_INCLUDES
 
 OPTIMIZE = -O2
 
-ifeq ($(OCFS_PROCESSOR),ppc64)
-endif
-ifeq ($(OCFS_PROCESSOR),x86_64)
-  CFLAGS += -m64
-endif
-ifeq ($(OCFS_PROCESSOR),ia64)
-endif
-ifeq ($(OCFS_PROCESSOR),i686)
-  DEFINES += -D__ILP32__
-endif
-
 CFLAGS += $(OPTIMIZE)
 
 ifneq ($(OCFS2_DEBUG_EXE),)

Modified: trunk/mkfs.ocfs2/Makefile
===================================================================
--- trunk/mkfs.ocfs2/Makefile	2004-10-06 17:00:17 UTC (rev 315)
+++ trunk/mkfs.ocfs2/Makefile	2004-10-06 18:29:32 UTC (rev 316)
@@ -9,7 +9,7 @@
 OPTS = -g
 endif
 
-CFLAGS = $(OPTS) -fno-strict-aliasing $(WARNINGS) 
+CFLAGS = $(OPTS) $(WARNINGS) 
 
 SBIN_PROGRAMS = mkfs.ocfs2
 
@@ -21,18 +21,6 @@
 
 OPTIMIZE = -O2
 
-ifeq ($(OCFS_PROCESSOR),x86_64)
-  CFLAGS += -m64
-endif
-ifeq ($(OCFS_PROCESSOR),ia64)
-endif
-ifeq ($(OCFS_PROCESSOR),i686)
-  DEFINES += -D__ILP32__
-endif
-ifeq ($(OCFS_PROCESSOR),s390x)
-  DEFINES += -D__LP64__
-endif
-
 CFLAGS += $(OPTIMIZE)
 
 CFILES = mkfs.c

Modified: trunk/mounted.ocfs2/Makefile
===================================================================
--- trunk/mounted.ocfs2/Makefile	2004-10-06 17:00:17 UTC (rev 315)
+++ trunk/mounted.ocfs2/Makefile	2004-10-06 18:29:32 UTC (rev 316)
@@ -9,7 +9,7 @@
 OPTS = -g
 endif
 
-CFLAGS = $(OPTS) -fno-strict-aliasing $(WARNINGS) 
+CFLAGS = $(OPTS) $(WARNINGS) 
 
 LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
 
@@ -19,22 +19,11 @@
 
 OPTIMIZE = -O2
 
-ifeq ($(OCFS_PROCESSOR),x86_64)
-  CFLAGS += -m64
-endif
-ifeq ($(OCFS_PROCESSOR),ia64)
-endif
-ifeq ($(OCFS_PROCESSOR),i686)
-  DEFINES += -D__ILP32__
-endif
-
 CFLAGS += $(OPTIMIZE)
 
 CFILES = mounted.c
 OBJS = $(subst .c,.o,$(CFILES))
 
-#MANS = fsck.ocfs2.8
-
 DIST_FILES = $(CFILES)
 
 mounted.ocfs2: $(OBJS)



More information about the Ocfs2-tools-commits mailing list