From: Richard Henderson <richard.henderson@linaro.org>
Date: Mon, 26 Apr 2021 02:53:17 +0000 (-0700)
Subject: linux-user/sparc: Merge sparc64 target_elf.h
X-Git-Tag: v6.1.0-rc0~116^2~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b136c211dadc8957b7e3cbb6de4031e3a69a2cfd;p=thirdparty%2Fqemu.git

linux-user/sparc: Merge sparc64 target_elf.h

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210426025334.1168495-9-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---

diff --git a/linux-user/sparc64/target_elf.h b/linux-user/sparc64/target_elf.h
index d6e388f1cf6..023b49b7437 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"