diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2000-06-05 23:06:35 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2000-06-05 23:06:35 +0000 |
| commit | 6f38502259e3eb3b7bd5228517989a87a6bf5c7e (patch) | |
| tree | 6f0af2a644eeccf6c84ab4f2c287d20e356509b5 /gnu | |
| parent | f7891fec658bbdaaa0c6b6b404e0117f25bcc9fc (diff) | |
Fix merge
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/egcs/gcc/config/m68k/m68k.h | 4 | ||||
| -rw-r--r-- | gnu/egcs/gcc/config/rs6000/sysv4.h | 14 |
2 files changed, 13 insertions, 5 deletions
diff --git a/gnu/egcs/gcc/config/m68k/m68k.h b/gnu/egcs/gcc/config/m68k/m68k.h index 9a58f1db6be..f7dee26e1aa 100644 --- a/gnu/egcs/gcc/config/m68k/m68k.h +++ b/gnu/egcs/gcc/config/m68k/m68k.h @@ -1,5 +1,5 @@ /* Definitions of target machine for GNU compiler. Sun 68000/68020 version. - Copyright (C) 1987, 88, 93-98, 1999 Free Software Foundation, Inc. + Copyright (C) 1987, 88, 93-98, 1999, 2000 Free Software Foundation, Inc. This file is part of GNU CC. @@ -1198,6 +1198,8 @@ while(0) for (regno = 0; regno < 16; regno++) \ if (regs_ever_live[regno] && ! call_used_regs[regno]) \ offset += 4; \ + if (flag_pic && current_function_uses_pic_offset_table) \ + offset += 4; \ (DEPTH) = (offset + ((get_frame_size () + 3) & -4) \ + (get_frame_size () == 0 ? 0 : 4)); \ } diff --git a/gnu/egcs/gcc/config/rs6000/sysv4.h b/gnu/egcs/gcc/config/rs6000/sysv4.h index 99e91ec52e0..e9673821f06 100644 --- a/gnu/egcs/gcc/config/rs6000/sysv4.h +++ b/gnu/egcs/gcc/config/rs6000/sysv4.h @@ -1350,12 +1350,18 @@ do { \ #ifndef CPP_OS_LINUX_SPEC #ifdef USE_GNULIBC_1 -#define CPP_OS_LINUX_SPEC "-D__unix__ -D__linux__ \ -%{!undef:%{!ansi:%{!std=*:-Dunix -Dlinux}%{std=gnu*:-Dunix -Dlinux}}} \ +#define CPP_OS_LINUX_SPEC "-D__unix__ -D__linux__ \ +%{!undef: \ + %{!ansi: \ + %{!std=*:-Dunix -D__unix -Dlinux -D__linux} \ + %{std=gnu*:-Dunix -D__unix -Dlinux -D__linux}}} \ -Asystem(unix) -Asystem(posix)" #else -#define CPP_OS_LINUX_SPEC "-D__unix__ -D__linux__ \ -%{!undef:%{!ansi:%{!std=*:-Dunix -Dlinux}%{std=gnu*:-Dunix -Dlinux}}} \ +#define CPP_OS_LINUX_SPEC "-D__unix__ -D__linux__ \ +%{!undef: \ + %{!ansi: \ + %{!std=*:-Dunix -D__unix -Dlinux -D__linux} \ + %{std=gnu*:-Dunix -D__unix -Dlinux -D__linux}}} \ -Asystem(unix) -Asystem(posix) %{pthread:-D_REENTRANT}" #endif #endif |