Message ID | 20230212111044.610942-11-bugaevc@gmail.com |
---|---|
State | New |
Headers | show |
Series | Towards glibc on x86_64-gnu | expand |
Sergey Bugaev, le dim. 12 févr. 2023 14:10:41 +0300, a ecrit: > And move pt-setup.c to the generic x86 tree. > > Signed-off-by: Sergey Bugaev <bugaevc@gmail.com> > --- > sysdeps/mach/hurd/Implies | 1 + > sysdeps/mach/hurd/{i386 => x86}/htl/pt-setup.c | 4 ++-- > sysdeps/mach/hurd/x86_64/Implies | 2 ++ > sysdeps/mach/hurd/x86_64/htl/Implies | 3 +++ > sysdeps/mach/x86_64/Implies | 1 + > 5 files changed, 9 insertions(+), 2 deletions(-) > rename sysdeps/mach/hurd/{i386 => x86}/htl/pt-setup.c (97%) > create mode 100644 sysdeps/mach/hurd/x86_64/Implies > create mode 100644 sysdeps/mach/hurd/x86_64/htl/Implies > create mode 100644 sysdeps/mach/x86_64/Implies > > diff --git a/sysdeps/mach/hurd/Implies b/sysdeps/mach/hurd/Implies > index d2d5234c..e19dd1fd 100644 > --- a/sysdeps/mach/hurd/Implies > +++ b/sysdeps/mach/hurd/Implies > @@ -3,3 +3,4 @@ > gnu > # The Hurd provides a rough superset of the functionality of 4.4 BSD. > unix/bsd > +mach/hurd/htl > diff --git a/sysdeps/mach/hurd/i386/htl/pt-setup.c b/sysdeps/mach/hurd/x86/htl/pt-setup.c > similarity index 97% > rename from sysdeps/mach/hurd/i386/htl/pt-setup.c > rename to sysdeps/mach/hurd/x86/htl/pt-setup.c > index 94caed82..3abd92b2 100644 > --- a/sysdeps/mach/hurd/i386/htl/pt-setup.c > +++ b/sysdeps/mach/hurd/x86/htl/pt-setup.c > @@ -1,4 +1,4 @@ > -/* Setup thread stack. Hurd/i386 version. > +/* Setup thread stack. Hurd/x86 version. > Copyright (C) 2000-2023 Free Software Foundation, Inc. > This file is part of the GNU C Library. > > @@ -22,7 +22,7 @@ > > #include <pt-internal.h> > > -/* The stack layout used on the i386 is: > +/* The stack layout used on the x86 is: > > ----------------- > | ARG | > diff --git a/sysdeps/mach/hurd/x86_64/Implies b/sysdeps/mach/hurd/x86_64/Implies > new file mode 100644 > index 00000000..6b5e6f47 > --- /dev/null > +++ b/sysdeps/mach/hurd/x86_64/Implies > @@ -0,0 +1,2 @@ > +mach/hurd/x86 > +mach/hurd/x86_64/htl > diff --git a/sysdeps/mach/hurd/x86_64/htl/Implies b/sysdeps/mach/hurd/x86_64/htl/Implies > new file mode 100644 > index 00000000..1ae8f16e > --- /dev/null > +++ b/sysdeps/mach/hurd/x86_64/htl/Implies > @@ -0,0 +1,3 @@ > +mach/hurd/htl > +mach/hurd/x86/htl > +x86_64/htl Always remember to also try the 32bit build, I added this to your commit: diff --git a/sysdeps/mach/hurd/i386/htl/Implies b/sysdeps/mach/hurd/i386/htl/Implies index 7a0f99d772..fe3bd983b8 100644 --- a/sysdeps/mach/hurd/i386/htl/Implies +++ b/sysdeps/mach/hurd/i386/htl/Implies @@ -1,2 +1,3 @@ mach/hurd/htl +mach/hurd/x86/htl i386/htl Thanks! > diff --git a/sysdeps/mach/x86_64/Implies b/sysdeps/mach/x86_64/Implies > new file mode 100644 > index 00000000..da8291f4 > --- /dev/null > +++ b/sysdeps/mach/x86_64/Implies > @@ -0,0 +1 @@ > +mach/x86 > -- > 2.39.1 > >
diff --git a/sysdeps/mach/hurd/Implies b/sysdeps/mach/hurd/Implies index d2d5234c..e19dd1fd 100644 --- a/sysdeps/mach/hurd/Implies +++ b/sysdeps/mach/hurd/Implies @@ -3,3 +3,4 @@ gnu # The Hurd provides a rough superset of the functionality of 4.4 BSD. unix/bsd +mach/hurd/htl diff --git a/sysdeps/mach/hurd/i386/htl/pt-setup.c b/sysdeps/mach/hurd/x86/htl/pt-setup.c similarity index 97% rename from sysdeps/mach/hurd/i386/htl/pt-setup.c rename to sysdeps/mach/hurd/x86/htl/pt-setup.c index 94caed82..3abd92b2 100644 --- a/sysdeps/mach/hurd/i386/htl/pt-setup.c +++ b/sysdeps/mach/hurd/x86/htl/pt-setup.c @@ -1,4 +1,4 @@ -/* Setup thread stack. Hurd/i386 version. +/* Setup thread stack. Hurd/x86 version. Copyright (C) 2000-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -22,7 +22,7 @@ #include <pt-internal.h> -/* The stack layout used on the i386 is: +/* The stack layout used on the x86 is: ----------------- | ARG | diff --git a/sysdeps/mach/hurd/x86_64/Implies b/sysdeps/mach/hurd/x86_64/Implies new file mode 100644 index 00000000..6b5e6f47 --- /dev/null +++ b/sysdeps/mach/hurd/x86_64/Implies @@ -0,0 +1,2 @@ +mach/hurd/x86 +mach/hurd/x86_64/htl diff --git a/sysdeps/mach/hurd/x86_64/htl/Implies b/sysdeps/mach/hurd/x86_64/htl/Implies new file mode 100644 index 00000000..1ae8f16e --- /dev/null +++ b/sysdeps/mach/hurd/x86_64/htl/Implies @@ -0,0 +1,3 @@ +mach/hurd/htl +mach/hurd/x86/htl +x86_64/htl diff --git a/sysdeps/mach/x86_64/Implies b/sysdeps/mach/x86_64/Implies new file mode 100644 index 00000000..da8291f4 --- /dev/null +++ b/sysdeps/mach/x86_64/Implies @@ -0,0 +1 @@ +mach/x86
And move pt-setup.c to the generic x86 tree. Signed-off-by: Sergey Bugaev <bugaevc@gmail.com> --- sysdeps/mach/hurd/Implies | 1 + sysdeps/mach/hurd/{i386 => x86}/htl/pt-setup.c | 4 ++-- sysdeps/mach/hurd/x86_64/Implies | 2 ++ sysdeps/mach/hurd/x86_64/htl/Implies | 3 +++ sysdeps/mach/x86_64/Implies | 1 + 5 files changed, 9 insertions(+), 2 deletions(-) rename sysdeps/mach/hurd/{i386 => x86}/htl/pt-setup.c (97%) create mode 100644 sysdeps/mach/hurd/x86_64/Implies create mode 100644 sysdeps/mach/hurd/x86_64/htl/Implies create mode 100644 sysdeps/mach/x86_64/Implies