[PATCH v6] MIPS: Sync elf.h from binutils

[Aurelien Jarno]

Hi,

On 2023-07-22 13:02, Andreas K. Huettel via Libc-alpha wrote:
> Am Samstag, 22. Juli 2023, 11:37:41 CEST schrieb Mark Wielaard:
> > Hi,
> > 
> > On Tue, Jul 18, 2023 at 10:17:09AM +0800, Ying Huang wrote:
> > > ping
> > > 
> > > Because I did not have commit permissions,  could you help commit?
> > 
> > I am happy to commit this for you. But even though it is a constants
> > only patch at this point it should probably get an OK from Andreas,
> > the release manager.
> 
> OK from me, looks well-separated enough.
> Last feature add-on of the month. :o)
> 

Unfortunately this commit breaks building glibc on at list
mips64el-linux-gnuabi64, unless --disable-werror is used, due to
preprocessor redefinitions:

mips64el-linux-gnuabi64-gcc-13 -mabi=64 init-first.c -c -std=gnu11 -fgnu89-inline  -pipe -O2 -g -fdebug-prefix-map=/home/aurel32/glibc-2.38=. -Wall -Wwrite-strings -Wundef -Werror -fmerge-all-constants -frounding-math -fstack-protector-strong -fno-common -Wp,-U_FORTIFY_SOURCE -Wstrict-prototypes -Wold-style-definition -fmath-errno    -fPIE    -fno-stack-protector -DSTACK_PROTECTOR_LEVEL=0 -Wa,-execstack   -ftls-model=initial-exec   -isystem /home/aurel32/glibc-2.38/debian/include  -I../include -I/home/aurel32/glibc-2.38/build-tree/mips64el-libc/csu  -I/home/aurel32/glibc-2.38/build-tree/mips64el-libc  -I../sysdeps/unix/sysv/linux/mips/mips64/n64  -I../sysdeps/unix/sysv/linux/mips/mips64  -I../sysdeps/unix/sysv/linux/mips  -I../sysdeps/mips/nptl  -I../sysdeps/unix/sysv/linux/include -I../sysdeps/unix/sysv/linux  -I../sysdeps/nptl  -I../sysdeps/pthread  -I../sysdeps/gnu  -I../sysdeps/unix/inet  -I../sysdeps/unix/sysv  -I../sysdeps/unix/mips/mips64  -I../sysdeps/unix/mips  -I../sysdeps/unix  -I../sysdeps/posix  -I../sysdeps/mips/mips64/n64/fpu  -I../sysdeps/mips/mips64/n64  -I../sysdeps/mips/ieee754  -I../sysdeps/ieee754/ldbl-128  -I../sysdeps/mips/mips64  -I../sysdeps/ieee754/flt-32  -I../sysdeps/ieee754/dbl-64  -I../sysdeps/mips/include -I../sysdeps/mips  -I../sysdeps/wordsize-64  -I../sysdeps/mips/fpu  -I../sysdeps/ieee754  -I../sysdeps/generic  -I.. -I../libio -I. -nostdinc -isystem /usr/lib/gcc/mips64el-linux-gnuabi64/13/include -isystem /home/aurel32/glibc-2.38/debian/include -D_LIBC_REENTRANT -include /home/aurel32/glibc-2.38/build-tree/mips64el-libc/libc-modules.h -DMODULE_NAME=libc -include ../include/libc-symbols.h  -DPIC     -DTOP_NAMESPACE=glibc -o /home/aurel32/glibc-2.38/build-tree/mips64el-libc/csu/init-first.o -MD -MP -MF /home/aurel32/glibc-2.38/build-tree/mips64el-libc/csu/init-first.o.dt -MT /home/aurel32/glibc-2.38/build-tree/mips64el-libc/csu/init-first.o
In file included from ../sysdeps/gnu/ldsodefs.h:46,
                 from ../sysdeps/unix/sysv/linux/ldsodefs.h:25,
                 from ../sysdeps/unix/sysv/linux/mips/ldsodefs.h:22,
                 from init-first.c:29:
../sysdeps/mips/ldsodefs.h:128: error: "ELF64_MIPS_R_TYPE" redefined [-Werror]
  128 | #define ELF64_MIPS_R_TYPE(i) \
      | 
In file included from ../include/elf.h:2,
                 from ../sysdeps/mips/stackinfo.h:24,
                 from ../include/stackinfo.h:24,
                 from ../include/alloca.h:7,
                 from ../stdlib/stdlib.h:706,
                 from ../include/stdlib.h:16,
                 from init-first.c:20:
../elf/elf.h:681: note: this is the location of the previous definition
  681 | #define ELF64_MIPS_R_TYPE(i)            ((i) & 0xff)
      | 
cc1: all warnings being treated as errors
make[3]: *** [../o-iterator.mk:9: /home/aurel32/glibc-2.38/build-tree/mips64el-libc/csu/init-first.o] Error 1
make[3]: Leaving directory '/home/aurel32/glibc-2.38/csu'
make[2]: *** [Makefile:501: csu/subdir_lib] Error 2
make[2]: Leaving directory '/home/aurel32/glibc-2.38'
make[1]: *** [Makefile:9: all] Error 2
make[1]: Leaving directory '/home/aurel32/glibc-2.38/build-tree/mips64el-libc'


Regards
Aurelien

-- 
Aurelien Jarno                          GPG: 4096R/1DDD8C9B
aurelien@aurel32.net                     http://aurel32.net
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://sourceware.org/pipermail/libc-alpha/attachments/20230722/bfd83beb/attachment.sig>