File ia32el.diff of Package ia32el

--- MTL/auxapp/Makefile
+++ MTL/auxapp/Makefile
@@ -35,15 +35,16 @@
 TARGET:=auxapp
 CC:=gcc
 INCDIR:=-I. -I../mme -I../../ia32x
-CFLAGS:=-Wall -Werror -g -D_GNU_SOURCE $(INCDIR)
+INCDIR += -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux
+CFLAGS:=$(RPM_OPT_FLAGS) -Wall -Werror -D_GNU_SOURCE $(INCDIR)
 AS:=gcc
-ASFLAGS:=-D__ASSEMBLY__ -Werror -Wall $(INCDIR)
+ASFLAGS:=-D__ASSEMBLY__ -Werror -Wall -Wa,--noexecstack $(INCDIR)
 OBJECTS:=auxapp_main.o auxapp_break.o jni_wrappers.o auxapp_trace.o
 
 DEPS:=Makefile.dep
 
 LD:=gcc
-LIBS:=-lpthread -ldl -lbfd -liberty
+LIBS:=-lpthread -ldl -lbfd -liberty -lz
 LDFLAGS:=-Wl,--export-dynamic
 
 $(TARGET): $(OBJECTS)
--- MTL/mme/Makefile
+++ MTL/mme/Makefile
@@ -110,9 +110,10 @@ WARNS:=-Werror -Wall -Wcast-align -W -Wu
 	-Wmissing-declarations -Wmissing-prototypes \
 	-Wsign-compare # -Wconversion (causes errors with glibc's assert)
 INCDIRS:=-I. -I../auxapp -I ../../ia32x/
+INCDIRS += -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux
 CFLAGS=-fpic -ffixed-r13 -fstrict-aliasing $(DEFS) $(INCDIRS) $(WARNS)
 DEBUG_SW:=-g -DDEBUG=1 -DMMEDEBUG
-RELEASE_SW:=-DNDEBUG 
+RELEASE_SW:=-DNDEBUG $(RPM_OPT_FLAGS)
 
 ifeq ($(MODE), debug)
   CFLAGS+=$(DEBUG_SW)
@@ -129,7 +130,7 @@ endif
 # assembly stuff
 #
 AS:=gcc
-ASFLAGS=-D__ASSEMBLY__ -DNO_UNDERSCORES -I.
+ASFLAGS=-D__ASSEMBLY__ -DNO_UNDERSCORES -Wa,--noexecstack -I.
 
 #
 # link stuff
--- ia32toia64/Makefile
+++ ia32toia64/Makefile
@@ -68,7 +68,7 @@ WARNS:=-Werror -Wall -Wshadow -W \
 		 -Wsign-compare -Wcast-align \
 		 -Wmissing-declarations -Wmissing-prototypes
 DEBUG_SW:=-g -DDEBUG=1
-RELEASE_SW:=-DNDEBUG -O2 -Wuninitialized
+RELEASE_SW:=-DNDEBUG $(RPM_OPT_FLAGS) -Wuninitialized
 
 CFLAGS=-fpic -ffixed-r13 -nostdinc $(INCDIRS) $(DEFS) $(WARNS)
 ifeq ($(MODE),  debug)
@@ -77,7 +77,7 @@ else #no debug
 CFLAGS+=$(RELEASE_SW)
 endif
 
-ASFLAGS=-D__ASSEMBLY__ -DNO_UNDERSCORES $(INCDIRS) $(DEFS)
+ASFLAGS=-D__ASSEMBLY__ -DNO_UNDERSCORES -Wa,--noexecstack $(INCDIRS) $(DEFS)
 
 #
 # link stuff
--- ia32x/Makefile
+++ ia32x/Makefile
@@ -82,7 +82,7 @@ WARNS:=-Werror -Wall -Wcast-align -W -Wu
 INCDIRS:=-I. -I../ia32toia64 -I../ia32x_utils -I../ia32x_utils/include -I../loader
 CFLAGS=-fpic -ffixed-r13 -nostdinc $(DEFS) $(INCDIRS) $(WARNS)
 DEBUG_SW:=-g -DDEBUG=1
-RELEASE_SW:=-DNDEBUG -O2 -Wuninitialized
+RELEASE_SW:=-DNDEBUG $(RPM_OPT_FLAGS) -Wuninitialized
 
 ifeq ($(MODE), debug)
   CFLAGS+=$(DEBUG_SW)
@@ -104,7 +104,7 @@ endif
 CFLAGS+=-DALL_THREAD_AFFINITY=1
 CFLAGS+=-DSHMEM_ORDER_SOLUTION=1
 
-ASFLAGS=-D__ASSEMBLY__ -DNO_UNDERSCORES $(INCDIRS) $(DEFS)
+ASFLAGS=-D__ASSEMBLY__ -DNO_UNDERSCORES -Wa,--noexecstack $(INCDIRS) $(DEFS)
 
 #
 # link stuff
--- ia32x_utils/Makefile
+++ ia32x_utils/Makefile
@@ -74,14 +74,15 @@ CFLAGS=$(INCDIR) \
 	-DBUILD_NO="\"$(BUILD_NO)\""  -DMODE="\"$(MODE)\"" -D_GNU_SOURCE \
 	-nostdinc
 
-ASFLAGS=-D__ASSEMBLY__ -DNO_UNDERSCORES $(INCDIR)
+ASFLAGS=-D__ASSEMBLY__ -DNO_UNDERSCORES -Wa,--noexecstack $(INCDIR)
 
 
 ifeq ($(MODE), debug)
 CFLAGS+=-DDEBUG=1 -g
 ASFLAGS+=-g
 else
-CFLAGS+=-O2 -DNDEBUG -O2 -Wuninitialized
+CFLAGS+=$(RPM_OPT_FLAGS) -DNDEBUG -Wuninitialized
+ASFLAGS+=-g
 endif
 
 BINDIR:=bin.$(MODE)
--- loader/Makefile
+++ loader/Makefile
@@ -86,7 +86,7 @@ CFLAGS:= -DBUILD_NO="\"$(BUILD_NO)\"" -n
 ifeq ($(MODE), debug)
   CFLAGS+=-DDEBUG -g
 else # no debug
-  CFLAGS+=-O2 -Wuninitialized
+  CFLAGS+=$(RPM_OPT_FLAGS) -DNDEBUG -Wuninitialized
 endif
 
 ifdef SYSBTG
@@ -100,7 +100,7 @@ CFLAGS+=-DMODE="\"$(MODE)\""
 # assembly
 #
 AS:=gcc
-ASFLAGS:=-D__ASSEMBLY__ -DNO_UNDERSCORES -I$(UTILSDIR)/include
+ASFLAGS:=-D__ASSEMBLY__ -DNO_UNDERSCORES -Wa,--noexecstack -I$(UTILSDIR)/include
 
 #
 # linking