* [PATCH 1/4] gcc-5.4: Fix hang with mmusl option on cmdline
2016-07-07 18:08 [PATCH 0/4] musl/glibc/binutils updates Khem Raj
@ 2016-07-07 18:08 ` Khem Raj
2016-07-07 18:08 ` [PATCH 2/4] glibc: Upgrade to latest tip of master Khem Raj
` (3 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: Khem Raj @ 2016-07-07 18:08 UTC (permalink / raw)
To: openembedded-core
When using -m32 -mmusl options in this order, gcc hangs
in parsing the options decode_cmdline_options_to_array()
the reason is that we have broken the link when adding
mmusl options, the order of specifying libc was not kept
in order as a result it was unable to contruct the array
correctly and ended in parse hang.
We fix the options to specify the order properly.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...l-as-a-musl-libc-specifier-and-the-necess.patch | 72 +++++++++++-----------
1 file changed, 36 insertions(+), 36 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-5.4/0044-Adding-mmusl-as-a-musl-libc-specifier-and-the-necess.patch b/meta/recipes-devtools/gcc/gcc-5.4/0044-Adding-mmusl-as-a-musl-libc-specifier-and-the-necess.patch
index b91c02d..26aa96c 100644
--- a/meta/recipes-devtools/gcc/gcc-5.4/0044-Adding-mmusl-as-a-musl-libc-specifier-and-the-necess.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.4/0044-Adding-mmusl-as-a-musl-libc-specifier-and-the-necess.patch
@@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
gcc/ginclude/stddef.h | 3 ++
6 files changed, 110 insertions(+), 13 deletions(-)
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index 3825bd5..39ce047 100644
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
+Index: gcc-5.4.0/gcc/config.gcc
+===================================================================
+--- gcc-5.4.0.orig/gcc/config.gcc
++++ gcc-5.4.0/gcc/config.gcc
@@ -575,7 +575,7 @@ case ${target} in
esac
@@ -50,11 +50,11 @@ index 3825bd5..39ce047 100644
if test x${enable_secureplt} = xyes; then
tm_file="rs6000/secureplt.h ${tm_file}"
fi
-diff --git a/gcc/config/linux.h b/gcc/config/linux.h
-index 22b9be5..ca9a17f 100644
---- a/gcc/config/linux.h
-+++ b/gcc/config/linux.h
-@@ -32,10 +32,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+Index: gcc-5.4.0/gcc/config/linux.h
+===================================================================
+--- gcc-5.4.0.orig/gcc/config/linux.h
++++ gcc-5.4.0/gcc/config/linux.h
+@@ -32,10 +32,12 @@ see the files COPYING3 and COPYING.RUNTI
#define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC)
#define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
#define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
@@ -67,7 +67,7 @@ index 22b9be5..ca9a17f 100644
#endif
#define GNU_USER_TARGET_OS_CPP_BUILTINS() \
-@@ -53,18 +55,21 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+@@ -53,18 +55,21 @@ see the files COPYING3 and COPYING.RUNTI
uClibc or Bionic is the default C library and whether
-muclibc or -mglibc or -mbionic has been passed to change the default. */
@@ -97,7 +97,7 @@ index 22b9be5..ca9a17f 100644
#else
#error "Unsupported DEFAULT_LIBC"
#endif /* DEFAULT_LIBC */
-@@ -84,16 +89,16 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+@@ -84,16 +89,16 @@ see the files COPYING3 and COPYING.RUNTI
#define GNU_USER_DYNAMIC_LINKER \
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \
@@ -118,7 +118,7 @@ index 22b9be5..ca9a17f 100644
/* Whether we have Bionic libc runtime */
#undef TARGET_HAS_BIONIC
-@@ -123,3 +128,74 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+@@ -123,3 +128,74 @@ see the files COPYING3 and COPYING.RUNTI
# define TARGET_LIBC_HAS_FUNCTION linux_libc_has_function
#endif
@@ -193,32 +193,35 @@ index 22b9be5..ca9a17f 100644
+ { 0, 0, 0, 0, 0, 0 } \
+ }
+#endif
-diff --git a/gcc/config/linux.opt b/gcc/config/linux.opt
-index c054338..9334f74 100644
---- a/gcc/config/linux.opt
-+++ b/gcc/config/linux.opt
-@@ -30,3 +30,7 @@ Use GNU C library
+Index: gcc-5.4.0/gcc/config/linux.opt
+===================================================================
+--- gcc-5.4.0.orig/gcc/config/linux.opt
++++ gcc-5.4.0/gcc/config/linux.opt
+@@ -28,5 +28,9 @@ Target Report RejectNegative Var(linux_l
+ Use GNU C library
+
muclibc
- Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
+-Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
++Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mmusl)
Use uClibc C library
+
+mmusl
-+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
++Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mbionic)
+Use musl C library
-diff --git a/gcc/config/rs6000/secureplt.h b/gcc/config/rs6000/secureplt.h
-index b463463..77edf2a 100644
---- a/gcc/config/rs6000/secureplt.h
-+++ b/gcc/config/rs6000/secureplt.h
-@@ -18,3 +18,4 @@ along with GCC; see the file COPYING3. If not see
+Index: gcc-5.4.0/gcc/config/rs6000/secureplt.h
+===================================================================
+--- gcc-5.4.0.orig/gcc/config/rs6000/secureplt.h
++++ gcc-5.4.0/gcc/config/rs6000/secureplt.h
+@@ -18,3 +18,4 @@ along with GCC; see the file COPYING3.
<http://www.gnu.org/licenses/>. */
#define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
+#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
-diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
-index c6c31dc..7cd07e0 100644
---- a/gcc/config/rs6000/sysv4.h
-+++ b/gcc/config/rs6000/sysv4.h
-@@ -538,6 +538,10 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
+Index: gcc-5.4.0/gcc/config/rs6000/sysv4.h
+===================================================================
+--- gcc-5.4.0.orig/gcc/config/rs6000/sysv4.h
++++ gcc-5.4.0/gcc/config/rs6000/sysv4.h
+@@ -538,6 +538,10 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF
#define CC1_SECURE_PLT_DEFAULT_SPEC ""
#endif
@@ -237,10 +240,10 @@ index c6c31dc..7cd07e0 100644
{ "cpp_os_ads", CPP_OS_ADS_SPEC }, \
{ "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \
{ "cpp_os_mvme", CPP_OS_MVME_SPEC }, \
-diff --git a/gcc/ginclude/stddef.h b/gcc/ginclude/stddef.h
-index f20a41b..eb879ef 100644
---- a/gcc/ginclude/stddef.h
-+++ b/gcc/ginclude/stddef.h
+Index: gcc-5.4.0/gcc/ginclude/stddef.h
+===================================================================
+--- gcc-5.4.0.orig/gcc/ginclude/stddef.h
++++ gcc-5.4.0/gcc/ginclude/stddef.h
@@ -184,6 +184,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
#ifndef _GCC_SIZE_T
#ifndef _SIZET_
@@ -265,6 +268,3 @@ index f20a41b..eb879ef 100644
#endif /* __size_t */
#endif /* _SIZET_ */
#endif /* _GCC_SIZE_T */
---
-2.6.3
-
--
2.9.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 2/4] glibc: Upgrade to latest tip of master
2016-07-07 18:08 [PATCH 0/4] musl/glibc/binutils updates Khem Raj
2016-07-07 18:08 ` [PATCH 1/4] gcc-5.4: Fix hang with mmusl option on cmdline Khem Raj
@ 2016-07-07 18:08 ` Khem Raj
2016-07-07 18:08 ` [PATCH 3/4] musl: Update to v1.1.15 release Khem Raj
` (2 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: Khem Raj @ 2016-07-07 18:08 UTC (permalink / raw)
To: openembedded-core
- libc-package.bbclass: Do not use --old-style
This option has been dropped from latest glibc
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/classes/libc-package.bbclass | 4 ++--
meta/recipes-core/glibc/cross-localedef-native_2.24.bb | 2 +-
meta/recipes-core/glibc/glibc_2.24.bb | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 4f321d4..6624746 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -290,7 +290,7 @@ python package_do_split_gconvs () {
bb.error("locale_arch_options not found for target_arch=" + target_arch)
raise bb.build.FuncFailed("unknown arch:" + target_arch + " for locale_arch_options")
- localedef_opts += " --force --old-style --no-archive --prefix=%s \
+ localedef_opts += " --force --no-archive --prefix=%s \
--inputfile=%s/%s/i18n/locales/%s --charmap=%s %s/%s" \
% (treedir, treedir, datadir, locale, encoding, outputpath, name)
@@ -298,7 +298,7 @@ python package_do_split_gconvs () {
(path, i18npath, gconvpath, localedef_opts)
else: # earlier slower qemu way
qemu = qemu_target_binary(d)
- localedef_opts = "--force --old-style --no-archive --prefix=%s \
+ localedef_opts = "--force --no-archive --prefix=%s \
--inputfile=%s/i18n/locales/%s --charmap=%s %s" \
% (treedir, datadir, locale, encoding, name)
diff --git a/meta/recipes-core/glibc/cross-localedef-native_2.24.bb b/meta/recipes-core/glibc/cross-localedef-native_2.24.bb
index 79c3132..104e38b 100644
--- a/meta/recipes-core/glibc/cross-localedef-native_2.24.bb
+++ b/meta/recipes-core/glibc/cross-localedef-native_2.24.bb
@@ -22,7 +22,7 @@ GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
SRCBRANCH ?= "master"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)"
-SRCREV_glibc ?= "1ac3eaa6bcc473a56340c24511786ff48a91293e"
+SRCREV_glibc ?= "d461c9682d4954076f9ee9e07be903c2eef8e73b"
SRCREV_localedef ?= "29869b6dc11427c5bab839bdb155c85a7c644c71"
SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
diff --git a/meta/recipes-core/glibc/glibc_2.24.bb b/meta/recipes-core/glibc/glibc_2.24.bb
index 77630e3..f0c6a03 100644
--- a/meta/recipes-core/glibc/glibc_2.24.bb
+++ b/meta/recipes-core/glibc/glibc_2.24.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSES;md5=e9a558e243b36d3209f380deb394b213 \
DEPENDS += "gperf-native"
-SRCREV ?= "1ac3eaa6bcc473a56340c24511786ff48a91293e"
+SRCREV ?= "d461c9682d4954076f9ee9e07be903c2eef8e73b"
#SRCBRANCH ?= "release/${PV}/master"
SRCBRANCH ?= "master"
--
2.9.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 4/4] bunutils: Upgrade to 2.26.1
2016-07-07 18:08 [PATCH 0/4] musl/glibc/binutils updates Khem Raj
` (2 preceding siblings ...)
2016-07-07 18:08 ` [PATCH 3/4] musl: Update to v1.1.15 release Khem Raj
@ 2016-07-07 18:08 ` Khem Raj
2016-07-08 13:50 ` [PATCH 0/4] musl/glibc/binutils updates Alexander Kanavin
4 siblings, 0 replies; 11+ messages in thread
From: Khem Raj @ 2016-07-07 18:08 UTC (permalink / raw)
To: openembedded-core
Delete upstreamed patch
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-devtools/binutils/binutils-2.26.inc | 3 +-
...ISA-override-not-lifting-ABI-restrictions.patch | 273 ---------------------
2 files changed, 1 insertion(+), 275 deletions(-)
delete mode 100644 meta/recipes-devtools/binutils/binutils/MIPS-GAS-Fix-an-ISA-override-not-lifting-ABI-restrictions.patch
diff --git a/meta/recipes-devtools/binutils/binutils-2.26.inc b/meta/recipes-devtools/binutils/binutils-2.26.inc
index 04e0102..82cb7f5 100644
--- a/meta/recipes-devtools/binutils/binutils-2.26.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.26.inc
@@ -18,7 +18,7 @@ BINUPV = "${@binutils_branch_version(d)}"
UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)"
-SRCREV = "71fa566a9cf2597b60a58c1d7c148bab637454a6"
+SRCREV = "c29838e7f484e0b5714b02e7feb9a88d3a045dd2"
SRC_URI = "\
git://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git \
file://0002-configure-widen-the-regexp-for-SH-architectures.patch \
@@ -35,7 +35,6 @@ SRC_URI = "\
file://0013-Fix-GOT-address-computations-in-initial-PLT-entries-.patch \
file://0014-Correct-nios2-_gp-address-computation.patch \
file://0015-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \
- file://MIPS-GAS-Fix-an-ISA-override-not-lifting-ABI-restrictions.patch \
"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-devtools/binutils/binutils/MIPS-GAS-Fix-an-ISA-override-not-lifting-ABI-restrictions.patch b/meta/recipes-devtools/binutils/binutils/MIPS-GAS-Fix-an-ISA-override-not-lifting-ABI-restrictions.patch
deleted file mode 100644
index b8c65be..0000000
--- a/meta/recipes-devtools/binutils/binutils/MIPS-GAS-Fix-an-ISA-override-not-lifting-ABI-restrictions.patch
+++ /dev/null
@@ -1,273 +0,0 @@
-From 22522f880a8e17a17c4f195796ec89caece7652b Mon Sep 17 00:00:00 2001
-From: Maciej W. Rozycki <macro@imgtec.com>
-Date: Fri, 22 Apr 2016 01:04:52 +0100
-Subject: [PATCH] MIPS/GAS: Fix an ISA override not lifting ABI restrictions
-
-Correct a regression introduced with commit 919731affbef ("Add MIPS
-.module directive") causing code like:
-
- .set mips3
- dli $2, 0x9000000080000000
-
-to fail assembly with the following error message produced:
-
-Error: number (0x9000000080000000) larger than 32 bits
-
-if built with `mips3' selected as the global ISA (e.g. `-march=mips3').
-This is because a `.set' directive doing an ISA override does not lift
-the ABI restriction on register sizes if the ISA remains unchanged.
-Previously the directive always set register sizes from the ISA chosen,
-which is what some code expects. Restore the old semantics then.
-
- gas/
- * config/tc-mips.c (code_option_type): New enum.
- (parse_code_option): Return status indicating option type.
- (s_mipsset): Update `parse_code_option' call site accordingly.
- Always set register sizes from the ISA with ISA overrides.
- (s_module): Update `parse_code_option' call site.
- * testsuite/gas/mips/isa-override-1.d: New test.
- * testsuite/gas/mips/micromips@isa-override-1.d: New test.
- * testsuite/gas/mips/mips1@isa-override-1.d: New test.
- * testsuite/gas/mips/mips2@isa-override-1.d: New test.
- * testsuite/gas/mips/mips32@isa-override-1.d: New test.
- * testsuite/gas/mips/mips32r2@isa-override-1.d: New test.
- * testsuite/gas/mips/mips32r3@isa-override-1.d: New test.
- * testsuite/gas/mips/mips32r5@isa-override-1.d: New test.
- * testsuite/gas/mips/mips32r6@isa-override-1.d: New test.
- * testsuite/gas/mips/mips64r2@isa-override-1.d: New test.
- * testsuite/gas/mips/mips64r3@isa-override-1.d: New test.
- * testsuite/gas/mips/mips64r5@isa-override-1.d: New test.
- * testsuite/gas/mips/mips64r6@isa-override-1.d: New test.
- * testsuite/gas/mips/r3000@isa-override-1.d: New test.
- * testsuite/gas/mips/r3900@isa-override-1.d: New test.
- * testsuite/gas/mips/r5900@isa-override-1.d: New test.
- * testsuite/gas/mips/octeon@isa-override-1.d: New test.
- * testsuite/gas/mips/octeon3@isa-override-1.d: New test.
- * testsuite/gas/mips/isa-override-2.l: New list test.
- * testsuite/gas/mips/mips1@isa-override-2.l: New list test.
- * testsuite/gas/mips/mips2@isa-override-2.l: New list test.
- * testsuite/gas/mips/mips32@isa-override-2.l: New list test.
- * testsuite/gas/mips/mips32r2@isa-override-2.l: New list test.
- * testsuite/gas/mips/mips32r3@isa-override-2.l: New list test.
- * testsuite/gas/mips/mips32r5@isa-override-2.l: New list test.
- * testsuite/gas/mips/mips32r6@isa-override-2.l: New list test.
- * testsuite/gas/mips/r3000@isa-override-2.l: New list test.
- * testsuite/gas/mips/r3900@isa-override-2.l: New list test.
- * testsuite/gas/mips/octeon3@isa-override-2.l: New list test.
- * testsuite/gas/mips/octeon3@isa-override-1.l: New stderr
- output.
- * testsuite/gas/mips/isa-override-1.s: New test source.
- * testsuite/gas/mips/r5900@isa-override-1.s: New test source.
- * testsuite/gas/mips/isa-override-2.s: New test source.
- * testsuite/gas/mips/mips1@isa-override-2.s: New test source.
- * testsuite/gas/mips/mips2@isa-override-2.s: New test source.
- * testsuite/gas/mips/mips32@isa-override-2.s: New test source.
- * testsuite/gas/mips/mips32r2@isa-override-2.s: New test source.
- * testsuite/gas/mips/mips32r3@isa-override-2.s: New test source.
- * testsuite/gas/mips/mips32r5@isa-override-2.s: New test source.
- * testsuite/gas/mips/mips32r6@isa-override-2.s: New test source.
- * testsuite/gas/mips/r3000@isa-override-2.s: New test source.
- * testsuite/gas/mips/r3900@isa-override-2.s: New test source.
- * testsuite/gas/mips/octeon3@isa-override-2.s: New test source.
- * testsuite/gas/mips/mips.exp: Run the new tests.
----
-Upstream-Status: Backport
-http://www.serverphorums.com/read.php?12,1466357
-https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=22522f880a8e17a17c4f195796ec89caece7652b
-
- gas/ChangeLog | 53 +++++++++++++++++++++
- gas/config/tc-mips.c | 42 +++++++++++++---
- gas/testsuite/gas/mips/isa-override-1.d | 49 +++++++++++++++++++
- gas/testsuite/gas/mips/isa-override-1.s | 31 ++++++++++++
- gas/testsuite/gas/mips/isa-override-2.l | 4 ++
- gas/testsuite/gas/mips/isa-override-2.s | 18 +++++++
- gas/testsuite/gas/mips/micromips@isa-override-1.d | 50 +++++++++++++++++++
- gas/testsuite/gas/mips/mips.exp | 3 +
- gas/testsuite/gas/mips/mips1@isa-override-1.d | 53 +++++++++++++++++++++
- gas/testsuite/gas/mips/mips1@isa-override-2.l | 4 ++
- gas/testsuite/gas/mips/mips1@isa-override-2.s | 18 +++++++
- gas/testsuite/gas/mips/mips2@isa-override-1.d | 50 +++++++++++++++++++
- gas/testsuite/gas/mips/mips2@isa-override-2.l | 4 ++
- gas/testsuite/gas/mips/mips2@isa-override-2.s | 18 +++++++
- gas/testsuite/gas/mips/mips32@isa-override-1.d | 5 ++
- gas/testsuite/gas/mips/mips32@isa-override-2.l | 4 ++
- gas/testsuite/gas/mips/mips32@isa-override-2.s | 18 +++++++
- gas/testsuite/gas/mips/mips32r2@isa-override-1.d | 50 +++++++++++++++++++
- gas/testsuite/gas/mips/mips32r2@isa-override-2.l | 4 ++
- gas/testsuite/gas/mips/mips32r2@isa-override-2.s | 18 +++++++
- gas/testsuite/gas/mips/mips32r3@isa-override-1.d | 5 ++
- gas/testsuite/gas/mips/mips32r3@isa-override-2.l | 4 ++
- gas/testsuite/gas/mips/mips32r3@isa-override-2.s | 18 +++++++
- gas/testsuite/gas/mips/mips32r5@isa-override-1.d | 5 ++
- gas/testsuite/gas/mips/mips32r5@isa-override-2.l | 4 ++
- gas/testsuite/gas/mips/mips32r5@isa-override-2.s | 18 +++++++
- gas/testsuite/gas/mips/mips32r6@isa-override-1.d | 5 ++
- gas/testsuite/gas/mips/mips32r6@isa-override-2.l | 4 ++
- gas/testsuite/gas/mips/mips32r6@isa-override-2.s | 18 +++++++
- gas/testsuite/gas/mips/mips64r2@isa-override-1.d | 50 +++++++++++++++++++
- gas/testsuite/gas/mips/mips64r3@isa-override-1.d | 5 ++
- gas/testsuite/gas/mips/mips64r5@isa-override-1.d | 5 ++
- gas/testsuite/gas/mips/mips64r6@isa-override-1.d | 5 ++
- gas/testsuite/gas/mips/octeon3@isa-override-1.d | 6 ++
- gas/testsuite/gas/mips/octeon3@isa-override-1.l | 2 +
- gas/testsuite/gas/mips/octeon3@isa-override-2.l | 5 ++
- gas/testsuite/gas/mips/octeon3@isa-override-2.s | 18 +++++++
- gas/testsuite/gas/mips/octeon@isa-override-1.d | 5 ++
- gas/testsuite/gas/mips/r3000@isa-override-1.d | 5 ++
- gas/testsuite/gas/mips/r3000@isa-override-2.l | 4 ++
- gas/testsuite/gas/mips/r3000@isa-override-2.s | 18 +++++++
- gas/testsuite/gas/mips/r3900@isa-override-1.d | 5 ++
- gas/testsuite/gas/mips/r3900@isa-override-2.l | 4 ++
- gas/testsuite/gas/mips/r3900@isa-override-2.s | 18 +++++++
- gas/testsuite/gas/mips/r5900@isa-override-1.d | 28 +++++++++++
- gas/testsuite/gas/mips/r5900@isa-override-1.s | 23 +++++++++
- 46 files changed, 775 insertions(+), 8 deletions(-)
- create mode 100644 gas/testsuite/gas/mips/isa-override-1.d
- create mode 100644 gas/testsuite/gas/mips/isa-override-1.s
- create mode 100644 gas/testsuite/gas/mips/isa-override-2.l
- create mode 100644 gas/testsuite/gas/mips/isa-override-2.s
- create mode 100644 gas/testsuite/gas/mips/micromips@isa-override-1.d
- create mode 100644 gas/testsuite/gas/mips/mips1@isa-override-1.d
- create mode 100644 gas/testsuite/gas/mips/mips1@isa-override-2.l
- create mode 100644 gas/testsuite/gas/mips/mips1@isa-override-2.s
- create mode 100644 gas/testsuite/gas/mips/mips2@isa-override-1.d
- create mode 100644 gas/testsuite/gas/mips/mips2@isa-override-2.l
- create mode 100644 gas/testsuite/gas/mips/mips2@isa-override-2.s
- create mode 100644 gas/testsuite/gas/mips/mips32@isa-override-1.d
- create mode 100644 gas/testsuite/gas/mips/mips32@isa-override-2.l
- create mode 100644 gas/testsuite/gas/mips/mips32@isa-override-2.s
- create mode 100644 gas/testsuite/gas/mips/mips32r2@isa-override-1.d
- create mode 100644 gas/testsuite/gas/mips/mips32r2@isa-override-2.l
- create mode 100644 gas/testsuite/gas/mips/mips32r2@isa-override-2.s
- create mode 100644 gas/testsuite/gas/mips/mips32r3@isa-override-1.d
- create mode 100644 gas/testsuite/gas/mips/mips32r3@isa-override-2.l
- create mode 100644 gas/testsuite/gas/mips/mips32r3@isa-override-2.s
- create mode 100644 gas/testsuite/gas/mips/mips32r5@isa-override-1.d
- create mode 100644 gas/testsuite/gas/mips/mips32r5@isa-override-2.l
- create mode 100644 gas/testsuite/gas/mips/mips32r5@isa-override-2.s
- create mode 100644 gas/testsuite/gas/mips/mips32r6@isa-override-1.d
- create mode 100644 gas/testsuite/gas/mips/mips32r6@isa-override-2.l
- create mode 100644 gas/testsuite/gas/mips/mips32r6@isa-override-2.s
- create mode 100644 gas/testsuite/gas/mips/mips64r2@isa-override-1.d
- create mode 100644 gas/testsuite/gas/mips/mips64r3@isa-override-1.d
- create mode 100644 gas/testsuite/gas/mips/mips64r5@isa-override-1.d
- create mode 100644 gas/testsuite/gas/mips/mips64r6@isa-override-1.d
- create mode 100644 gas/testsuite/gas/mips/octeon3@isa-override-1.d
- create mode 100644 gas/testsuite/gas/mips/octeon3@isa-override-1.l
- create mode 100644 gas/testsuite/gas/mips/octeon3@isa-override-2.l
- create mode 100644 gas/testsuite/gas/mips/octeon3@isa-override-2.s
- create mode 100644 gas/testsuite/gas/mips/octeon@isa-override-1.d
- create mode 100644 gas/testsuite/gas/mips/r3000@isa-override-1.d
- create mode 100644 gas/testsuite/gas/mips/r3000@isa-override-2.l
- create mode 100644 gas/testsuite/gas/mips/r3000@isa-override-2.s
- create mode 100644 gas/testsuite/gas/mips/r3900@isa-override-1.d
- create mode 100644 gas/testsuite/gas/mips/r3900@isa-override-2.l
- create mode 100644 gas/testsuite/gas/mips/r3900@isa-override-2.s
- create mode 100644 gas/testsuite/gas/mips/r5900@isa-override-1.d
- create mode 100644 gas/testsuite/gas/mips/r5900@isa-override-1.s
-
-diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
-index bfc639e..daceef1 100644
---- a/gas/config/tc-mips.c
-+++ b/gas/config/tc-mips.c
-@@ -15513,10 +15513,29 @@ struct mips_option_stack
-
- static struct mips_option_stack *mips_opts_stack;
-
--static bfd_boolean
-+/* Return status for .set/.module option handling. */
-+
-+enum code_option_type
-+{
-+ /* Unrecognized option. */
-+ OPTION_TYPE_BAD = -1,
-+
-+ /* Ordinary option. */
-+ OPTION_TYPE_NORMAL,
-+
-+ /* ISA changing option. */
-+ OPTION_TYPE_ISA
-+};
-+
-+/* Handle common .set/.module options. Return status indicating option
-+ type. */
-+
-+static enum code_option_type
- parse_code_option (char * name)
- {
-+ bfd_boolean isa_set = FALSE;
- const struct mips_ase *ase;
-+
- if (strncmp (name, "at=", 3) == 0)
- {
- char *s = name + 3;
-@@ -15589,6 +15608,7 @@ parse_code_option (char * name)
- {
- mips_opts.arch = p->cpu;
- mips_opts.isa = p->isa;
-+ isa_set = TRUE;
- }
- }
- else if (strncmp (name, "mips", 4) == 0)
-@@ -15602,6 +15622,7 @@ parse_code_option (char * name)
- {
- mips_opts.arch = p->cpu;
- mips_opts.isa = p->isa;
-+ isa_set = TRUE;
- }
- }
- else
-@@ -15620,8 +15641,9 @@ parse_code_option (char * name)
- else if (strcmp (name, "nosym32") == 0)
- mips_opts.sym32 = FALSE;
- else
-- return FALSE;
-- return TRUE;
-+ return OPTION_TYPE_BAD;
-+
-+ return isa_set ? OPTION_TYPE_ISA : OPTION_TYPE_NORMAL;
- }
-
- /* Handle the .set pseudo-op. */
-@@ -15629,8 +15651,8 @@ parse_code_option (char * name)
- static void
- s_mipsset (int x ATTRIBUTE_UNUSED)
- {
-+ enum code_option_type type = OPTION_TYPE_NORMAL;
- char *name = input_line_pointer, ch;
-- int prev_isa = mips_opts.isa;
-
- file_mips_check_options ();
-
-@@ -15707,12 +15729,16 @@ s_mipsset (int x ATTRIBUTE_UNUSED)
- free (s);
- }
- }
-- else if (!parse_code_option (name))
-- as_warn (_("tried to set unrecognized symbol: %s\n"), name);
-+ else
-+ {
-+ type = parse_code_option (name);
-+ if (type == OPTION_TYPE_BAD)
-+ as_warn (_("tried to set unrecognized symbol: %s\n"), name);
-+ }
-
- /* The use of .set [arch|cpu]= historically 'fixes' the width of gp and fp
- registers based on what is supported by the arch/cpu. */
-- if (mips_opts.isa != prev_isa)
-+ if (type == OPTION_TYPE_ISA)
- {
- switch (mips_opts.isa)
- {
-@@ -15779,7 +15805,7 @@ s_module (int ignore ATTRIBUTE_UNUSED)
-
- if (!file_mips_opts_checked)
- {
-- if (!parse_code_option (name))
-+ if (parse_code_option (name) == OPTION_TYPE_BAD)
- as_bad (_(".module used with unrecognized symbol: %s\n"), name);
-
- /* Update module level settings from mips_opts. */
---
-1.7.1
-
--
2.9.0
^ permalink raw reply related [flat|nested] 11+ messages in thread