Move -ieee to adt Makefile, and add CPU Makefile variable.

4 files changed, 5 insertions, 45 deletions

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 4f393d7ee16..246e45a4f09 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.56 1999/06/25 00:13:45 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.57 1999/07/20 02:42:19 momjian Exp $
 #
 # NOTES
 #    Essentially all Postgres make files include this file and use the
@@ -220,6 +220,7 @@ GZCAT= @GZCAT@
 
 # Name of the target platform.
 PORTNAME= @PORTNAME@
+CPU= @CPU@
 
 # Various grungy items needed to configure some platforms.
 HAVE_POSIX_SIGNALS= @HAVE_POSIX_SIGNALS@
diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile
deleted file mode 100644
index f06ffef5da8..00000000000
--- a/src/backend/utils/adt/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile--
-#    Makefile for utils/adt
-#
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.21 1998/12/30 19:56:29 wieck Exp $
-#
-#-------------------------------------------------------------------------
-
-SRCDIR = ../../..
-include ../../../Makefile.global
-
-CFLAGS += -I../..
-
-ifdef MULTIBYTE
-CFLAGS+= $(MBFLAGS)
-endif
-
-OBJS = acl.o arrayfuncs.o arrayutils.o bool.o cash.o char.o chunk.o \
-	date.o datetime.o datum.o dt.o filename.o float.o \
-	geo_ops.o geo_selfuncs.o int.o int8.o like.o \
-	misc.o nabstime.o name.o not_in.o numeric.o numutils.o \
-	oid.o oracle_compat.o \
-	regexp.o regproc.o ruleutils.o selfuncs.o sets.o \
-	tid.o timestamp.o varchar.o varlena.o version.o \
-	network.o mac.o inet_net_ntop.o inet_net_pton.o
-
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-	$(LD) -r -o SUBSYS.o $(OBJS)
-
-depend dep:
-	$(CC) -MM $(CFLAGS) *.c >depend
-
-clean: 
-	rm -f SUBSYS.o $(OBJS)
-
-ifeq (depend,$(wildcard depend))
-include depend
-endif
-
diff --git a/src/configure.in b/src/configure.in
index 311c36bb22b..5fde7567f2a 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -73,6 +73,7 @@ then
 fi
 
 PORTNAME=${os}
+CPU=${host_cpu}
 AC_LINK_FILES(backend/port/dynloader/${os}.c, backend/port/dynloader.c)
 AC_LINK_FILES(backend/port/dynloader/${os}.h, include/dynloader.h)
 AC_LINK_FILES(include/port/${os}.h, include/os.h)
@@ -419,6 +420,7 @@ echo "- setting LDFLAGS=$LDFLAGS"
 
 AC_SUBST(ELF_SYS)
 AC_SUBST(PORTNAME)
+AC_SUBST(CPU)
 AC_SUBST(SRCDIR)
 AC_SUBST(LDFLAGS)
 AC_SUBST(CPPFLAGS)
diff --git a/src/template/linux_alpha b/src/template/linux_alpha
index 1e116ded6b8..7148222e797 100644
--- a/src/template/linux_alpha
+++ b/src/template/linux_alpha
@@ -1,5 +1,5 @@
 AROPT:crs
-CFLAGS:-O -mieee  # optimization -O2 removed because of egcs problem
+CFLAGS:-O # optimization -O2 removed because of egcs problem
 SHARED_LIB:-fpic
 ALL:
 SRCH_INC: