* s/openbsd.h: Remove support for non-ELF and for systems that do
not support shared libraries. * s/netbsd.h: * s/freebsd.h: Likewise.
This commit is contained in:
Dan Nicolaescu
parent
5e418f1734
commit
7f110ddcb0
4 changed files with 7 additions and 50 deletions
|
|
@ -1,3 +1,10 @@
|
|||
2010-03-20 Dan Nicolaescu <dann@ics.uci.edu>
|
||||
|
||||
* s/openbsd.h: Remove support for non-ELF and for systems that do
|
||||
not support shared libraries.
|
||||
* s/netbsd.h:
|
||||
* s/freebsd.h: Likewise.
|
||||
|
||||
2010-03-20 Dan Nicolaescu <dann@ics.uci.edu>
|
||||
|
||||
Remove non-working support for lynxos 3.0.
|
||||
|
|
|
|||
|
|
@ -23,26 +23,6 @@ GNU General Public License for more details.
|
|||
You should have received a copy of the GNU General Public License
|
||||
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
||||
|
||||
/* Get the correct __FreeBSD_version, even if this is before that was
|
||||
defined. */
|
||||
#ifndef __FreeBSD_version
|
||||
#ifndef __FreeBSD__
|
||||
#define __FreeBSD_version 199401
|
||||
#elif __FreeBSD__ == 1
|
||||
#define __FreeBSD_version 199405
|
||||
#else
|
||||
#include <osreldate.h>
|
||||
#endif
|
||||
#endif /* !defined __FreeBSD_version */
|
||||
|
||||
/* '__FreeBSD__' is defined by the preprocessor on FreeBSD-1.1 and up.
|
||||
Earlier versions do not have shared libraries, so inhibit them.
|
||||
You can inhibit them on newer systems if you wish
|
||||
by defining NO_SHARED_LIBS. */
|
||||
#ifndef __FreeBSD__
|
||||
#define NO_SHARED_LIBS
|
||||
#endif
|
||||
|
||||
/* Get most of the stuff from bsd-common */
|
||||
#include "bsd-common.h"
|
||||
|
||||
|
|
@ -69,8 +49,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
|||
/* freebsd has POSIX-style pgrp behavior. */
|
||||
#undef BSD_PGRPS
|
||||
|
||||
#ifdef __ELF__
|
||||
|
||||
/* Let `ld' find image libs and similar things in /usr/local/lib. The
|
||||
system compiler, GCC, has apparently been modified to not look
|
||||
there, contrary to what a stock GCC would do. */
|
||||
|
|
@ -82,17 +60,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
|||
#undef LIB_GCC
|
||||
#define LIB_GCC
|
||||
|
||||
#else /* not __ELF__ */
|
||||
|
||||
#ifdef NO_SHARED_LIBS
|
||||
#ifdef __FreeBSD__ /* shared libs are available, but the user prefers
|
||||
not to use them. */
|
||||
#define LD_SWITCH_SYSTEM -Bstatic -L/usr/local/lib
|
||||
#endif /* __FreeBSD__ */
|
||||
#endif /* NO_SHARED_LIBS */
|
||||
|
||||
#endif /* not __ELF__ */
|
||||
|
||||
#define HAVE_GETLOADAVG 1
|
||||
#define HAVE_TERMIOS
|
||||
#define NO_TERMIO
|
||||
|
|
|
|||
|
|
@ -22,10 +22,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
|||
/* Get most of the stuff from bsd-common */
|
||||
#include "bsd-common.h"
|
||||
|
||||
#if defined (__alpha__) && !defined (__ELF__)
|
||||
#define NO_SHARED_LIBS
|
||||
#endif
|
||||
|
||||
/* For mem-limits.h. */
|
||||
#define BSD4_2
|
||||
|
||||
|
|
@ -53,13 +49,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
|||
/* Netbsd has POSIX-style pgrp behavior. */
|
||||
#undef BSD_PGRPS
|
||||
|
||||
#if !defined (NO_SHARED_LIBS) && defined (__ELF__)
|
||||
#define START_FILES pre-crt0.o /usr/lib/crt0.o START_FILES_1 /usr/lib/crtbegin.o
|
||||
#define UNEXEC unexelf.o
|
||||
#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o END_FILES_1
|
||||
#undef LIB_GCC
|
||||
#define LIB_GCC
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CRTIN
|
||||
#define START_FILES_1 /usr/lib/crti.o
|
||||
|
|
@ -71,7 +65,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
|||
|
||||
#define AMPERSAND_FULL_NAME
|
||||
|
||||
#ifdef __ELF__
|
||||
/* Here is how to find X Windows. LD_SWITCH_X_SITE_AUX gives an -R option
|
||||
says where to find X windows at run time. We convert it to a -rpath option
|
||||
which is what OSF1 uses. */
|
||||
|
|
@ -92,8 +85,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
|||
|
||||
#define LD_SWITCH_SYSTEM_TEMACS -Wl,-z,nocombreloc
|
||||
|
||||
#endif /* __ELF__ */
|
||||
|
||||
/* On post 1.3 releases of NetBSD, gcc -nostdlib also clears
|
||||
the library search parth, i.e. it won't search /usr/lib
|
||||
for libc and friends. Using -nostartfiles instead avoids
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
|
||||
#undef LD_SWITCH_SYSTEM_TEMACS
|
||||
#undef LD_SWITCH_SYSTEM
|
||||
#ifdef __ELF__
|
||||
|
||||
/* Han Boetes <han@mijncomputer.nl> says this
|
||||
is necessary, otherwise Emacs dumps core on elf systems. */
|
||||
|
|
@ -29,12 +28,5 @@
|
|||
default. */
|
||||
#define LD_SWITCH_X_DEFAULT -L/usr/local/lib
|
||||
|
||||
#else
|
||||
|
||||
#define LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_tmp
|
||||
#define LD_SWITCH_X_DEFAULT -L/usr/local/lib
|
||||
|
||||
#endif
|
||||
|
||||
/* arch-tag: 7e3f65ca-3f48-4237-933f-2b208b21e8e2
|
||||
(do not change this comment) */
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue