From 9302aaad29363eb1dba30d5b9b588a165395672a Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 7 Feb 2022 10:46:19 -0500 Subject: [PATCH 4/4] Support target specific ALIGN for variable alignment test [BZ #28676] Add to support target specific ALIGN for variable alignment test: 1. Alpha: Use 0x10000. 2. MicroBlaze and Nios II: Use 0x8000. 3. All others: Use 0x200000. Backport from master commit: 4435c29 Reviewed-by: Adhemerval Zanella Signed-off-by: Rongwei Wang --- elf/tst-align3.c | 4 +--- elf/tst-alignmod3.c | 4 +--- sysdeps/alpha/tst-file-align.h | 20 ++++++++++++++++++++ sysdeps/generic/tst-file-align.h | 20 ++++++++++++++++++++ sysdeps/microblaze/tst-file-align.h | 20 ++++++++++++++++++++ sysdeps/nios2/tst-file-align.h | 20 ++++++++++++++++++++ 6 files changed, 82 insertions(+), 6 deletions(-) create mode 100644 sysdeps/alpha/tst-file-align.h create mode 100644 sysdeps/generic/tst-file-align.h create mode 100644 sysdeps/microblaze/tst-file-align.h create mode 100644 sysdeps/nios2/tst-file-align.h diff --git a/elf/tst-align3.c b/elf/tst-align3.c index ac86d623..87a8ff81 100644 --- a/elf/tst-align3.c +++ b/elf/tst-align3.c @@ -17,11 +17,9 @@ . */ #include +#include #include -/* This should cover all possible page sizes we currently support. */ -#define ALIGN 0x200000 - int bar __attribute__ ((aligned (ALIGN))) = 1; extern int do_load_test (void); diff --git a/elf/tst-alignmod3.c b/elf/tst-alignmod3.c index 0d33f237..9520c352 100644 --- a/elf/tst-alignmod3.c +++ b/elf/tst-alignmod3.c @@ -17,11 +17,9 @@ . */ #include +#include #include -/* This should cover all possible page sizes we currently support. */ -#define ALIGN 0x200000 - int foo __attribute__ ((aligned (ALIGN))) = 1; void diff --git a/sysdeps/alpha/tst-file-align.h b/sysdeps/alpha/tst-file-align.h new file mode 100644 index 00000000..8fc3c940 --- /dev/null +++ b/sysdeps/alpha/tst-file-align.h @@ -0,0 +1,20 @@ +/* Check file alignment. Alpha version. + Copyright (C) 2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +/* This should cover all possible alignments we currently support. */ +#define ALIGN 0x10000 diff --git a/sysdeps/generic/tst-file-align.h b/sysdeps/generic/tst-file-align.h new file mode 100644 index 00000000..6ee6783a --- /dev/null +++ b/sysdeps/generic/tst-file-align.h @@ -0,0 +1,20 @@ +/* Check file alignment. Generic version. + Copyright (C) 2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +/* This should cover all possible page sizes we currently support. */ +#define ALIGN 0x200000 diff --git a/sysdeps/microblaze/tst-file-align.h b/sysdeps/microblaze/tst-file-align.h new file mode 100644 index 00000000..43c58b29 --- /dev/null +++ b/sysdeps/microblaze/tst-file-align.h @@ -0,0 +1,20 @@ +/* Check file alignment. MicroBlaze version. + Copyright (C) 2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +/* This should cover all possible alignments we currently support. */ +#define ALIGN 0x8000 diff --git a/sysdeps/nios2/tst-file-align.h b/sysdeps/nios2/tst-file-align.h new file mode 100644 index 00000000..589a2d5a --- /dev/null +++ b/sysdeps/nios2/tst-file-align.h @@ -0,0 +1,20 @@ +/* Check file alignment. Nios II version. + Copyright (C) 2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +/* This should cover all possible alignments we currently support. */ +#define ALIGN 0x8000 -- 2.18.4