[PULL 15/59] linux-user/sparc: Merge sparc64 target_elf.h

2021-05-17 Thread Laurent Vivier 
From: Richard Henderson 

Signed-off-by: Richard Henderson 
Message-Id: <20210426025334.1168495-9-richard.hender...@linaro.org>
Signed-off-by: Laurent Vivier 
---
 linux-user/sparc64/target_elf.h | 15 +--
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/linux-user/sparc64/target_elf.h b/linux-user/sparc64/target_elf.h
index d6e388f1cf60..023b49b74375 100644
--- a/linux-user/sparc64/target_elf.h
+++ b/linux-user/sparc64/target_elf.h
@@ -1,14 +1 @@
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation, or (at your option) any
- * later version. See the COPYING file in the top-level directory.
- */
-
-#ifndef SPARC64_TARGET_ELF_H
-#define SPARC64_TARGET_ELF_H
-static inline const char *cpu_get_model(uint32_t eflags)
-{
-return "TI UltraSparc II";
-}
-#endif
+#include "../sparc/target_elf.h"
-- 
2.31.1

[PULL 15/59] linux-user/sparc: Merge sparc64 target_elf.h

2021-05-17 Thread Laurent Vivier 
From: Richard Henderson 

Signed-off-by: Richard Henderson 
Message-Id: <20210426025334.1168495-9-richard.hender...@linaro.org>
Signed-off-by: Laurent Vivier 
---
 linux-user/sparc64/target_elf.h | 15 +--
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/linux-user/sparc64/target_elf.h b/linux-user/sparc64/target_elf.h
index d6e388f1cf60..023b49b74375 100644
--- a/linux-user/sparc64/target_elf.h
+++ b/linux-user/sparc64/target_elf.h
@@ -1,14 +1 @@
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation, or (at your option) any
- * later version. See the COPYING file in the top-level directory.
- */
-
-#ifndef SPARC64_TARGET_ELF_H
-#define SPARC64_TARGET_ELF_H
-static inline const char *cpu_get_model(uint32_t eflags)
-{
-return "TI UltraSparc II";
-}
-#endif
+#include "../sparc/target_elf.h"
-- 
2.31.1