From 25236dddb5cc8e68fe5a71c63494c3d60298efbc Mon Sep 17 00:00:00 2001
From: Fons Rademakers <Fons.Rademakers@cern.ch>
Date: Fri, 29 Jul 2005 12:43:49 +0000
Subject: [PATCH] remove all references to egcs and replace by gcc.
git-svn-id: http://root.cern.ch/svn/root/trunk@12414 27541ba8-7e3a-0410-8455-c3a389f83636
---
cint/Module.mk | 2 +-
config/ARCHS | 17 +++----
config/{Makefile.aixegcs => Makefile.aixgcc} | 2 +-
.../{Makefile.alphaegcs => Makefile.alphagcc} | 4 +-
.../{Makefile.hpuxegcs => Makefile.hpuxgcc} | 2 +-
config/Makefile.linux | 2 +-
....linuxalphaegcs => Makefile.linuxalphagcc} | 0
config/Makefile.linuxarm | 2 +-
config/Makefile.linuxdeb | 2 +-
config/Makefile.linuxdeb2 | 51 -------------------
...file.linuxppcegcs => Makefile.linuxppcgcc} | 0
config/Makefile.linuxsuse6 | 2 +-
config/root-config.in | 30 ++++-------
configure | 4 +-
test/Makefile.arch | 25 +++------
15 files changed, 37 insertions(+), 108 deletions(-)
rename config/{Makefile.aixegcs => Makefile.aixgcc} (95%)
rename config/{Makefile.alphaegcs => Makefile.alphagcc} (94%)
rename config/{Makefile.hpuxegcs => Makefile.hpuxgcc} (95%)
rename config/{Makefile.linuxalphaegcs => Makefile.linuxalphagcc} (100%)
delete mode 100644 config/Makefile.linuxdeb2
rename config/{Makefile.linuxppcegcs => Makefile.linuxppcgcc} (100%)
diff --git a/cint/Module.mk b/cint/Module.mk
index f343e98e7ad..3e47be1d8e5 100644
--- a/cint/Module.mk
+++ b/cint/Module.mk
@@ -105,7 +105,7 @@ endif
ifeq ($(PLATFORM),alpha)
CINTS2 += $(MODDIRS)/libstrm.cxx
endif
-ifeq ($(PLATFORM),alphaegcs)
+ifeq ($(PLATFORM),alphagcc)
CINTS2 += $(MODDIRS)/libstrm.cxx
endif
endif
diff --git a/config/ARCHS b/config/ARCHS
index 8204161c845..b80cda7ce4d 100644
--- a/config/ARCHS
+++ b/config/ARCHS
@@ -1,21 +1,20 @@
aix for AIX 4.x xlC
aix5 for AIX 5.x xlC
-aixegcs for AIX 4.x egcs 1.1.x
+aixgcc for AIX 4.x gcc
alphacxx6 for DEC Unix cxx6
-alphaegcs for DEC Unix egcs 1.1.x
+alphagcc for DEC Unix gcc
alphakcc for DEC Unix KCC
freebsd for FreeBSD
freebsd4 for FreeBSD 4.x
freebsd5 for FreeBSD 5.x
hpuxacc for HP-UX 10.20 aCC
-hpuxegcs for HP-UX 10.20 egcs 1.1.x
+hpuxgcc for HP-UX 10.20 gcc
hpuxia64acc for HP-UX 11i v1.5 (IA-64) aCC
hurddeb for Debian GNU/Hurd with gcc and glibc
-linux for Linux egcs 1.1.x, gcc 2.9x, gcc 3.x and glibc
-linuxalphaegcs for Alpha Linux egcs and glibc
-linuxarm for ARM Linux egcs and glibc
+linux for Linux gcc 2.9x, gcc 3.x and glibc
+linuxalphagcc for Alpha Linux gcc and glibc
+linuxarm for ARM Linux gcc and glibc
linuxdeb for Debian GNU/Linux v2.1+ gcc and glibc
-linuxdeb2 for Debian GNU/Linux v2.0 egcs and glibc
linuxdeb2ppc for PPC Linux based on Debian v2.0
linuxia64ecc for Itanium Linux Intel ecc and glibc
linuxia64gcc for Itanium Linux gcc 2.9x and glibc
@@ -23,11 +22,11 @@ linuxia64sgi for Itanium Linux sgiCC and glibc
linuxicc for Linux Intel's icc and glibc
linuxkcc for Linux KAI's KCC and glibc
linuxpgcc for Linux pgcc and glibc
-linuxppcegcs for PPC Linux egcs and glibc
+linuxppcgcc for PPC Linux gcc and glibc
linuxppc64gcc for PPC 64 Linux gcc 3.x and glibc
linuxrh42 for Linux gcc 2.7.x.x and libc5
linuxrh51 for Linux gcc 2.7.x.x and glibc
-linuxsuse6 for Linux (SuSE v6.0) egcs and glibc
+linuxsuse6 for Linux (SuSE v6.0) gcc and glibc
linuxx8664gcc for AMD Opteron and Intel EM64T Linux gcc 3.x and glibc
linuxx8664icc for AMD Opteron and Intel EM64T Linux gcc 3.x and glibc
lynxos for LynxOS with gcc
diff --git a/config/Makefile.aixegcs b/config/Makefile.aixgcc
similarity index 95%
rename from config/Makefile.aixegcs
rename to config/Makefile.aixgcc
index eb65d6946a8..92ab702498f 100644
--- a/config/Makefile.aixegcs
+++ b/config/Makefile.aixgcc
@@ -1,6 +1,6 @@
# -*- mode: makefile -*-
#
-# Makefile of ROOT for AIX 4.x with glibc and egcs1.1
+# Makefile of ROOT for AIX 4.x with glibc and gcc
# origin Richard Dubois & Donald Benton
PLATFORM = aix
diff --git a/config/Makefile.alphaegcs b/config/Makefile.alphagcc
similarity index 94%
rename from config/Makefile.alphaegcs
rename to config/Makefile.alphagcc
index 661e99c0eb9..c41a365875c 100644
--- a/config/Makefile.alphaegcs
+++ b/config/Makefile.alphagcc
@@ -1,8 +1,8 @@
# -*- mode: makefile -*-
#
-# Makefile to build ROOT for DEC unix with egcs1.1
+# Makefile to build ROOT for DEC unix with gcc
-PLATFORM = alphaegcs
+PLATFORM = alphagcc
DEBUGFLAGS = -g
OPTFLAGS = -O2
diff --git a/config/Makefile.hpuxegcs b/config/Makefile.hpuxgcc
similarity index 95%
rename from config/Makefile.hpuxegcs
rename to config/Makefile.hpuxgcc
index 236f3732071..709be7a8003 100644
--- a/config/Makefile.hpuxegcs
+++ b/config/Makefile.hpuxgcc
@@ -1,6 +1,6 @@
# -*- mode: makefile -*-
#
-# Makefile of ROOT for HP-UX 10.x with egcs-1.1.1
+# Makefile of ROOT for HP-UX 10.x with gcc
PLATFORM = hpux
diff --git a/config/Makefile.linux b/config/Makefile.linux
index b16277934d9..1aef5097f0c 100644
--- a/config/Makefile.linux
+++ b/config/Makefile.linux
@@ -1,6 +1,6 @@
# -*- mode: makefile -*-
#
-# Makefile of ROOT for Linux with glibc and egcs, gcc 2.9x, gcc 3 (>RH5.1)
+# Makefile of ROOT for Linux with glibc and gcc 2.9x, gcc 3 (>RH5.1)
PLATFORM = linux
diff --git a/config/Makefile.linuxalphaegcs b/config/Makefile.linuxalphagcc
similarity index 100%
rename from config/Makefile.linuxalphaegcs
rename to config/Makefile.linuxalphagcc
diff --git a/config/Makefile.linuxarm b/config/Makefile.linuxarm
index eadaa87c8fc..a5e3dfdf690 100644
--- a/config/Makefile.linuxarm
+++ b/config/Makefile.linuxarm
@@ -1,6 +1,6 @@
# -*- mode: makefile -*-
#
-# Makefile of ROOT for ARM/Linux with glibc and egcs (RH5.1)
+# Makefile of ROOT for ARM/Linux with glibc and gcc
PLATFORM = linux
diff --git a/config/Makefile.linuxdeb b/config/Makefile.linuxdeb
index 4c3cebfdc56..78ac2631786 100644
--- a/config/Makefile.linuxdeb
+++ b/config/Makefile.linuxdeb
@@ -1,6 +1,6 @@
# -*- mode: makefile -*-
#
-# Makefile of ROOT for Linux (Debian) with glibc and egcs
+# Makefile of ROOT for Linux (Debian) with glibc and gcc
PLATFORM = linux
diff --git a/config/Makefile.linuxdeb2 b/config/Makefile.linuxdeb2
deleted file mode 100644
index ee19b5c696d..00000000000
--- a/config/Makefile.linuxdeb2
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- mode: makefile -*-
-#
-# Makefile of ROOT for Linux (Debian) with glibc and egcs
-# Changes for Debian 2.0:
-# libncurses does not exist, remove -lncurses
-# problems when using gcc c-compiler, change to egcc
-
-PLATFORM = linux
-
-DEBUGFLAGS = -g
-OPTFLAGS = -O2
-ifeq (debug,$(findstring debug,$(ROOTBUILD)))
-OPT = $(DEBUGFLAGS)
-NOOPT =
-else
-OPT = $(OPTFLAGS)
-NOOPT =
-endif
-
-# Compiler:
-CXX = g++
-CC = egcc
-CXXFLAGS = -pipe -Wall -fPIC $(EXTRA_CXXFLAGS)
-CFLAGS = -pipe -Wall -fPIC $(EXTRA_CFLAGS)
-CINTCXXFLAGS = -pipe -Wall -fPIC $(EXTRA_CXXFLAGS) \
- -DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
- -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO
-CINTCFLAGS = -pipe -Wall -fPIC $(EXTRA_CFLAGS) \
- -DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
- -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO
-COMPILER = gnu
-
-# Linker:
-LD = g++
-LDFLAGS = $(OPT) $(EXTRA_LDFLAGS)
-SOFLAGS = -shared -Wl,-soname,
-SOEXT = so
-
-# System libraries:
-SYSLIBS = -lnsl -lm -ldl $(OSTHREADLIBDIR) $(OSTHREADLIB) -rdynamic
-XLIBS = $(XPMLIBDIR) $(XPMLIB) $(X11LIBDIR) -lX11
-CILIBS = -lm -ldl -rdynamic
-CRYPTLIBS = -lcrypt
-
-# Fortran:
-F77 = g77
-F77FLAGS = $(OPT)
-F77LIBS = -lg2c
-
-# Extras
-
diff --git a/config/Makefile.linuxppcegcs b/config/Makefile.linuxppcgcc
similarity index 100%
rename from config/Makefile.linuxppcegcs
rename to config/Makefile.linuxppcgcc
diff --git a/config/Makefile.linuxsuse6 b/config/Makefile.linuxsuse6
index 79cb309a52b..d838fdfc0fb 100644
--- a/config/Makefile.linuxsuse6
+++ b/config/Makefile.linuxsuse6
@@ -1,6 +1,6 @@
# -*- mode: makefile -*-
#
-# Makefile of ROOT for Linux with glibc and egcs (SuSE v6.0)
+# Makefile of ROOT for Linux with glibc and gcc (SuSE v6.0)
PLATFORM = linux
diff --git a/config/root-config.in b/config/root-config.in
index 57a7261e474..5735b55340d 100755
--- a/config/root-config.in
+++ b/config/root-config.in
@@ -60,7 +60,7 @@ hpuxacc | hpuxia64acc)
auxcflags=
auxlibs="-lm -ldld"
;;
-hpuxegcs)
+hpuxgcc)
# HP-UX 10.x with g++
auxcflags=
auxlibs="-lm -ldld"
@@ -75,7 +75,7 @@ aix | aix5)
auxcflags="-qnoro -qnoroconst -qmaxmem=-1"
auxlibs=
;;
-aixegcs)
+aixgcc)
# IBM AIX with g++
auxcflags="-fsigned-char"
auxlibs=
@@ -85,11 +85,6 @@ solaris)
auxcflags=
auxlibs="-L/usr/ccs/lib -lm -lsocket -lgen -ldl -lsunmath"
;;
-solarisegcs)
- # Solaris egcs
- auxcflags=
- auxlibs="-L/usr/ccs/lib -lm -lsocket -lgen -ldl"
- ;;
solarisgcc)
# Solaris g++ 2.8.x
auxcflags=
@@ -141,8 +136,8 @@ alphagcc)
auxcflags=
auxlibs="-lg++ -lm"
;;
-alphaegcs)
- # Alpha/OSF with egcs
+alphagcc)
+ # Alpha/OSF with gcc
auxcflags="-mcpu=ev5 -D__osf__ -D__alpha"
auxlibs="-ltermcap -lm"
;;
@@ -167,20 +162,15 @@ linuxrh42 | linuxrh51)
auxlibs="-lg++ -lm -ldl -rdynamic"
;;
linux)
- # Linux with egcs, gcc 2.9x, gcc 3.x
+ # Linux with gcc 2.9x, gcc 3.x
auxcflags=
auxlibs="-lm -ldl -rdynamic"
;;
linuxdeb | linuxsuse6)
- # Linux with egcs on Debian and SuSE
+ # Linux with gcc on Debian and SuSE
auxcflags=
auxlibs="-lm -ldl -rdynamic"
;;
-linuxdeb2)
- # Linux with egcs (Debian 2)
- auxcflags=
- auxlibs="-lnsl -lm -ldl -rdynamic"
- ;;
linuxdeb2ppc)
# Debian/Linux on PPC
auxcflags=-fsigned-char
@@ -196,7 +186,7 @@ linuxicc)
auxcflags=
auxlibs="-lm -ldl"
;;
-linuxppcegcs)
+linuxppcgcc)
# PPC Linux with gcc
auxcflags="-fsigned-char -I/usr/X11/include"
auxlibs="-lm -ldl -rdynamic"
@@ -233,13 +223,13 @@ linuxx8664icc)
auxcflags=
auxlibs="-lm -ldl"
;;
-linuxalphaegcs)
- # Alpha Linux with egcs
+linuxalphagcc)
+ # Alpha Linux with gcc
auxcflags=
auxlibs="-lm -ldl -rdynamic"
;;
linuxarm)
- # ARM Linux with egcs
+ # ARM Linux with gcc
auxcflags="-fsigned-char"
auxlibs="-lm -ldl -rdynamic"
;;
diff --git a/configure b/configure
index af945c6a13b..fea038b3dac 100755
--- a/configure
+++ b/configure
@@ -543,10 +543,10 @@ guess_architecture () {
hurd*:*:*) arch=hurddeb ;;
linux:ia64:*) arch=linuxia64gcc ;;
linux:x86_64:*) arch=linuxx8664gcc ;;
- linux:alpha:*) arch=linuxalphaegcs ;;
+ linux:alpha:*) arch=linuxalphagcc ;;
linux:arm*:*) arch=linuxarm ;;
linux:ppc64*:*) arch=linuxppc64gcc ;;
- linux:ppc*:*) arch=linuxppcegcs ;;
+ linux:ppc*:*) arch=linuxppcgcc ;;
linux:i*86:*) arch=linux ;;
openbsd*:*:*) arch=openbsd ;;
lynx:*:*) arch=lynxos ;;
diff --git a/test/Makefile.arch b/test/Makefile.arch
index 6b7d7ea21b6..a8ece371528 100644
--- a/test/Makefile.arch
+++ b/test/Makefile.arch
@@ -40,7 +40,7 @@ LDFLAGS = +DD64 -O -z
SOFLAGS = -b
endif
-ifeq ($(ARCH),hpuxegcs)
+ifeq ($(ARCH),hpuxgcc)
# HP-UX 10.x with g++
CXXFLAGS = -O -fPIC
CXX = g++
@@ -80,7 +80,7 @@ ROOTLIBS := $(shell root-config --nonew --libs)
ROOTGLIBS := $(shell root-config --nonew --glibs)
endif
-ifeq ($(ARCH),aixegcs)
+ifeq ($(ARCH),aixgcc)
# IBM AIX with GCC
CXX = g++
CXXFLAGS = -O
@@ -179,8 +179,8 @@ LDFLAGS = -O
SOFLAGS =
endif
-ifeq ($(ARCH),alphaegcs)
-# Alpha/OSF with egcs
+ifeq ($(ARCH),alphagcc)
+# Alpha/OSF with gcc
CXX = g++
CXXFLAGS = -O2 -Wall -fPIC
LD = g++
@@ -233,15 +233,6 @@ LDFLAGS = -O1
SOFLAGS = -shared
endif
-ifeq ($(ARCH),linuxdeb2)
-# Linux with gcc 2.7.2.x
-CXX = g++
-CXXFLAGS = -O2 -Wall -fPIC
-LD = g++
-LDFLAGS = -O2
-SOFLAGS = -shared
-endif
-
ifeq ($(ARCH),linuxdeb2ppc)
# Debian/Linux on the PowerPC
CXX = g++
@@ -296,8 +287,8 @@ endif
endif
endif
-ifeq ($(ARCH),linuxppcegcs)
-# MkLinux with egcs/glibc
+ifeq ($(ARCH),linuxppcgcc)
+# MkLinux with gcc and glibc
CXX = g++
CXXFLAGS = -O2 -Wall -fPIC
LD = g++
@@ -368,8 +359,8 @@ LDFLAGS = -O
SOFLAGS = -shared
endif
-ifeq ($(ARCH),linuxalphaegcs)
-# Alpha Linux with egcs
+ifeq ($(ARCH),linuxalphagcc)
+# Alpha Linux with gcc
CXX = g++
CXXFLAGS = -O2 -Wall -fPIC
LD = g++
--
GitLab