diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/m/macppc.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9e08f6a8977..be510c69f1a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2010-04-23 Dan Nicolaescu <dann@ics.uci.edu> | 1 | 2010-04-23 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 2 | ||
| 3 | * m/macppc.h (LD_SWITCH_SYSTEM_TEMACS): Remove #undef. | ||
| 4 | (LD_SWITCH_MACHINE_TEMACS): Remove, configure sets nocombreloc. | ||
| 5 | |||
| 3 | * s/netbsd.h (LD_SWITCH_SYSTEM_TEMACS): Remove, configure sets nocombreloc. | 6 | * s/netbsd.h (LD_SWITCH_SYSTEM_TEMACS): Remove, configure sets nocombreloc. |
| 4 | * s/openbsd.h (LD_SWITCH_SYSTEM_TEMACS): Remove. | 7 | * s/openbsd.h (LD_SWITCH_SYSTEM_TEMACS): Remove. |
| 5 | 8 | ||
diff --git a/src/m/macppc.h b/src/m/macppc.h index 150fc356518..77772521ed7 100644 --- a/src/m/macppc.h +++ b/src/m/macppc.h | |||
| @@ -44,10 +44,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 44 | 44 | ||
| 45 | #ifdef GNU_LINUX | 45 | #ifdef GNU_LINUX |
| 46 | #define LINKER $(CC) -nostdlib | 46 | #define LINKER $(CC) -nostdlib |
| 47 | /* s/gnu-linux.h defines this to `-z nocombreloc' which does not work here | ||
| 48 | because prefix-args is not used. */ | ||
| 49 | #undef LD_SWITCH_SYSTEM_TEMACS | ||
| 50 | #define LD_SWITCH_MACHINE_TEMACS -Xlinker -znocombreloc | ||
| 51 | #ifdef _ARCH_PPC64 | 47 | #ifdef _ARCH_PPC64 |
| 52 | #undef START_FILES | 48 | #undef START_FILES |
| 53 | #define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o | 49 | #define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o |