lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-09-02 16:01:20 +03:00
Code Activity

Update.

Browse Source 
2001-03-09  Andreas Jaeger  <aj@suse.de>

	* sysdeps/s390/dl-machine.h (elf_machine_matches_host): Handle
	both new and old EM_S390 values.
	(EM_S390_OLD): New constant.

	* elf/elf.h (EM_S390): Use official value.
This commit is contained in:
Andreas Jaeger
2001-03-09 17:33:11 +00:00
parent 832c025eb1
commit 9672b9372f
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2001-03-09 Andreas Jaeger <aj@suse.de>
* sysdeps/s390/dl-machine.h (elf_machine_matches_host): Handle
both new and old EM_S390 values.
(EM_S390_OLD): New constant.
* elf/elf.h (EM_S390): Use official value.
2001-03-09 Ulrich Drepper <drepper@redhat.com> 2001-03-09 Ulrich Drepper <drepper@redhat.com>
* conform/data/sys/socket.h-data: Allow SO* symbols. * conform/data/sys/socket.h-data: Allow SO* symbols.

2
elf/elf.h
View File

@@ -177,6 +177,7 @@ typedef struct
#define EM_960 19 /* Intel 80960 */ #define EM_960 19 /* Intel 80960 */
#define EM_PPC 20 /* PowerPC */ #define EM_PPC 20 /* PowerPC */
#define EM_PPC64 21 /* PowerPC 64-bit */ #define EM_PPC64 21 /* PowerPC 64-bit */
#define EM_S390 22 /* IBM S390 */
#define EM_V800 36 /* NEC V800 series */ #define EM_V800 36 /* NEC V800 series */
#define EM_FR20 37 /* Fujitsu FR20 */ #define EM_FR20 37 /* Fujitsu FR20 */
@@ -223,7 +224,6 @@ typedef struct
chances of collision with official or non-GNU unofficial values. */ chances of collision with official or non-GNU unofficial values. */
#define EM_ALPHA 0x9026 #define EM_ALPHA 0x9026
#define EM_S390 0xA390 /* IBM S390 */
/* Legal values for e_version (version). */ /* Legal values for e_version (version). */

4
sysdeps/s390/dl-machine.h
View File

@@ -28,12 +28,14 @@
#include <string.h> #include <string.h>
#include <link.h> #include <link.h>
/* This is an older, now obsolete value. */
#define EM_S390_OLD 0xA390
/* Return nonzero iff ELF header is compatible with the running host. */ /* Return nonzero iff ELF header is compatible with the running host. */
static inline int static inline int
elf_machine_matches_host (const Elf32_Ehdr *ehdr) elf_machine_matches_host (const Elf32_Ehdr *ehdr)
{ {
return ehdr->e_machine == EM_S390; return (ehdr->e_machine == EM_S390 || ehdr->e_machine == EM_S390_OLD);
} }