From 6f1f21c432a930455ecd0c09d8a0e67c1d0e62f8 Mon Sep 17 00:00:00 2001 From: marco Date: Sun, 3 May 2009 21:31:33 +0000 Subject: [PATCH] * optbase empty skeleton removed with two dependancies. Duplicate unit name caused problems. git-svn-id: trunk@13091 - --- .gitattributes | 1 - compiler/i386/csopt386.pas | 2 +- compiler/i386/daopt386.pas | 2 +- compiler/i386/optbase.pas | 34 ---------------------------------- 4 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 compiler/i386/optbase.pas diff --git a/.gitattributes b/.gitattributes index 216e0bf485..71799334d8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -172,7 +172,6 @@ compiler/i386/n386inl.pas svneol=native#text/plain compiler/i386/n386mat.pas svneol=native#text/plain compiler/i386/n386mem.pas svneol=native#text/plain compiler/i386/n386set.pas svneol=native#text/plain -compiler/i386/optbase.pas svneol=native#text/plain compiler/i386/popt386.pas svneol=native#text/plain compiler/i386/r386ari.inc svneol=native#text/plain compiler/i386/r386att.inc svneol=native#text/plain diff --git a/compiler/i386/csopt386.pas b/compiler/i386/csopt386.pas index 43ccec68f0..f8eaf47cd0 100644 --- a/compiler/i386/csopt386.pas +++ b/compiler/i386/csopt386.pas @@ -26,7 +26,7 @@ unit CSOpt386; interface -uses aasmbase,aasmtai,aasmdata,aasmcpu, cpuinfo, cpubase, optbase, cgbase; +uses aasmbase,aasmtai,aasmdata,aasmcpu, cpuinfo, cpubase, cgbase; function CSE(asml: TAsmList; first, last: tai; pass: longint): boolean; diff --git a/compiler/i386/daopt386.pas b/compiler/i386/daopt386.pas index b8ffbeb0d2..f2e16674da 100644 --- a/compiler/i386/daopt386.pas +++ b/compiler/i386/daopt386.pas @@ -30,7 +30,7 @@ interface uses globtype, cclasses,aasmbase,aasmtai,aasmdata,aasmcpu,cgbase,cgutils, - cpubase,optbase; + cpubase; {******************************* Constants *******************************} diff --git a/compiler/i386/optbase.pas b/compiler/i386/optbase.pas deleted file mode 100644 index e94e008d86..0000000000 --- a/compiler/i386/optbase.pas +++ /dev/null @@ -1,34 +0,0 @@ -{ - Copyright (c) 1998-2002 by the Free Pascal development team - - This routine contains the basic tables and information - for the generic optimizers and cpu specific optimizations. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - **************************************************************************** -} -{# This unit should define cpu specific information which is required - for the optimizers. -} -unit optbase; - -interface - - -implementation - - -end.