diff options
| author | Ulrich Weigand <uweigand@de.ibm.com> | 2002-05-13 12:33:24 +0000 |
|---|---|---|
| committer | Ulrich Weigand <uweigand@gcc.gnu.org> | 2002-05-13 12:33:24 +0000 |
| commit | dcb41ced7946e159914d0d0d019ac9b5417e2b96 (patch) | |
| tree | 4b9c10ae0d6f1e00d99bb2bd1969f3a8b200eacd /gcc | |
| parent | 165e03670b2fcef836dfebd95c053be5a94b255f (diff) | |
| download | gcc-dcb41ced7946e159914d0d0d019ac9b5417e2b96.zip gcc-dcb41ced7946e159914d0d0d019ac9b5417e2b96.tar.gz gcc-dcb41ced7946e159914d0d0d019ac9b5417e2b96.tar.bz2 | |
* config/s390/linux.h: Revert 2002-04-22 changes.
From-SVN: r53421
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/config/s390/linux.h | 37 |
2 files changed, 6 insertions, 35 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a4fc0d8..45b8128 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2002-05-13 Ulrich Weigand <uweigand@de.ibm.com> + + * config/s390/linux.h: Revert 2002-04-22 changes. + 2002-05-13 Scott Marks <SMarks@mobile-mind.com> * config/fr30/fr30.md: Only allow splits of immediate loads diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h index a0f3530..a0336bf 100644 --- a/gcc/config/s390/linux.h +++ b/gcc/config/s390/linux.h @@ -92,40 +92,10 @@ Boston, MA 02111-1307, USA. */ #endif -/* Target specific library settings. */ - -#ifndef LIBPATH_ARCH31_SPEC -#define LIBPATH_ARCH31_SPEC "/usr/lib" -#endif -#ifndef LIBPATH_ARCH64_SPEC -#define LIBPATH_ARCH64_SPEC "/usr/lib64" -#endif - -#ifdef DEFAULT_TARGET_64BIT -#define LIBPATH_SPEC "%{m31:%(libpath_arch31)}%{!m31:%(libpath_arch64)}" -#else -#define LIBPATH_SPEC "%{m64:%(libpath_arch64)}%{!m64:%(libpath_arch31)}" -#endif - - /* Target specific linker settings. */ -#undef STARTFILE_SPEC -#define STARTFILE_SPEC \ - "%{!shared: \ - %{pg:%(libpath)/gcrt1.o%s} \ - %{!pg:%{p:%(libpath)/gcrt1.o%s} \ - %{!p:%{profile:%(libpath)/gcrt1.o%s} \ - %{!profile:%(libpath)/crt1.o%s}}}} \ - %(libpath)/crti.o%s %{static:crtbeginT.o%s}\ - %{!static:%{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}}" - -#undef ENDFILE_SPEC -#define ENDFILE_SPEC \ - "%{!shared:crtend.o%s} %{shared:crtendS.o%s} %(libpath)/crtn.o%s" - #define LINK_ARCH31_SPEC \ - "-m elf_s390 -L %(libpath_arch31) \ + "-m elf_s390 \ %{shared:-shared} \ %{!shared: \ %{static:-static} \ @@ -134,7 +104,7 @@ Boston, MA 02111-1307, USA. */ %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}" #define LINK_ARCH64_SPEC \ - "-m elf64_s390 -L %(libpath_arch64) \ + "-m elf64_s390 \ %{shared:-shared} \ %{!shared: \ %{static:-static} \ @@ -160,9 +130,6 @@ Boston, MA 02111-1307, USA. */ { "cpp_arch64", CPP_ARCH64_SPEC }, \ { "link_arch31", LINK_ARCH31_SPEC }, \ { "link_arch64", LINK_ARCH64_SPEC }, \ - { "libpath_arch31", LIBPATH_ARCH31_SPEC }, \ - { "libpath_arch64", LIBPATH_ARCH64_SPEC }, \ - { "libpath", LIBPATH_SPEC }, \ /* Character to start a comment. */ |