diff options
| author | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-05-22 06:55:27 +0000 |
|---|---|---|
| committer | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-05-22 06:55:27 +0000 |
| commit | d3f19e120793115b312d4753a6b5abb3ebb5e463 (patch) | |
| tree | 7e58274f27fe1fab5b2663b402df612ae0e375d2 | |
| parent | cc3b034a19553df5b4c3657acfd420677c702fff (diff) | |
| download | gcc-d3f19e120793115b312d4753a6b5abb3ebb5e463.tar.gz | |
* config/m68k/linux.h (ASM_SPEC): Add asm_pcrel_spec.
* config/m68k/m68k-none.h (ASM_SPEC): Don't override here.
* config/m68k/m68k.h (ASM_PCREL_SPEC): New.
(ASM_SPEC): Add asm_pcrel_spec.
(EXTRA_SPECS): Add asm_pcrel_spec.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@124937 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/config/m68k/linux.h | 4 | ||||
| -rw-r--r-- | gcc/config/m68k/m68k-none.h | 3 | ||||
| -rw-r--r-- | gcc/config/m68k/m68k.h | 6 |
4 files changed, 15 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 88f685c4de5..d390d085da5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2007-05-22 Nathan Sidwell <nathan@codesourcery.com> + + * config/m68k/linux.h (ASM_SPEC): Add asm_pcrel_spec. + * config/m68k/m68k-none.h (ASM_SPEC): Don't override here. + * config/m68k/m68k.h (ASM_PCREL_SPEC): New. + (ASM_SPEC): Add asm_pcrel_spec. + (EXTRA_SPECS): Add asm_pcrel_spec. + 2007-05-21 David Daney <ddaney@avtrex.com> * doc/install.texi (Building a cross compiler): Add requirements diff --git a/gcc/config/m68k/linux.h b/gcc/config/m68k/linux.h index 31d0a58d2e3..533899688b3 100644 --- a/gcc/config/m68k/linux.h +++ b/gcc/config/m68k/linux.h @@ -25,8 +25,8 @@ Boston, MA 02110-1301, USA. */ /* Add %(asm_cpu_spec) to the svr4.h definition of ASM_SPEC. */ #undef ASM_SPEC -#define ASM_SPEC \ - "%(asm_cpu_spec) %{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*}" +#define ASM_SPEC "%(asm_cpu_spec) %(asm_pcrel_spec) \ + %{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*}" /* for 68k machines this only needs to be TRUE for the 68000 */ diff --git a/gcc/config/m68k/m68k-none.h b/gcc/config/m68k/m68k-none.h index 15ad022ce72..c0d6421f115 100644 --- a/gcc/config/m68k/m68k-none.h +++ b/gcc/config/m68k/m68k-none.h @@ -18,6 +18,3 @@ along with GCC; see the file COPYING. If not, write to the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#undef ASM_SPEC -#define ASM_SPEC "%(asm_cpu_spec) %{fPIC:--pcrel} %{fpic:--pcrel} \ - %{msep-data:--pcrel} %{mid-shared-library:--pcrel}" diff --git a/gcc/config/m68k/m68k.h b/gcc/config/m68k/m68k.h index 1b19b4c8095..6591380b2d2 100644 --- a/gcc/config/m68k/m68k.h +++ b/gcc/config/m68k/m68k.h @@ -48,11 +48,15 @@ Boston, MA 02110-1301, USA. */ %{m68060}%{mcpu32}%{m68332}%{m5200}%{m5206e}%{m528x}%{m5307}%{m5407}%{mcfv4e}\ %{mcpu=*:-mcpu=%*}%{march=*:-march=%*}\ " +#define ASM_PCREL_SPEC "%{fPIC|fpic|mpcrel:--pcrel} \ + %{msep-data|mid-shared-library:--pcrel} \ +" -#define ASM_SPEC "%(asm_cpu_spec)" +#define ASM_SPEC "%(asm_cpu_spec) %(asm_pcrel_spec)" #define EXTRA_SPECS \ { "asm_cpu_spec", ASM_CPU_SPEC }, \ + { "asm_pcrel_spec", ASM_PCREL_SPEC }, \ SUBTARGET_EXTRA_SPECS #define SUBTARGET_EXTRA_SPECS |