From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id 1706E3858401; Wed, 23 Mar 2022 01:45:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1706E3858401 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Frysinger To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] amdgcn: Fix build failure X-Act-Checkin: newlib-cygwin X-Git-Author: Andrew Stubbs X-Git-Refname: refs/heads/master X-Git-Oldrev: 64b208103d284e8b64db604b34736a861e14b927 X-Git-Newrev: 761ef3b434b5eb7f321e58c3fae1f578f5c34999 Message-Id: <20220323014538.1706E3858401@sourceware.org> Date: Wed, 23 Mar 2022 01:45:38 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Mar 2022 01:45:38 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D761ef3b434b= 5eb7f321e58c3fae1f578f5c34999 commit 761ef3b434b5eb7f321e58c3fae1f578f5c34999 Author: Andrew Stubbs Date: Mon Mar 21 14:25:45 2022 +0000 amdgcn: Fix build failure =20 The recent makefile reorganization broke the amdgcn port by creating duplicate __malloc_lock symbols. This patch fixes the problem by renam= ing the malloc_support.c file to mlock.c, thus overriding the default symbol properly. Actually, I'm not sure how this ever worked? Diff: --- newlib/Makefile.in | 28 +++++++++++-------= ---- newlib/libc/machine/amdgcn/Makefile.inc | 2 +- .../machine/amdgcn/{malloc_support.c =3D> mlock.c} | 0 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/newlib/Makefile.in b/newlib/Makefile.in index 6081ba41a..387fad145 100644 --- a/newlib/Makefile.in +++ b/newlib/Makefile.in @@ -698,7 +698,7 @@ check_PROGRAMS =3D @HAVE_LIBC_MACHINE_AMDGCN_TRUE@ libc/machine/amdgcn/abort.c \ @HAVE_LIBC_MACHINE_AMDGCN_TRUE@ libc/machine/amdgcn/exit.c \ @HAVE_LIBC_MACHINE_AMDGCN_TRUE@ libc/machine/amdgcn/atexit.c \ -@HAVE_LIBC_MACHINE_AMDGCN_TRUE@ libc/machine/amdgcn/malloc_support.c \ +@HAVE_LIBC_MACHINE_AMDGCN_TRUE@ libc/machine/amdgcn/mlock.c \ @HAVE_LIBC_MACHINE_AMDGCN_TRUE@ libc/machine/amdgcn/getreent.c \ @HAVE_LIBC_MACHINE_AMDGCN_TRUE@ libc/machine/amdgcn/signal.c =20 @@ -1991,7 +1991,7 @@ am__objects_51 =3D libc/ssp/libc_a-chk_fail.$(OBJEXT)= \ @HAVE_LIBC_MACHINE_AMDGCN_TRUE@am__objects_79 =3D libc/machine/amdgcn/libc= _a-abort.$(OBJEXT) \ @HAVE_LIBC_MACHINE_AMDGCN_TRUE@ libc/machine/amdgcn/libc_a-exit.$(OBJEXT) \ @HAVE_LIBC_MACHINE_AMDGCN_TRUE@ libc/machine/amdgcn/libc_a-atexit.$(OBJEXT= ) \ -@HAVE_LIBC_MACHINE_AMDGCN_TRUE@ libc/machine/amdgcn/libc_a-malloc_support.= $(OBJEXT) \ +@HAVE_LIBC_MACHINE_AMDGCN_TRUE@ libc/machine/amdgcn/libc_a-mlock.$(OBJEXT)= \ @HAVE_LIBC_MACHINE_AMDGCN_TRUE@ libc/machine/amdgcn/libc_a-getreent.$(OBJE= XT) \ @HAVE_LIBC_MACHINE_AMDGCN_TRUE@ libc/machine/amdgcn/libc_a-signal.$(OBJEXT) @HAVE_LIBC_MACHINE_ARC_TRUE@am__objects_80 =3D libc/machine/arc/libc_a-mem= cmp.$(OBJEXT) \ @@ -8064,7 +8064,7 @@ libc/machine/amdgcn/libc_a-exit.$(OBJEXT): \ libc/machine/amdgcn/libc_a-atexit.$(OBJEXT): \ libc/machine/amdgcn/$(am__dirstamp) \ libc/machine/amdgcn/$(DEPDIR)/$(am__dirstamp) -libc/machine/amdgcn/libc_a-malloc_support.$(OBJEXT): \ +libc/machine/amdgcn/libc_a-mlock.$(OBJEXT): \ libc/machine/amdgcn/$(am__dirstamp) \ libc/machine/amdgcn/$(DEPDIR)/$(am__dirstamp) libc/machine/amdgcn/libc_a-getreent.$(OBJEXT): \ @@ -12225,7 +12225,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@libc/machine/amdgcn/$(DEPDIR)/libc_a-= atexit.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libc/machine/amdgcn/$(DEPDIR)/libc_a-= exit.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libc/machine/amdgcn/$(DEPDIR)/libc_a-= getreent.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libc/machine/amdgcn/$(DEPDIR)/libc_a-= malloc_support.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libc/machine/amdgcn/$(DEPDIR)/libc_a-= mlock.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libc/machine/amdgcn/$(DEPDIR)/libc_a-= signal.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libc/machine/arc/$(DEPDIR)/libc_a-mem= cmp-bs-norm.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libc/machine/arc/$(DEPDIR)/libc_a-mem= cmp-stub.Po@am__quote@ @@ -33380,19 +33380,19 @@ libc/machine/amdgcn/libc_a-atexit.obj: libc/machi= ne/amdgcn/atexit.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=3D$(DEPDIR) $(CCDEPMODE) $(depcom= p) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDE= S) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -c= -o libc/machine/amdgcn/libc_a-atexit.obj `if test -f 'libc/machine/amdgcn/= atexit.c'; then $(CYGPATH_W) 'libc/machine/amdgcn/atexit.c'; else $(CYGPATH= _W) '$(srcdir)/libc/machine/amdgcn/atexit.c'; fi` =20 -libc/machine/amdgcn/libc_a-malloc_support.o: libc/machine/amdgcn/malloc_su= pport.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDE= S) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -MT libc/machi= ne/amdgcn/libc_a-malloc_support.o -MD -MP -MF libc/machine/amdgcn/$(DEPDIR)= /libc_a-malloc_support.Tpo -c -o libc/machine/amdgcn/libc_a-malloc_support.= o `test -f 'libc/machine/amdgcn/malloc_support.c' || echo '$(srcdir)/'`libc= /machine/amdgcn/malloc_support.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libc/machine/amdgcn/$(DEPDIR)/lib= c_a-malloc_support.Tpo libc/machine/amdgcn/$(DEPDIR)/libc_a-malloc_support.= Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source=3D'libc/machine/amdgcn/= malloc_support.c' object=3D'libc/machine/amdgcn/libc_a-malloc_support.o' li= btool=3Dno @AMDEPBACKSLASH@ +libc/machine/amdgcn/libc_a-mlock.o: libc/machine/amdgcn/mlock.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDE= S) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -MT libc/machi= ne/amdgcn/libc_a-mlock.o -MD -MP -MF libc/machine/amdgcn/$(DEPDIR)/libc_a-m= lock.Tpo -c -o libc/machine/amdgcn/libc_a-mlock.o `test -f 'libc/machine/am= dgcn/mlock.c' || echo '$(srcdir)/'`libc/machine/amdgcn/mlock.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libc/machine/amdgcn/$(DEPDIR)/lib= c_a-mlock.Tpo libc/machine/amdgcn/$(DEPDIR)/libc_a-mlock.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source=3D'libc/machine/amdgcn/= mlock.c' object=3D'libc/machine/amdgcn/libc_a-mlock.o' libtool=3Dno @AMDEPB= ACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=3D$(DEPDIR) $(CCDEPMODE) $(depcom= p) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDE= S) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -c= -o libc/machine/amdgcn/libc_a-malloc_support.o `test -f 'libc/machine/amdg= cn/malloc_support.c' || echo '$(srcdir)/'`libc/machine/amdgcn/malloc_suppor= t.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDE= S) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -c= -o libc/machine/amdgcn/libc_a-mlock.o `test -f 'libc/machine/amdgcn/mlock.= c' || echo '$(srcdir)/'`libc/machine/amdgcn/mlock.c =20 -libc/machine/amdgcn/libc_a-malloc_support.obj: libc/machine/amdgcn/malloc_= support.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDE= S) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -MT libc/machi= ne/amdgcn/libc_a-malloc_support.obj -MD -MP -MF libc/machine/amdgcn/$(DEPDI= R)/libc_a-malloc_support.Tpo -c -o libc/machine/amdgcn/libc_a-malloc_suppor= t.obj `if test -f 'libc/machine/amdgcn/malloc_support.c'; then $(CYGPATH_W)= 'libc/machine/amdgcn/malloc_support.c'; else $(CYGPATH_W) '$(srcdir)/libc/= machine/amdgcn/malloc_support.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libc/machine/amdgcn/$(DEPDIR)/lib= c_a-malloc_support.Tpo libc/machine/amdgcn/$(DEPDIR)/libc_a-malloc_support.= Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source=3D'libc/machine/amdgcn/= malloc_support.c' object=3D'libc/machine/amdgcn/libc_a-malloc_support.obj' = libtool=3Dno @AMDEPBACKSLASH@ +libc/machine/amdgcn/libc_a-mlock.obj: libc/machine/amdgcn/mlock.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDE= S) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -MT libc/machi= ne/amdgcn/libc_a-mlock.obj -MD -MP -MF libc/machine/amdgcn/$(DEPDIR)/libc_a= -mlock.Tpo -c -o libc/machine/amdgcn/libc_a-mlock.obj `if test -f 'libc/mac= hine/amdgcn/mlock.c'; then $(CYGPATH_W) 'libc/machine/amdgcn/mlock.c'; else= $(CYGPATH_W) '$(srcdir)/libc/machine/amdgcn/mlock.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libc/machine/amdgcn/$(DEPDIR)/lib= c_a-mlock.Tpo libc/machine/amdgcn/$(DEPDIR)/libc_a-mlock.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source=3D'libc/machine/amdgcn/= mlock.c' object=3D'libc/machine/amdgcn/libc_a-mlock.obj' libtool=3Dno @AMDE= PBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=3D$(DEPDIR) $(CCDEPMODE) $(depcom= p) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDE= S) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -c= -o libc/machine/amdgcn/libc_a-malloc_support.obj `if test -f 'libc/machine= /amdgcn/malloc_support.c'; then $(CYGPATH_W) 'libc/machine/amdgcn/malloc_su= pport.c'; else $(CYGPATH_W) '$(srcdir)/libc/machine/amdgcn/malloc_support.c= '; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDE= S) $(INCLUDES) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -c= -o libc/machine/amdgcn/libc_a-mlock.obj `if test -f 'libc/machine/amdgcn/m= lock.c'; then $(CYGPATH_W) 'libc/machine/amdgcn/mlock.c'; else $(CYGPATH_W)= '$(srcdir)/libc/machine/amdgcn/mlock.c'; fi` =20 libc/machine/amdgcn/libc_a-getreent.o: libc/machine/amdgcn/getreent.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDE= S) $(libc_a_CPPFLAGS) $(CPPFLAGS) $(libc_a_CFLAGS) $(CFLAGS) -MT libc/machi= ne/amdgcn/libc_a-getreent.o -MD -MP -MF libc/machine/amdgcn/$(DEPDIR)/libc_= a-getreent.Tpo -c -o libc/machine/amdgcn/libc_a-getreent.o `test -f 'libc/m= achine/amdgcn/getreent.c' || echo '$(srcdir)/'`libc/machine/amdgcn/getreent= .c diff --git a/newlib/libc/machine/amdgcn/Makefile.inc b/newlib/libc/machine/= amdgcn/Makefile.inc index 6253e4d70..d26603aa8 100644 --- a/newlib/libc/machine/amdgcn/Makefile.inc +++ b/newlib/libc/machine/amdgcn/Makefile.inc @@ -2,6 +2,6 @@ libc_a_SOURCES +=3D \ %D%/abort.c \ %D%/exit.c \ %D%/atexit.c \ - %D%/malloc_support.c \ + %D%/mlock.c \ %D%/getreent.c \ %D%/signal.c diff --git a/newlib/libc/machine/amdgcn/malloc_support.c b/newlib/libc/mach= ine/amdgcn/mlock.c similarity index 100% rename from newlib/libc/machine/amdgcn/malloc_support.c rename to newlib/libc/machine/amdgcn/mlock.c