[PATCH 1/2] newlib: xtensa: remove sys/xtensa but use machine/xtensa

[Corinna Vinschen]

Hi Alexey,

after Max approval, can you please either remove the generated
files from your patches, or reapply and recreate them on top of
current origin/main?


Thanks,
Corinna


On Aug 23 23:13, Max Filippov wrote:
> On Fri, Aug 2, 2024 at 2:21 AM Alexey Lapshin
> <alexey.lapshin@espressif.com> wrote:
> >
> > Remove sys/xtensa that is actually duplicate newlib's code.
> > Move used code to machine/xtensa or to libgloss
> 
> This change looks good to me.
> 
> > ---
> >  libgloss/Makefile.in                          |  23 +-
> >  libgloss/xtensa/Makefile.inc                  |   1 +
> >  .../sys => libgloss}/xtensa/clibrary_init.c   |   6 +-
> >  newlib/Makefile.am                            |   6 +-
> >  newlib/Makefile.in                            | 604 ++++++++----------
> >  newlib/configure                              |  13 -
> >  newlib/libc/acinclude.m4                      |   1 -
> >  .../xtensa/include/xtensa/config/core-isa.h   |   0
> >  .../include => machine/xtensa/sys}/fenv.h     |   6 +-
> >  newlib/libc/sys/Makefile.inc                  |   3 -
> >  newlib/libc/sys/xtensa/Makefile.inc           |   1 -
> >  newlib/libc/sys/xtensa/creat.c                |   9 -
> >  newlib/libc/sys/xtensa/crt0.c                 |  16 -
> >  newlib/libc/sys/xtensa/include/unistd.h       |  13 -
> >  newlib/libc/sys/xtensa/isatty.c               |  18 -
> >  newlib/libc/sys/xtensa/sys/file.h             |  33 -
> >  newlib/libm/machine/xtensa/acinclude.m4       |   2 +-
> >  17 files changed, 304 insertions(+), 451 deletions(-)
> >  rename {newlib/libc/sys => libgloss}/xtensa/clibrary_init.c (91%)
> >  rename newlib/libc/{sys => machine}/xtensa/include/xtensa/config/core-isa.h (100%)
> >  rename newlib/libc/{sys/xtensa/include => machine/xtensa/sys}/fenv.h (97%)
> >  delete mode 100644 newlib/libc/sys/xtensa/Makefile.inc
> >  delete mode 100644 newlib/libc/sys/xtensa/creat.c
> >  delete mode 100644 newlib/libc/sys/xtensa/crt0.c
> >  delete mode 100644 newlib/libc/sys/xtensa/include/unistd.h
> >  delete mode 100644 newlib/libc/sys/xtensa/isatty.c
> >  delete mode 100644 newlib/libc/sys/xtensa/sys/file.h
> 
> [...]
> 
> > diff --git a/newlib/libc/sys/xtensa/clibrary_init.c b/libgloss/xtensa/clibrary_init.c
> > similarity index 91%
> > rename from newlib/libc/sys/xtensa/clibrary_init.c
> > rename to libgloss/xtensa/clibrary_init.c
> > index 24d4cf94c..b8c7d3a6a 100644
> > --- a/newlib/libc/sys/xtensa/clibrary_init.c
> > +++ b/libgloss/xtensa/clibrary_init.c
> > @@ -1,6 +1,6 @@
> >  /* Copyright (c) 2003-2006 Tensilica Inc.  ALL RIGHTS RESERVED.
> >
> > -   Redistribution and use in source and binary forms, with or without
> > +  Redistribution and use in source and binary forms, with or without
> >     modification, are permitted provided that the following conditions are met:
> >
> >     1. Redistributions of source code must retain the above copyright
> > @@ -29,8 +29,8 @@ const char * __progname = 0;
> >
> >  void
> >  __clibrary_init (int argc, char **argv, char **envp,
> > -                void (*init)(void),
> > -                void (*fini)(void))
> > +                void (*init)(void),
> > +                void (*fini)(void))
> >  {
> >    if (argv != 0)
> >      __progname = *argv;
> 
> unrelated whitespace changes in this file.
> 
> -- 
> Thanks.
> -- Max